Skip to content

Commit d91fa9e

Browse files
tpaviottpaviot
authored
Merge pull request #305 from tpaviot/review/prepare-release-0.17
Review/prepare release 0.17
2 parents 44395c2 + 5c33c33 commit d91fa9e

Some content is hidden

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

57 files changed

+542
-367
lines changed

‎.travis.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ addons:
1515
packages:
1616
- gcc-multilib
1717
- g++-multilib
18-
- lib32z1
18+
- lib32z1+
19+
- lsb-core
1920

2021
matrix:
2122
include:
@@ -69,7 +70,7 @@ before_install:
6970
# download/install OCE from DLR-SC channel
7071
- conda config --add channels https://conda.anaconda.org/dlr-sc
7172
# install everything required to build the receipe
72-
- conda install conda-build anaconda-client
73+
- conda install conda-build=1.20 anaconda-client
7374

7475

7576
script:

‎CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set(PYTHONOCC_VERSION_MAJOR 0)
2222
set(PYTHONOCC_VERSION_MINOR 17)
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

@@ -308,8 +308,6 @@ install(FILES ${BUILD_DIR}/Visualization.py DESTINATION ${PYTHONOCC_INSTALL_DIRE
308308
install(FILES ${BUILD_DIR}/_Visualization.${EXTENSION} DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY} )
309309
endif(PYTHONOCC_WRAP_VISU)
310310

311-
# install GC
312-
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/GarbageCollector.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY} )
313311
# install addons
314312
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/addons/Display DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY} )
315313
# install LICENSE file

‎NEWS

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
=============================
2+
Version 0.17 - Septembre 2016
3+
4+
This release requires oce-0.17.0 or oce-0.17.1 or oce-0.17.2. Prefer the latter.
5+
6+
* port to oce-0.17.x
7+
8+
* memory management fixes
9+
10+
* New examples: AIS_ColoredShape, 2d_fillet, inertia properties, edge_color,
11+
112
=========================
213
Version 0.16.5 - May 2016
314

‎README.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[![license](https://binstar.org/jf/pythonocc-core/badges/license.svg)](https://github.com/tpaviot/pythonocc-core/blob/master/LICENSE)
2-
[![Build Status](https://travis-ci.org/tpaviot/pythonocc-core.png?branch=master)](https://travis-ci.org/tpaviot/pythonocc-core)
1+
[![Travis Build Status](https://travis-ci.org/tpaviot/pythonocc-core.png?branch=master)](https://travis-ci.org/tpaviot/pythonocc-core)
2+
[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/oyeifkxtknl2tslq?svg=true)](https://ci.appveyor.com/project/tpaviot/pythonocc-core)
33
[![Conda installer](https://anaconda.org/dlr-sc/pythonocc-core/badges/installer/conda.svg)](https://anaconda.org/dlr-sc/pythonocc-core)
44
[![Join the chat at https://gitter.im/tpaviot/pythonocc-core](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/tpaviot/pythonocc-core?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
55

@@ -13,13 +13,13 @@ pythonocc is a python library whose purpose is to provide 3D modeling
1313
features. It is intended to developers who aim at developing
1414
CAD/PDM/PLM applications.
1515

16-
Latest release : [pythonocc-core 0.16.5 (may 2016)](https://github.com/tpaviot/pythonocc-core/releases/tag/0.16.5)
16+
Latest release : [pythonocc-core 0.17 (september 2016)](https://github.com/tpaviot/pythonocc-core/releases/tag/0.17)
1717

1818
How to quicky download/install binaries ?
1919
-----------------------------------------
2020

2121
pythonocc provides precompiled [conda packages](https://anaconda.org/DLR-SC/pythonocc-core).
22-
This will get you up & running in minutes whether you run win32/win64/linux64/osx64:
22+
This will get you up and running in minutes whether you run win32/win64/linux64/osx64:
2323

2424
```bash
2525
conda install -c https://conda.anaconda.org/dlr-sc pythonocc-core
@@ -43,6 +43,8 @@ We use the following online resources:
4343
https://github.com/tpaviot/pythonocc-core/issues
4444
* Mailing list
4545
http://groups.google.com/group/pythonocc/about
46+
* Appveyor
47+
https://ci.appveyor.com/project/tpaviot/pythonocc-core
4648
* Travic-CI
4749
https://travis-ci.org/tpaviot/pythonocc-core
4850
* twitter
@@ -55,13 +57,11 @@ The basis of pythonocc is python wrapper for the [oce C++ library / CAD kernel]
5557
(https://github.com/tpaviot/oce), aka pythonocc-core.
5658
pythonocc-core version number correspond to oce library releases its wrapping.
5759

58-
For example; the current pythonocc-core release, 0.16.x, requires [OCE
59-
0.16.x](https://github.com/tpaviot/oce/releases) release. Here, the __Major__
60+
For example; the current pythonocc-core release, 0.17, requires any of the [OCE
61+
0.17.x](https://github.com/tpaviot/oce/releases) releases. Here, the __Major__
6062
version name of either OCE or pythonocc-core release is __0__, the __Minor__
61-
version is __16__ and the __Patch__ version is __x__. pythonocc-core can be
62-
built with any OCE version that has a corresponding __Major__ and __Minor__ version
63-
number. That is pythonocc-core 0.16.0 can be built with OCE 0.16.1 and visa
64-
versa.
63+
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
64+
number. For example, pythonocc-core 0.17 can be built with OCE-0.17.1.
6565

6666

6767
License

‎appveyor.yml

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

33
environment:
44
global:

‎ci/conda/fix_GeomFill_BSplineCurves_Init_method.patch

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Fixes related to specific dlr-sc oce patch
2+
3+
diff --git src/SWIG_files/wrapper/GeomFill.i src/SWIG_files/wrapper/GeomFill.i
4+
index bbb7c2b..32ad950 100644
5+
--- src/SWIG_files/wrapper/GeomFill.i
6+
+++ src/SWIG_files/wrapper/GeomFill.i
7+
@@ -970,48 +970,6 @@ class GeomFill_BSplineCurves {
8+
:rtype: None
9+
") GeomFill_BSplineCurves;
10+
GeomFill_BSplineCurves (const Handle_Geom_BSplineCurve & C1,const Handle_Geom_BSplineCurve & C2,const GeomFill_FillingStyle Type);
11+
- %feature("compactdefaultargs") Init;
12+
- %feature("autodoc", " * if the curves cannot be joined
13+
-
14+
- :param C1:
15+
- :type C1: Handle_Geom_BSplineCurve &
16+
- :param C2:
17+
- :type C2: Handle_Geom_BSplineCurve &
18+
- :param C3:
19+
- :type C3: Handle_Geom_BSplineCurve &
20+
- :param C4:
21+
- :type C4: Handle_Geom_BSplineCurve &
22+
- :param Type:
23+
- :type Type: GeomFill_FillingStyle
24+
- :rtype: None
25+
-") Init;
26+
- void Init (const Handle_Geom_BSplineCurve & C1,const Handle_Geom_BSplineCurve & C2,const Handle_Geom_BSplineCurve & C3,const Handle_Geom_BSplineCurve & C4,const GeomFill_FillingStyle Type);
27+
- %feature("compactdefaultargs") Init;
28+
- %feature("autodoc", " * if the curves cannot be joined
29+
-
30+
- :param C1:
31+
- :type C1: Handle_Geom_BSplineCurve &
32+
- :param C2:
33+
- :type C2: Handle_Geom_BSplineCurve &
34+
- :param C3:
35+
- :type C3: Handle_Geom_BSplineCurve &
36+
- :param Type:
37+
- :type Type: GeomFill_FillingStyle
38+
- :rtype: None
39+
-") Init;
40+
- void Init (const Handle_Geom_BSplineCurve & C1,const Handle_Geom_BSplineCurve & C2,const Handle_Geom_BSplineCurve & C3,const GeomFill_FillingStyle Type);
41+
- %feature("compactdefaultargs") Init;
42+
- %feature("autodoc", " * Initializes or reinitializes this algorithm with two, three, or four curves - C1, C2, C3, and C4 - and Type, one of the following filling styles: - GeomFill_Stretch - the style with the flattest patch - GeomFill_Coons - a rounded style of patch with less depth than that of Curved - GeomFill_Curved - the style with the most rounded patch. Exceptions Standard_ConstructionError if the curves are not contiguous.
43+
-
44+
- :param C1:
45+
- :type C1: Handle_Geom_BSplineCurve &
46+
- :param C2:
47+
- :type C2: Handle_Geom_BSplineCurve &
48+
- :param Type:
49+
- :type Type: GeomFill_FillingStyle
50+
- :rtype: None
51+
-") Init;
52+
- void Init (const Handle_Geom_BSplineCurve & C1,const Handle_Geom_BSplineCurve & C2,const GeomFill_FillingStyle Type);
53+
%feature("compactdefaultargs") Surface;
54+
%feature("autodoc", " * Returns the BSpline surface Surface resulting from the computation performed by this algorithm.
55+
56+
--

‎ci/conda/meta.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package:
22
name: pythonocc-core
3-
version: {{ environ.get('GIT_DESCRIBE_TAG', '0.17.dev') }}
3+
version: "0.17"
44

55
source:
66
path: ../..
77
patches:
88
- fix_graphicshr_location.patch [win]
9+
- fix_GeomFill_BSplineCurves_Init_method.patch
910

1011
build:
1112

@@ -25,7 +26,7 @@ requirements:
2526
build:
2627
- patch [win]
2728
- python
28-
- oce 0.17.*
29+
- oce ==0.17.2
2930
- cmake
3031
- ninja [win]
3132
- swig
@@ -34,7 +35,7 @@ requirements:
3435
- pyqt
3536
- wxpython [py27]
3637
- pyside [py27]
37-
- oce 0.17.*
38+
- oce ==0.17.2
3839
- python
3940

4041

‎cmake/__init__.py

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

‎doc/apidoc/OCC.AppStd.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.AppStd module
2+
=================
3+
4+
.. automodule:: OCC.AppStd
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.AppStdL.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.AppStdL module
2+
==================
3+
4+
.. automodule:: OCC.AppStdL
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.Display.backend.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.Display.backend module
2+
==========================
3+
4+
.. automodule:: OCC.Display.backend
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.Display.pyqt4Display.rst

-7
This file was deleted.

‎doc/apidoc/OCC.Display.pysideDisplay.rst

-7
This file was deleted.

‎doc/apidoc/OCC.Display.qtDisplay.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.Display.qtDisplay module
2+
============================
3+
4+
.. automodule:: OCC.Display.qtDisplay
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.Display.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Submodules
1515

1616
OCC.Display.OCCViewer
1717
OCC.Display.SimpleGui
18-
OCC.Display.pyqt4Display
19-
OCC.Display.pysideDisplay
18+
OCC.Display.backend
19+
OCC.Display.qtDisplay
2020
OCC.Display.wxDisplay
2121

2222
Module contents

‎doc/apidoc/OCC.GeomToStep.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.GeomToStep module
2+
=====================
3+
4+
.. automodule:: OCC.GeomToStep
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.IGESCAFControl.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.IGESCAFControl module
2+
=========================
3+
4+
.. automodule:: OCC.IGESCAFControl
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.MeshVS.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.MeshVS module
2+
=================
3+
4+
.. automodule:: OCC.MeshVS
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.RWStepAP203.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.RWStepAP203 module
2+
======================
3+
4+
.. automodule:: OCC.RWStepAP203
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.RWStepAP214.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.RWStepAP214 module
2+
======================
3+
4+
.. automodule:: OCC.RWStepAP214
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.RWStepBasic.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.RWStepBasic module
2+
======================
3+
4+
.. automodule:: OCC.RWStepBasic
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.RWStepGeom.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.RWStepGeom module
2+
=====================
3+
4+
.. automodule:: OCC.RWStepGeom
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.RWStepRepr.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.RWStepRepr module
2+
=====================
3+
4+
.. automodule:: OCC.RWStepRepr
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.RWStepShape.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.RWStepShape module
2+
======================
3+
4+
.. automodule:: OCC.RWStepShape
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.STEPCAFControl.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.STEPCAFControl module
2+
=========================
3+
4+
.. automodule:: OCC.STEPCAFControl
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.STEPConstruct.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.STEPConstruct module
2+
========================
3+
4+
.. automodule:: OCC.STEPConstruct
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.STEPEdit.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.STEPEdit module
2+
===================
3+
4+
.. automodule:: OCC.STEPEdit
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.STEPSelections.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.STEPSelections module
2+
=========================
3+
4+
.. automodule:: OCC.STEPSelections
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.StepAP203.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.StepAP203 module
2+
====================
3+
4+
.. automodule:: OCC.StepAP203
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.StepAP209.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.StepAP209 module
2+
====================
3+
4+
.. automodule:: OCC.StepAP209
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.StepAP214.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.StepAP214 module
2+
====================
3+
4+
.. automodule:: OCC.StepAP214
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎doc/apidoc/OCC.StepBasic.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OCC.StepBasic module
2+
====================
3+
4+
.. automodule:: OCC.StepBasic
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

0 commit comments

Comments
 (0)