Skip to content

Commit

Permalink
Merge pull request #433 from tpaviot/review/prepare-0.18
Browse files Browse the repository at this point in the history
Review/prepare 0.18
  • Loading branch information
tpaviot authored Jun 16, 2017
2 parents bb13189 + 7be3bee commit 1a6f99d
Show file tree
Hide file tree
Showing 637 changed files with 150,462 additions and 118,448 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
##Copyright (c) 2011-2016 Thomas Paviot ([email protected])
##Copyright (c) 2011-2017 Thomas Paviot ([email protected])
##
##This file is part of pythonOCC.
##
Expand All @@ -22,7 +22,7 @@ set(PYTHONOCC_VERSION_MAJOR 0)
set(PYTHONOCC_VERSION_MINOR 18)
set(PYTHONOCC_VERSION_PATCH)
# Empty for official releases, set to -dev, -rc1, etc for development releases
set(PYTHONOCC_VERSION_DEVEL -dev)
set(PYTHONOCC_VERSION_DEVEL)

cmake_minimum_required(VERSION 2.6)

Expand Down
7 changes: 5 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,18 @@ can compile/use it :
- the python programming language (http://www.python.org). Python 2.7 and 3.x
are officially supported,

- OpenCascade Community Edition 0.17.x (https://github.com/tpaviot/oce),
- OpenCascade Community Edition 0.18.x (https://github.com/tpaviot/oce),

- FreeType 2.6.3 (https://www.freetype.org/),

- SWIG 3.0.9 or higher (http://www.swig.org),

- CMake 2.8 or higher (http://www.cmake.org).

**Important**: the OCE version has to match the pythonocc-core version, which is currently **0.17.x**
**Important**: the OCE version has to match the pythonocc-core version,
which is currently **0.18.x**

- Optional : smesh-6.7.4 (https://github.com/tpaviot/smesh)

Create a local copy of the repository
-------------------------------------
Expand Down
18 changes: 18 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
==========================
Version 0.18 - June 2017

This release requires oce-0.18 or oce-0.18.1.

* wrapper : support oce-0.18 (upstream occt 6.9.1)

* wrapper : support smesh 6.7.4

* wrapper : support for packages Voxel, NIS, DataExchange related

* new examples : background image, emmenthaler, ais_shape downcast,
core_display_z_transparency, clipping plane, bounding box computation
using mesh, STEP compound loading, surfacic mesh, volumic mesh, mesh traverse,
added a fast loading STL example

* many minor bugfixes

=============================
Version 0.17.3 - March 2017

Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pythonocc is a python library whose purpose is to provide 3D modeling
features. It is intended to developers who aim at developing
CAD/PDM/PLM applications.

Latest release : [pythonocc-core 0.17.3 (march 2017)](https://github.com/tpaviot/pythonocc-core/releases/tag/0.17.3)
Latest release : [pythonocc-core 0.18 (june 2017)](https://github.com/tpaviot/pythonocc-core/releases/tag/0.18)

How to quicky download/install binaries ?
-----------------------------------------
Expand All @@ -24,12 +24,12 @@ This will get you up and running in minutes whether you run win32/win64/linux64/

```bash
# install pythonocc in an environment named `pythonocc` with python 3.5; use python=2 for legacy python 2.7.12
conda create -n pythonocc -c conda-forge -c dlr-sc -c pythonocc -c oce pythonocc-core==0.17.3 python=3
conda install -c conda-forge -c dlr-sc -c pythonocc -c oce pythonocc-core==0.18 python=3
```

Nightly builds are available from another repository. If you want to test features under development that have not been released yet:
```bash
conda install -c tpaviot -c oce pythonocc-core==nightly
conda install -c tpaviot -c oce -c conda-forge pythonocc-core==nightly
```

How to compile ?
Expand Down Expand Up @@ -70,11 +70,11 @@ The basis of pythonocc is python wrapper for the [oce C++ library / CAD kernel]
(https://github.com/tpaviot/oce), aka pythonocc-core.
pythonocc-core version number correspond to oce library releases its wrapping.

For example; the current pythonocc-core release, 0.17.2, requires any of the [OCE
0.17.x](https://github.com/tpaviot/oce/releases) releases. Here, the __Major__
For example; the current pythonocc-core release, 0.18, requires any of the [OCE
0.18.x](https://github.com/tpaviot/oce/releases) releases. Here, the __Major__
version name of either OCE or pythonocc-core release is __0__, the __Minor__
version is __17__ and the __Patch__ version is (optionally) __x__. pythonocc-core can be built with any OCE version that has a corresponding __Major__ and __Minor__ version
number. For example, pythonocc-core 0.17 can be built with OCE-0.17.1.
number. For example, pythonocc-core 0.18 can be built with OCE-0.18.1.


License
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: pythonocc-core-0.18-dev.{build}
version: pythonocc-core-0.18.{build}

environment:
global:
Expand Down
4 changes: 2 additions & 2 deletions ci/conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# change the version numer to "0.17.1" or "0.18" in case of a release build
# change the version number to "0.17.1" or "0.18" in case of a release build
package:
name: pythonocc-core
version: "nightly"
version: 0.18

source:
path: ../..
Expand Down
2 changes: 1 addition & 1 deletion cmake/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = "0.18-dev"
VERSION = "0.18"
Loading

0 comments on commit 1a6f99d

Please sign in to comment.