Skip to content

Commit 1a6f99d

Browse files
authored
Merge pull request #433 from tpaviot/review/prepare-0.18
Review/prepare 0.18
2 parents bb13189 + 7be3bee commit 1a6f99d

File tree

637 files changed

+150462
-118448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

637 files changed

+150462
-118448
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
##Copyright (c) 2011-2016 Thomas Paviot ([email protected])
1+
##Copyright (c) 2011-2017 Thomas Paviot ([email protected])
22
##
33
##This file is part of pythonOCC.
44
##
@@ -22,7 +22,7 @@ set(PYTHONOCC_VERSION_MAJOR 0)
2222
set(PYTHONOCC_VERSION_MINOR 18)
2323
set(PYTHONOCC_VERSION_PATCH)
2424
# Empty for official releases, set to -dev, -rc1, etc for development releases
25-
set(PYTHONOCC_VERSION_DEVEL -dev)
25+
set(PYTHONOCC_VERSION_DEVEL)
2626

2727
cmake_minimum_required(VERSION 2.6)
2828

INSTALL.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,18 @@ can compile/use it :
2222
- the python programming language (http://www.python.org). Python 2.7 and 3.x
2323
are officially supported,
2424

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

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

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

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

33-
**Important**: the OCE version has to match the pythonocc-core version, which is currently **0.17.x**
33+
**Important**: the OCE version has to match the pythonocc-core version,
34+
which is currently **0.18.x**
35+
36+
- Optional : smesh-6.7.4 (https://github.com/tpaviot/smesh)
3437

3538
Create a local copy of the repository
3639
-------------------------------------

NEWS

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
==========================
2+
Version 0.18 - June 2017
3+
4+
This release requires oce-0.18 or oce-0.18.1.
5+
6+
* wrapper : support oce-0.18 (upstream occt 6.9.1)
7+
8+
* wrapper : support smesh 6.7.4
9+
10+
* wrapper : support for packages Voxel, NIS, DataExchange related
11+
12+
* new examples : background image, emmenthaler, ais_shape downcast,
13+
core_display_z_transparency, clipping plane, bounding box computation
14+
using mesh, STEP compound loading, surfacic mesh, volumic mesh, mesh traverse,
15+
added a fast loading STL example
16+
17+
* many minor bugfixes
18+
119
=============================
220
Version 0.17.3 - March 2017
321

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pythonocc is a python library whose purpose is to provide 3D modeling
1414
features. It is intended to developers who aim at developing
1515
CAD/PDM/PLM applications.
1616

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

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

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

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

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

73-
For example; the current pythonocc-core release, 0.17.2, requires any of the [OCE
74-
0.17.x](https://github.com/tpaviot/oce/releases) releases. Here, the __Major__
73+
For example; the current pythonocc-core release, 0.18, requires any of the [OCE
74+
0.18.x](https://github.com/tpaviot/oce/releases) releases. Here, the __Major__
7575
version name of either OCE or pythonocc-core release is __0__, the __Minor__
7676
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
77-
number. For example, pythonocc-core 0.17 can be built with OCE-0.17.1.
77+
number. For example, pythonocc-core 0.18 can be built with OCE-0.18.1.
7878

7979

8080
License

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: pythonocc-core-0.18-dev.{build}
1+
version: pythonocc-core-0.18.{build}
22

33
environment:
44
global:

ci/conda/meta.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# change the version numer to "0.17.1" or "0.18" in case of a release build
1+
# change the version number to "0.17.1" or "0.18" in case of a release build
22
package:
33
name: pythonocc-core
4-
version: "nightly"
4+
version: 0.18
55

66
source:
77
path: ../..

cmake/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION = "0.18-dev"
1+
VERSION = "0.18"

0 commit comments

Comments
 (0)