Merge pull request #305 from tpaviot/review/prepare-release-0.17

Review/prepare release 0.17

.travis.yml

@@ -15,7 +15,8 @@ addons:
     packages:
     - gcc-multilib
     - g++-multilib
-    - lib32z1
+    - lib32z1+
+    - lsb-core
 
 matrix:
   include:
@@ -69,7 +70,7 @@ before_install:
    # download/install OCE from DLR-SC channel
   - conda config --add channels https://conda.anaconda.org/dlr-sc
   # install everything required to build the receipe
-  - conda install conda-build anaconda-client
+  - conda install conda-build=1.20 anaconda-client
 
 
 script:

CMakeLists.txt

@@ -22,7 +22,7 @@ set(PYTHONOCC_VERSION_MAJOR 0)
 set(PYTHONOCC_VERSION_MINOR 17)
 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)
 
@@ -308,8 +308,6 @@ install(FILES ${BUILD_DIR}/Visualization.py DESTINATION ${PYTHONOCC_INSTALL_DIRE
 install(FILES ${BUILD_DIR}/_Visualization.${EXTENSION} DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY} )
 endif(PYTHONOCC_WRAP_VISU)
 
-# install GC
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/GarbageCollector.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY} )
 # install addons
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/addons/Display DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY} )
 # install LICENSE file

NEWS

@@ -1,3 +1,14 @@
+=============================
+Version 0.17 - Septembre 2016
+
+This release requires oce-0.17.0 or oce-0.17.1 or oce-0.17.2. Prefer the latter.
+
+* port to oce-0.17.x
+
+* memory management fixes
+
+* New examples: AIS_ColoredShape, 2d_fillet, inertia properties, edge_color, 
+
 =========================
 Version 0.16.5 - May 2016
 

README.md

@@ -1,5 +1,5 @@
-[![license](https://binstar.org/jf/pythonocc-core/badges/license.svg)](https://github.com/tpaviot/pythonocc-core/blob/master/LICENSE)
-[![Build Status](https://travis-ci.org/tpaviot/pythonocc-core.png?branch=master)](https://travis-ci.org/tpaviot/pythonocc-core)
+[![Travis Build Status](https://travis-ci.org/tpaviot/pythonocc-core.png?branch=master)](https://travis-ci.org/tpaviot/pythonocc-core)
+[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/oyeifkxtknl2tslq?svg=true)](https://ci.appveyor.com/project/tpaviot/pythonocc-core)
 [![Conda installer](https://anaconda.org/dlr-sc/pythonocc-core/badges/installer/conda.svg)](https://anaconda.org/dlr-sc/pythonocc-core)
 [![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)
 
@@ -13,13 +13,13 @@ 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.16.5 (may 2016)](https://github.com/tpaviot/pythonocc-core/releases/tag/0.16.5)
+Latest release : [pythonocc-core 0.17 (september 2016)](https://github.com/tpaviot/pythonocc-core/releases/tag/0.17)
 
 How to quicky download/install binaries ?
 -----------------------------------------
 
 pythonocc provides precompiled [conda packages](https://anaconda.org/DLR-SC/pythonocc-core). 
-This will get you up & running in minutes whether you run win32/win64/linux64/osx64:
+This will get you up and running in minutes whether you run win32/win64/linux64/osx64:
 
 ```bash
 conda install -c https://conda.anaconda.org/dlr-sc pythonocc-core
@@ -43,6 +43,8 @@ We use the following online resources:
        https://github.com/tpaviot/pythonocc-core/issues
   * Mailing list
        http://groups.google.com/group/pythonocc/about
+  * Appveyor
+       https://ci.appveyor.com/project/tpaviot/pythonocc-core
   * Travic-CI
        https://travis-ci.org/tpaviot/pythonocc-core
   * twitter
@@ -55,13 +57,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.16.x, requires [OCE
- 0.16.x](https://github.com/tpaviot/oce/releases) release. Here, the __Major__ 
+For example; the current pythonocc-core release, 0.17, requires any of the [OCE
+ 0.17.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 __16__ and the __Patch__ version is __x__. pythonocc-core can be 
- built with any OCE version that has a corresponding __Major__ and __Minor__ version 
- number. That is pythonocc-core 0.16.0 can be built with OCE 0.16.1 and visa 
- versa.   
+ 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.   
 
 
 License

appveyor.yml

@@ -1,4 +1,4 @@
-version: pythonocc-core-0.17.2-dev.{build}
+version: pythonocc-core-0.17.{build}
 
 environment:
   global:

ci/conda/fix_GeomFill_BSplineCurves_Init_method.patch

@@ -0,0 +1,56 @@
+# Fixes related to specific dlr-sc oce patch
+
+diff --git src/SWIG_files/wrapper/GeomFill.i src/SWIG_files/wrapper/GeomFill.i
+index bbb7c2b..32ad950 100644
+--- src/SWIG_files/wrapper/GeomFill.i
++++ src/SWIG_files/wrapper/GeomFill.i
+@@ -970,48 +970,6 @@ class GeomFill_BSplineCurves {
+ 	:rtype: None
+ ") GeomFill_BSplineCurves;
+ 		 GeomFill_BSplineCurves (const Handle_Geom_BSplineCurve & C1,const Handle_Geom_BSplineCurve & C2,const GeomFill_FillingStyle Type);
+-		%feature("compactdefaultargs") Init;
+-		%feature("autodoc", "	* if the curves cannot be joined
+-
+-	:param C1:
+-	:type C1: Handle_Geom_BSplineCurve &
+-	:param C2:
+-	:type C2: Handle_Geom_BSplineCurve &
+-	:param C3:
+-	:type C3: Handle_Geom_BSplineCurve &
+-	:param C4:
+-	:type C4: Handle_Geom_BSplineCurve &
+-	:param Type:
+-	:type Type: GeomFill_FillingStyle
+-	:rtype: None
+-") Init;
+-		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);
+-		%feature("compactdefaultargs") Init;
+-		%feature("autodoc", "	* if the curves cannot be joined
+-
+-	:param C1:
+-	:type C1: Handle_Geom_BSplineCurve &
+-	:param C2:
+-	:type C2: Handle_Geom_BSplineCurve &
+-	:param C3:
+-	:type C3: Handle_Geom_BSplineCurve &
+-	:param Type:
+-	:type Type: GeomFill_FillingStyle
+-	:rtype: None
+-") Init;
+-		void Init (const Handle_Geom_BSplineCurve & C1,const Handle_Geom_BSplineCurve & C2,const Handle_Geom_BSplineCurve & C3,const GeomFill_FillingStyle Type);
+-		%feature("compactdefaultargs") Init;
+-		%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.
+-
+-	:param C1:
+-	:type C1: Handle_Geom_BSplineCurve &
+-	:param C2:
+-	:type C2: Handle_Geom_BSplineCurve &
+-	:param Type:
+-	:type Type: GeomFill_FillingStyle
+-	:rtype: None
+-") Init;
+-		void Init (const Handle_Geom_BSplineCurve & C1,const Handle_Geom_BSplineCurve & C2,const GeomFill_FillingStyle Type);
+ 		%feature("compactdefaultargs") Surface;
+ 		%feature("autodoc", "	* Returns the BSpline surface Surface resulting from the computation performed by this algorithm.
+
+-- 

ci/conda/meta.yaml

@@ -1,11 +1,12 @@
 package:
   name: pythonocc-core
-  version: {{ environ.get('GIT_DESCRIBE_TAG', '0.17.dev') }}
+  version: "0.17"
 
 source:
   path: ../..
   patches:
     - fix_graphicshr_location.patch [win]
+    - fix_GeomFill_BSplineCurves_Init_method.patch
 
 build:
 
@@ -25,7 +26,7 @@ requirements:
   build:
     - patch             [win]
     - python
-    - oce 0.17.*
+    - oce ==0.17.2
     - cmake
     - ninja             [win]
     - swig
@@ -34,7 +35,7 @@ requirements:
     - pyqt
     - wxpython          [py27]
     - pyside            [py27]
-    - oce 0.17.*
+    - oce ==0.17.2
     - python
 
 

cmake/__init__.py

@@ -1 +1 @@
-VERSION = "0.17-dev"
+VERSION = "0.17"

doc/apidoc/OCC.AppStd.rst

@@ -0,0 +1,7 @@
+OCC.AppStd module
+=================
+
+.. automodule:: OCC.AppStd
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.AppStdL.rst

@@ -0,0 +1,7 @@
+OCC.AppStdL module
+==================
+
+.. automodule:: OCC.AppStdL
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.Display.backend.rst

@@ -0,0 +1,7 @@
+OCC.Display.backend module
+==========================
+
+.. automodule:: OCC.Display.backend
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.Display.qtDisplay.rst

@@ -0,0 +1,7 @@
+OCC.Display.qtDisplay module
+============================
+
+.. automodule:: OCC.Display.qtDisplay
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.Display.rst

@@ -15,8 +15,8 @@ Submodules
 
    OCC.Display.OCCViewer
    OCC.Display.SimpleGui
-   OCC.Display.pyqt4Display
-   OCC.Display.pysideDisplay
+   OCC.Display.backend
+   OCC.Display.qtDisplay
    OCC.Display.wxDisplay
 
 Module contents

doc/apidoc/OCC.GeomToStep.rst

@@ -0,0 +1,7 @@
+OCC.GeomToStep module
+=====================
+
+.. automodule:: OCC.GeomToStep
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.IGESCAFControl.rst

@@ -0,0 +1,7 @@
+OCC.IGESCAFControl module
+=========================
+
+.. automodule:: OCC.IGESCAFControl
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.MeshVS.rst

@@ -0,0 +1,7 @@
+OCC.MeshVS module
+=================
+
+.. automodule:: OCC.MeshVS
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.RWStepAP203.rst

@@ -0,0 +1,7 @@
+OCC.RWStepAP203 module
+======================
+
+.. automodule:: OCC.RWStepAP203
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.RWStepAP214.rst

@@ -0,0 +1,7 @@
+OCC.RWStepAP214 module
+======================
+
+.. automodule:: OCC.RWStepAP214
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.RWStepBasic.rst

@@ -0,0 +1,7 @@
+OCC.RWStepBasic module
+======================
+
+.. automodule:: OCC.RWStepBasic
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.RWStepGeom.rst

@@ -0,0 +1,7 @@
+OCC.RWStepGeom module
+=====================
+
+.. automodule:: OCC.RWStepGeom
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.RWStepRepr.rst

@@ -0,0 +1,7 @@
+OCC.RWStepRepr module
+=====================
+
+.. automodule:: OCC.RWStepRepr
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.RWStepShape.rst

@@ -0,0 +1,7 @@
+OCC.RWStepShape module
+======================
+
+.. automodule:: OCC.RWStepShape
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.STEPCAFControl.rst

@@ -0,0 +1,7 @@
+OCC.STEPCAFControl module
+=========================
+
+.. automodule:: OCC.STEPCAFControl
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.STEPConstruct.rst

@@ -0,0 +1,7 @@
+OCC.STEPConstruct module
+========================
+
+.. automodule:: OCC.STEPConstruct
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.STEPEdit.rst

@@ -0,0 +1,7 @@
+OCC.STEPEdit module
+===================
+
+.. automodule:: OCC.STEPEdit
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.STEPSelections.rst

@@ -0,0 +1,7 @@
+OCC.STEPSelections module
+=========================
+
+.. automodule:: OCC.STEPSelections
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.StepAP203.rst

@@ -0,0 +1,7 @@
+OCC.StepAP203 module
+====================
+
+.. automodule:: OCC.StepAP203
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.StepAP209.rst

@@ -0,0 +1,7 @@
+OCC.StepAP209 module
+====================
+
+.. automodule:: OCC.StepAP209
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.StepAP214.rst

@@ -0,0 +1,7 @@
+OCC.StepAP214 module
+====================
+
+.. automodule:: OCC.StepAP214
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/apidoc/OCC.StepBasic.rst

@@ -0,0 +1,7 @@
+OCC.StepBasic module
+====================
+
+.. automodule:: OCC.StepBasic
+    :members:
+    :undoc-members:
+    :show-inheritance: