Merge pull request #1160 from tpaviot/review/occt770

Port to occt770

Author: tpaviot

CMakeLists.txt

@@ -147,7 +147,7 @@ if(DEFINED OCE_INCLUDE_PATH)
 # if OCE_INCLUDE_PATH is not passed at command line,
 # find OCE automatically
 else(OCE_INCLUDE_PATH)
-  find_package(OpenCASCADE 7.6.3 REQUIRED)
+  find_package(OpenCASCADE 7.7.0 REQUIRED)
   if(OpenCASCADE_FOUND)
     message(STATUS "OpenCASCADE version found: " ${OpenCASCADE_MAJOR_VERSION} "." ${OpenCASCADE_MINOR_VERSION} "." ${OpenCASCADE_MAINTENANCE_VERSION})
     message(STATUS "OpenCASCADE include directory: " ${OpenCASCADE_INCLUDE_DIR})

INSTALL.md

@@ -21,11 +21,11 @@ can compile/use it :
 
 *   the python programming language (<http://www.python.org>). Python 3.x is required.
 
-*   OpenCascade 7.6.2 (<https://dev.opencascade.org>)
+*   OpenCascade 7.7.0 (<https://dev.opencascade.org>)
 
     IMPORTANT: OpenCASCADE has to be compiled using flag -D BUILD_RELEASE_DISABLE_EXCEPTIONS=OFF
 
-*   SWIG 4.0.2 or higher (<http://www.swig.org>)
+*   SWIG 4.0.2 (<http://www.swig.org>)
 
 Optional
 --------

NEWS

@@ -1,3 +1,10 @@
+Version 7.7.0 - November 2022
+=============================
+
+This release requires opencascade-7.7.0
+
+* wrapper: port to opencascade-7.7.0
+
 Version 7.6.2 - August 2022
 ===========================
 

README.md

@@ -2,7 +2,7 @@
 [![Downloads Badge](https://anaconda.org/conda-forge/pythonocc-core/badges/downloads.svg)](https://anaconda.org/conda-forge/pythonocc-core)
 [![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/tpaviot/pythonocc-core.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/tpaviot/pythonocc-core/context:python)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/67c121324b8d4f37bc27029464c87020)](https://www.codacy.com/app/tpaviot/pythonocc-core?utm_source=github.com&utm_medium=referral&utm_content=tpaviot/pythonocc-core&utm_campaign=Badge_Grade)
-[![Binder](http://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/tpaviot/pythonocc-binderhub/7.6.2)
+[![Binder](http://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/tpaviot/pythonocc-binderhub/7.7.0)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3686916.svg)](https://doi.org/10.5281/zenodo.3686916)
 
 pythonocc-core
@@ -13,7 +13,7 @@ About
 
 pythonocc provides 3D modeling and dataexchange features. It is intended to CAD/PDM/PLM and BIM related development.
 
-Latest release : [pythonocc-core 7.6.2 (August 2022)](https://github.com/tpaviot/pythonocc-core/releases/tag/7.6.2)
+Latest release : [pythonocc-core 7.7.0 (November 2022)](https://github.com/tpaviot/pythonocc-core/releases/tag/7.7.0)
 
 Features
 --------
@@ -28,18 +28,18 @@ pythonocc provides the following features:
 Try online at mybinder
 ----------------------
 
-Click [![Binder](http://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/tpaviot/pythonocc-binderhub/7.6.2) to open a jupyter notebook running latest pythonocc-core 7.6.2, gmesh (<http://gmsh.info/>) and latest IfcOpenshell (<https://github.com/IfcOpenShell/IfcOpenShell/tree/v0.6.0>) dev branch.
+Click [![Binder](http://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/tpaviot/pythonocc-binderhub/7.7.0) to open a jupyter notebook running latest pythonocc-core 7.7.0, gmesh (<http://gmsh.info/>) and latest IfcOpenshell (<https://github.com/IfcOpenShell/IfcOpenShell/tree/v0.6.0>) dev branch.
 
 Download/install binaries for Linux/OSX/Windows
 -----------------------------------------------
 
-pythonocc provides precompiled [conda packages](https://anaconda.org/pythonocc/pythonocc-core) (they depend on third part libraries made available from the dlr-sc and conda-forge conda channels) for python 3.8, 3.9 and 3.10. This will get you up and running in minutes whether you run win32/win64/linux64/osx64. Here is an example for python 3.7:
+pythonocc provides precompiled [conda packages](https://anaconda.org/pythonocc/pythonocc-core) (they depend on third part libraries made available from the dlr-sc and conda-forge conda channels) for python 3.8, 3.9 and 3.10. This will get you up and running in minutes whether you run win32/win64/linux64/osx64. Here is an example for python 3.9:
 
 ```bash
 # first create an environment
 conda create --name=pyoccenv python=3.9
 source activate pyoccenv
-conda install -c conda-forge pythonocc-core=7.6.2
+conda install -c conda-forge pythonocc-core=7.7.0
 ```
 
 Other channels provide pythonocc-core packages, check https://anaconda.org/search?q=pythonocc-core.
@@ -70,7 +70,7 @@ We use the following online resources:
 pythonocc, oce and opencascade dependencies
 -------------------------------------------
 
-pythonocc-core 7.6.2 depends on the official OpenCascade-7.6.2 library (<https://dev.opencascade.org>)
+pythonocc-core 7.7.0 depends on the official OpenCascade-7.7.0 library (<https://dev.opencascade.org>)
 
 Former releases rely on oce (OpenCascade Community Edition), available at  
 [oce C++ library / CAD kernel](https://github.com/tpaviot/oce).

ci/conda/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "7.6.3" %}
+{% set version = "7.7.0" %}
 
 package:
   name: pythonocc-core
@@ -26,11 +26,11 @@ requirements:
 
   host:
     - python {{ python }}
-    - occt ==7.6.3
+    - occt ==7.7.0
     - numpy >=1.17
 
   run:
-    - occt ==7.6.3
+    - occt ==7.7.0
     - six
     - numpy >=1.17
 

src/MeshDataSource/MeshDataSource.cpp

@@ -1,12 +1,5 @@
 #include "MeshDataSource.h"
-#include <vector>
-#include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
-#include <Precision.hxx>
-#include <Standard_Type.hxx>
-#include <TColgp_SequenceOfXYZ.hxx>
-#include <TColStd_DataMapOfIntegerInteger.hxx>
-#include <TColStd_DataMapOfIntegerReal.hxx>
+
 
 IMPLEMENT_STANDARD_RTTIEXT(MeshDS_DataSource, MeshVS_DataSource)
 

src/MeshDataSource/MeshDataSource.h

@@ -3,6 +3,7 @@
 
 
 #include <algorithm>
+#include <vector>
 
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
@@ -16,12 +17,20 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
+#include <TColStd_DataMapOfIntegerInteger.hxx>
+#include <TColStd_DataMapOfIntegerReal.hxx>
 #include <MeshVS_EntityType.hxx>
 #include <MeshVS_DataSource.hxx>
 #include <Poly_Triangulation.hxx>
-#include <vector>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
+#include <Precision.hxx>
+#include <Standard_Type.hxx>
+#include <TColgp_SequenceOfXYZ.hxx>
+#include <TopTools_HArray2OfShape.hxx>
+#include <TopTools_HArray1OfListOfShape.hxx>
+#include <TopTools_HArray1OfShape.hxx>
+
 
 class MeshDS_DataSource;
 DEFINE_STANDARD_HANDLE(MeshDS_DataSource, MeshVS_DataSource)

src/PkgBase/__init__.py

@@ -1,6 +1,6 @@
 PYTHONOCC_VERSION_MAJOR = 7
-PYTHONOCC_VERSION_MINOR = 6
-PYTHONOCC_VERSION_PATCH = 3
+PYTHONOCC_VERSION_MINOR = 7
+PYTHONOCC_VERSION_PATCH = 0
 
 #  Empty for official releases, set to -dev, -rc1, etc for development releases
 PYTHONOCC_VERSION_DEVEL = ''

src/SWIG_files/common/CommonIncludes.i

@@ -23,6 +23,7 @@ along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
 %include cpointer.i
 %include carrays.i
 %include exception.i
+%include <python/std_array.i>
 %include <python/std_list.i>
 %include <python/std_string.i>
 %include <python/std_basic_string.i>

src/SWIG_files/common/EnumTemplates.i

@@ -12,8 +12,10 @@ ENUM_OUTPUT_TYPEMAPS(CSLib_DerivativeStatus);
 ENUM_OUTPUT_TYPEMAPS(CSLib_NormalStatus);
 ENUM_OUTPUT_TYPEMAPS(MeshVS_EntityType);
 ENUM_OUTPUT_TYPEMAPS(BRepOffset_Status);
+ENUM_OUTPUT_TYPEMAPS(Graphic3d_DisplayPriority);
 ENUM_OUTPUT_TYPEMAPS(Graphic3d_NameOfMaterial);
 ENUM_OUTPUT_TYPEMAPS(GeomAbs_Shape);
+ENUM_OUTPUT_TYPEMAPS(ProxPnt_Status);
 ENUM_OUTPUT_TYPEMAPS(Aspect_TypeOfLine);
 ENUM_OUTPUT_TYPEMAPS(PrsDim_KindOfSurface);
 ENUM_OUTPUT_TYPEMAPS(DsgPrs_ArrowSide);