From d6977b71f9450e6ccf7601df162785dd8e186a7c Mon Sep 17 00:00:00 2001 From: frmdstryr Date: Tue, 16 Nov 2021 15:06:54 -0500 Subject: [PATCH 1/6] Update linux to 7.6.0 --- CMakeLists.txt | 7 ++--- OCCT/__init__.py | 2 +- binder/config.txt | 46 ++++++++++++++++++++++++++++----- binder/environment.yml | 3 ++- binder/pyOCCT_binder | 2 +- binder/run.py | 2 ++ ci/conda/meta.yaml | 6 ++--- inc/bind_NCollection_Shared.hxx | 45 ++++++++++++++++++++++++++++++++ inc/xTypes.h | 20 ++++---------- setup.py | 2 +- 10 files changed, 103 insertions(+), 32 deletions(-) create mode 100644 inc/bind_NCollection_Shared.hxx diff --git a/CMakeLists.txt b/CMakeLists.txt index f1ba05fad..7992ea556 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,8 +31,8 @@ option(ENABLE_WARNINGS "Disable warning output." OFF) # SETTINGS # --------------------------------------------------------------------------- # set(pyOCCT_MAJOR_VERSION 7) -set(pyOCCT_MINOR_VERSION 5) -set(pyOCCT_PATCH_VERSION 3) +set(pyOCCT_MINOR_VERSION 6) +set(pyOCCT_PATCH_VERSION 0) set(pyOCCT_TWEAK_VERSION 0) if(WIN32) @@ -108,6 +108,7 @@ find_package(GLEW REQUIRED) # X11 # --------------------------------------------------------------------------- # if(NOT WIN32 AND NOT APPLE) + add_definitions (-DHAVE_XLIB) find_package(X11 REQUIRED) endif() @@ -118,7 +119,7 @@ endif() include_directories(inc) if(NOT DEFINED OpenCASCADE_INCLUDE_DIR OR NOT DEFINED OpenCASCADE_LIBRARY_DIR) message(STATUS "Searching for OpenCASCADE...") - find_package(OpenCASCADE 7.5.3 REQUIRED) + find_package(OpenCASCADE 7.6.0 REQUIRED) endif() if(NOT EXISTS ${OpenCASCADE_INCLUDE_DIR}) diff --git a/OCCT/__init__.py b/OCCT/__init__.py index 6b14dd686..7f9b13d06 100644 --- a/OCCT/__init__.py +++ b/OCCT/__init__.py @@ -17,4 +17,4 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -__version__ = '7.5.3.0' +__version__ = '7.6.0.0' diff --git a/binder/config.txt b/binder/config.txt index cfd8d852a..164d5b4cf 100644 --- a/binder/config.txt +++ b/binder/config.txt @@ -13,6 +13,7 @@ +arg win32: -fdelayed-template-parsing +arg linux: -D_INC_WINDOWS +arg linux: -D__WINDOWS_H_INCLUDED ++arg linux: -DHAVE_XLIB # Immutable types ------------------------------------------------------------- +immutable Standard_Boolean @@ -40,6 +41,9 @@ -class Graphic3d_BvhCStructureSetTrsfPers -class Graphic3d_Layer +-class Message_ProgressScope +-class Message_LazyProgressScope + -class OpenGl_GraduatedTrihedron -class OpenGl_LayerList -class OpenGl_RaytraceGeometry @@ -53,6 +57,10 @@ -class OpenGl_VariableSetterSelector -class OpenGl_LineAttributes +-class OSD_IStreamBuffer +-class OSD_OStreamBuffer +-class OSD_IOStreamBuffer + -class PCDM_DOMHeaderParser -class AIS_DataMapOfSelStat @@ -504,7 +512,8 @@ -function OpenGl_Workspace::BufferDump -function OpenGl_Workspace::ResetAppliedAspect -function OpenGl_Group::GlStruct - +-function OpenGl_DepthPeeling::DepthPeelFbosOit +-function OpenGl_DepthPeeling::FrontBackColorFbosOit -function PCDM::FileDriverType_ -function PCDM_DOMHeaderParser::SetStartElementName -function PCDM_DOMHeaderParser::SetEndElementName @@ -551,6 +560,9 @@ -function StepData_StepReaderData::ReadEnumParam -function StepData_UndefinedEntity::Super +-function StepFile_ReadData::GetArgDescription +-function StepFile_ReadData::GetRecordDescription + -function StepFEA_SymmetricTensor43d::SetFeaIsotropicSymmetricTensor43d -function STEPSelections_Counter::POP @@ -624,6 +636,9 @@ -header* glext.h -header* NCollection_Shared.hxx +-header ProjLib: ProjLib_HCompProjectedCurve.hxx +-header ProjLib: ProjLib_HProjectedCurve.hxx + +header Aspect: xTypes.h +header AIS: AIS_PyInteractiveObject.hxx +header BinMXCAFDoc: BinTools_LocationSet.hxx @@ -644,9 +659,6 @@ +header BRepBlend: math_Matrix.hxx +header BRepBlend: gp_Lin.hxx +header BRepBlend: Blend_Point.hxx -+header BRepBlend: Adaptor3d_HSurface.hxx -+header BRepBlend: Adaptor3d_HCurve.hxx -+header BRepBlend: Adaptor2d_HCurve2d.hxx +header BRepBlend: gp_Ax1.hxx +header BRepBlend: gp_Circ.hxx +header BRepBlend: Law_Function.hxx @@ -654,7 +666,9 @@ +header BRepBuilderAPI: gp_XY.hxx +header BRepBuilderAPI: gp_XYZ.hxx ++header BRepCheck: bind_NCollection_Shared.hxx +header BRepFill: TopTools_HArray1OfShape.hxx ++header BRepFill: gp_Pln.hxx +header BRepGProp: BRepGProp_Face.hxx +header BRepGProp: BRepGProp_Domain.hxx @@ -665,6 +679,7 @@ +header BRepOffsetAPI: TopoDS_Edge.hxx +header BRepOffsetAPI: TopoDS_Face.hxx +header BRepOffsetAPI: BRepTools_ReShape.hxx ++header BlendFunc: Adaptor2d_Curve2d.hxx +header BVH_Traverse: bind_BVH_BaseTraverse.hxx +header BVH_BoxSet: bind_BVH_PrimitiveSet.hxx @@ -673,13 +688,15 @@ +header BVH_ObjectSet: bind_BVH_Set.hxx +header BVH_PrimitiveSet: bind_BVH_Object.hxx +header BVH_Triangulation: bind_BVH_PrimitiveSet.hxx - ++header CPnts: Adaptor2d_Curve2d.hxx +header Font: bind_Font_BRepFont.hxx +header Graphic3d: bind_BVH_Set.hxx +header Graphic3d: Precision.hxx ++header GeomLib: Geom2d_BezierCurve.hxx +header HLRAlgo: gp_XYZ.hxx ++header HLRTopoBRep: Adaptor2d_Curve2d.hxx +header IMeshTools: IMeshData_Face.hxx @@ -687,6 +704,9 @@ +header IntPolyh: IntPolyh_Triangle.hxx +# Already there but order is wrong? ++header IntAna: gp_Sphere.hxx + +header MMgt: Standard_Type.hxx +header NCollection: gp_Pnt.hxx @@ -701,6 +721,7 @@ +header PCDM: Storage_BaseDriver.hxx +header PCDM: Standard_IStream.hxx ++header Poly: bind_NCollection_AliasedArray.hxx +header ProjLib: Adaptor3d_Surface.hxx +header ProjLib: Adaptor3d_Curve.hxx @@ -708,6 +729,7 @@ +header Prs3d: Poly_Polygon3D.hxx +header PrsMgr: PrsMgr_Presentation.hxx ++header RWGltf: bind_NCollection_Shared.hxx +header SelectMgr: bind_SelectMgr_Frustum.hxx @@ -718,6 +740,7 @@ -header Standard: NCollection_SparseArrayBase.hxx -header Standard: NCollection_SparseArrayBase.hxx -header Standard: Storage_Schema.hxx ++header Standard: bind_NCollection_Shared.hxx +header StdLPersistent: bind_StdObjMgt_Attribute.hxx @@ -759,6 +782,8 @@ # Python names ---------------------------------------------------------------- +pname AIS_PointCloud::DisplayMode-->enumDisplayMode +pname NCollection_Lerp-->gp_TrsfNLerp ++pname GCPnts_TCurveTypes-->GCPnts_TCurveTypes3d ++pname GCPnts_TCurveTypes-->GCPnts_TCurveTypes2d # nodelete option ------------------------------------------------------------- +nodelete TDF_LabelNode @@ -766,6 +791,8 @@ +nodelete NCollection_SeqNode +nodelete NCollection_ListNode + + # Excluded base classes ------------------------------------------------------- -base BRepExtrema_OverlapTool: BVH_PairTraverse -base LDOM_OSStream: Standard_OStream @@ -815,6 +842,7 @@ -field VrmlData_InBuffer::Input # Excluded imports ------------------------------------------------------------ +-import Aspect: WNT -import AIS: WNT -import Geom: GeomEvaluator -import Geom2d: Geom2dEvaluator @@ -929,6 +957,8 @@ +before_type OpenGl_BVHClipPrimitiveTrsfPersSet-->bind_BVH_Set(mod, "BVH_Set_Standard_Real3", py::module_local()); +before_type OpenGl_RaytraceGeometry-->bind_BVH_Geometry(mod, "BVH_Geometry_Standard_ShortReal3", py::module_local()); ++before_type Poly_ArrayOfNodes-->bind_NCollection_AliasedArray<16>(mod, "NCollection_AliasedArray16", py::module_local(false)); + +before_type SelectMgr_RectangularFrustum-->bind_SelectMgr_Frustum<4>(mod, "Select_Mgr_Frustum4", py::module_local()); +before_type SelectMgr_TriangularFrustum-->bind_SelectMgr_Frustum<3>(mod, "Select_Mgr_Frustum3", py::module_local()); @@ -958,7 +988,7 @@ +after_type BRepAlgoAPI_Algo-->cls_BRepAlgoAPI_Algo.def("HasWarning", [](BRepAlgoAPI_Algo &self, Handle(Standard_Type) &theType) { return self.HasWarning(theType); }, "Returns true if algorithm has generated warning of specified type", py::arg("theType")); +after_type BRepAlgoAPI_Algo-->cls_BRepAlgoAPI_Algo.def("ClearWarnings", [](BRepAlgoAPI_Algo &self) { self.ClearWarnings(); }, "Clears the warnings of the algorithm"); +after_type BRepAlgoAPI_Algo-->cls_BRepAlgoAPI_Algo.def("GetReport", [](BRepAlgoAPI_Algo &self) { const Handle(Message_Report) r = self.GetReport(); return r; }, "Returns report collecting all errors and warnings"); -+after_type BRepAlgoAPI_Algo-->cls_BRepAlgoAPI_Algo.def("SetProgressIndicator", [](BRepAlgoAPI_Algo &self, const Message_ProgressScope &pi) {return self.SetProgressIndicator(pi); }, "Set the Progress Indicator object.", py::arg("theObj")); +#+after_type BRepAlgoAPI_Algo-->cls_BRepAlgoAPI_Algo.def("SetProgressIndicator", [](BRepAlgoAPI_Algo &self, const Message_ProgressScope &pi) {return self.SetProgressIndicator(pi); }, "Set the Progress Indicator object.", py::arg("theObj")); +after_type Geom_Surface-->cls_Geom_Surface.def("U1", [](Geom_Surface &self) { Standard_Real U1; Standard_Real U2; Standard_Real V1; Standard_Real V2; self.Bounds(U1, U2, V1, V2); return U1; }, "Returns the parametric bound U1."); +after_type Geom_Surface-->cls_Geom_Surface.def("U2", [](Geom_Surface &self) { Standard_Real U1; Standard_Real U2; Standard_Real V1; Standard_Real V2; self.Bounds(U1, U2, V1, V2); return U2; }, "Returns the parametric bound U2."); @@ -976,6 +1006,7 @@ +after_type TopoDS_Shape-->cls_TopoDS_Shape.def("__hash__", [](TopoDS_Shape &self) {return self.HashCode(999999); }); +after_type XCAFDoc_ShapeTool-->cls_XCAFDoc_ShapeTool.def("FindSubShape", [](XCAFDoc_ShapeTool &self, const TDF_Label &shapeL, const TopoDS_Shape &sub) { TDF_Label L; Standard_Boolean status = self.FindSubShape(shapeL, sub, L); return std::tuple(status, L); }, "Finds a label for subshape of shape stored on label shapeL Returns Null label if it is not found", py::arg("shapeL"), py::arg("sub")); ++after_type XCAFDoc_VisMaterial-->bind_NCollection_DataMap, opencascade::handle, NCollection_DefaultHasher> >(mod, "XCAFDoc_VisMaterialDataMap", py::module_local(false)); # Add exception translator +after_type Standard_Failure-->py::register_exception_translator([](std::exception_ptr p) {try {if (p) std::rethrow_exception(p);} catch (const Standard_Failure &e) { PyErr_SetString(PyExc_RuntimeError, e.GetMessageString());}}); @@ -990,6 +1021,7 @@ +patch bind_BVH_BaseBox: template -->template class TheDerivedBox> +patch bind_BVH_BaseBox: BVH_BaseBox-->BVH_BaseBox +patch bind_BVH_Traverse: (const int &)-->(const opencascade::handle>&) ++patch bind_SelectMgr_Frustum: cls_SelectMgr_Frustum.def(py::init<>());-->//cls_SelectMgr_Frustum.def(py::init<>()); +patch Geom: (const TColStd_Array2OfReal * (Geom_BSplineSurface::*)() const) &Geom_BSplineSurface::Weights-->[](Geom_BSplineSurface& self) -> py::object {return self.Weights() ? py::cast(*self.Weights()) : py::none(); } @@ -1017,4 +1049,4 @@ # Split modules +split Graphic3d -+split OpenGl \ No newline at end of file ++split OpenGl diff --git a/binder/environment.yml b/binder/environment.yml index 7629f44d2..6ed63dd3c 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -5,5 +5,6 @@ dependencies: - python=3.7 - clangdev - python-clang - - occt=7.5.3 + - occt=7.6.0 - tbb-devel + - rapidjson diff --git a/binder/pyOCCT_binder b/binder/pyOCCT_binder index 5d4b138a3..c4bd64607 160000 --- a/binder/pyOCCT_binder +++ b/binder/pyOCCT_binder @@ -1 +1 @@ -Subproject commit 5d4b138a386aa5f6856c68f3033c1bb18ae6d5d8 +Subproject commit c4bd64607c32812aa9e34e652eda80231b475fa0 diff --git a/binder/run.py b/binder/run.py index 0c1a6a983..312964d3d 100644 --- a/binder/run.py +++ b/binder/run.py @@ -24,6 +24,8 @@ def find_include_path(name, path): :return: The full path to the directory of the given header file. """ for root, dirs, files in os.walk(path): + if "pkgs" in root: + continue # Skip conda's cached package downloads if name in files: return root diff --git a/ci/conda/meta.yaml b/ci/conda/meta.yaml index ab0247d6f..99ab97ca9 100644 --- a/ci/conda/meta.yaml +++ b/ci/conda/meta.yaml @@ -1,6 +1,6 @@ package: name: pyocct - version: 7.5.3.0 + version: 7.6.0.0 source: path: ../.. @@ -20,12 +20,12 @@ requirements: host: - python - pybind11 - - occt ==7.5.3 + - occt ==7.6.0 - tbb-devel run: - python - - occt ==7.5.3 + - occt ==7.6.0 test: source_files: diff --git a/inc/bind_NCollection_Shared.hxx b/inc/bind_NCollection_Shared.hxx new file mode 100644 index 000000000..ac511c43a --- /dev/null +++ b/inc/bind_NCollection_Shared.hxx @@ -0,0 +1,45 @@ + +/* +This file is part of pyOCCT which provides Python bindings to the OpenCASCADE +geometry kernel. + +Copyright (C) 2016-2018 Laughlin Research, LLC +Copyright (C) 2019 Trevor Laughlin and the pyOCCT contributors + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ +#ifndef __bind_NCollection_Shared__ +#define __bind_NCollection_Shared__ + +#include + +#include +#include +#include +#include + +template ::value>::type> +void bind_NCollection_Shared(py::module &mod, std::string const &name, py::module_local const &local) { + py::class_> cls(mod, name.c_str(), "None", local); + + // Constructors + cls.def(py::init<>()); + //cls.def(py::init(), py::arg("arg1")); + //cls.def(py::init(), py::arg("arg1")); + //cls.def(py::init(), py::arg("arg1")); + +} + +#endif diff --git a/inc/xTypes.h b/inc/xTypes.h index f3c88659b..733073548 100644 --- a/inc/xTypes.h +++ b/inc/xTypes.h @@ -32,25 +32,15 @@ in X library files, which may not be present in all systems anyway. #ifndef __xTypes_h__ #define __xTypes_h__ -/* -typedef struct _xcolor { - - unsigned long pixel; - unsigned short red; - unsigned short green; - unsigned short blue; - char flags; - char pad; - -} XColor; -*/ +// Includes X11/Xlib.h +#include -struct _XDisplay { +struct __GLXFBConfigRec { }; -struct __GLXFBConfigRec { +struct Aspect_XDisplay {}; +struct Aspect_XVisualInfo {}; -}; #endif /* !__xTypes_h */ diff --git a/setup.py b/setup.py index 4481e80df..4f6c82d12 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ setup( name='OCCT', - version='7.5.3.0', + version='7.6.0.0', packages=['OCCT', 'OCCT.Exchange', 'OCCT.Visualization'], package_data={'OCCT': ['*.so', '*.pyd', '*.dll', 'Visualization/_resources/*']}, author='Trevor Laughlin', From d6e7f4988e40a156337f3b1a73449b08045cc2c4 Mon Sep 17 00:00:00 2001 From: frmdstryr Date: Wed, 17 Nov 2021 11:19:49 -0500 Subject: [PATCH 2/6] Add missing module, version, and fix a few imports --- CMakeLists.txt | 3 ++- binder/config.txt | 14 ++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7992ea556..2bfdf0646 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA cmake_minimum_required(VERSION 3.15...3.20) -project(pyOCCT VERSION 7.5.3.0 LANGUAGES C CXX) +project(pyOCCT VERSION 7.6.0.0 LANGUAGES C CXX) # --------------------------------------------------------------------------- # @@ -154,6 +154,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${OUTPUT_PATH}") # Include the file specifying available OCCT modules include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/OCCT_Modules.cmake) +list(APPEND OCCT_MODULES "StepKinematics") # OCCT foreach(MOD ${OCCT_MODULES}) diff --git a/binder/config.txt b/binder/config.txt index 164d5b4cf..44dc63ed8 100644 --- a/binder/config.txt +++ b/binder/config.txt @@ -57,9 +57,9 @@ -class OpenGl_VariableSetterSelector -class OpenGl_LineAttributes --class OSD_IStreamBuffer --class OSD_OStreamBuffer --class OSD_IOStreamBuffer +-class std::basic_istream +-class std::basic_ostream +-class std::basic_iostream -class PCDM_DOMHeaderParser @@ -730,6 +730,7 @@ +header PrsMgr: PrsMgr_Presentation.hxx +header RWGltf: bind_NCollection_Shared.hxx ++header RWGltf: bind_NCollection_IndexedMap.hxx +header SelectMgr: bind_SelectMgr_Frustum.hxx @@ -859,6 +860,7 @@ # Import guards --------------------------------------------------------------- +iguard AIS: PrsDim +iguard Aspect: Graphic3d ++iguard CDM: PCDM +iguard Font: Graphic3d +iguard Font: StdPrs +iguard Graphic3d: Select3D @@ -867,6 +869,7 @@ +iguard LDOMParser: LDOM +iguard Media: Graphic3d +iguard SelectBasics: Select3D ++iguard SelectBasics: SelectMgr +iguard SelectMgr: StdSelect +iguard Standard: TCollection +iguard Standard: NCollection @@ -954,10 +957,13 @@ +before_type Graphic3d_BvhCStructureSetTrsfPers-->bind_BVH_Set(mod, "BVH_Set_Standard_Real3", py::module_local()); + ++before_type RWGltf_GltfSceneNodeMap-->bind_NCollection_IndexedMap(mod, "XCAFPrs_DocumentNode_IndexedMap", py::module_local()); + +before_type OpenGl_BVHClipPrimitiveTrsfPersSet-->bind_BVH_Set(mod, "BVH_Set_Standard_Real3", py::module_local()); +before_type OpenGl_RaytraceGeometry-->bind_BVH_Geometry(mod, "BVH_Geometry_Standard_ShortReal3", py::module_local()); -+before_type Poly_ArrayOfNodes-->bind_NCollection_AliasedArray<16>(mod, "NCollection_AliasedArray16", py::module_local(false)); ++before_type Poly_ArrayOfNodes-->bind_NCollection_AliasedArray<16>(mod, "NCollection_AliasedArray16", py::module_local()); +before_type SelectMgr_RectangularFrustum-->bind_SelectMgr_Frustum<4>(mod, "Select_Mgr_Frustum4", py::module_local()); +before_type SelectMgr_TriangularFrustum-->bind_SelectMgr_Frustum<3>(mod, "Select_Mgr_Frustum3", py::module_local()); From 26734ea6a44987a1e1640ee53812f88b04f7aca5 Mon Sep 17 00:00:00 2001 From: frmdstryr Date: Wed, 17 Nov 2021 11:30:35 -0500 Subject: [PATCH 3/6] Disable osd stream classes using patch and move StepKinematics module to OCCT_Modules --- CMakeLists.txt | 1 - binder/config.txt | 7 +++---- cmake/OCCT_Modules.cmake | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2bfdf0646..d2234d430 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,7 +154,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${OUTPUT_PATH}") # Include the file specifying available OCCT modules include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/OCCT_Modules.cmake) -list(APPEND OCCT_MODULES "StepKinematics") # OCCT foreach(MOD ${OCCT_MODULES}) diff --git a/binder/config.txt b/binder/config.txt index 44dc63ed8..3b74a6f61 100644 --- a/binder/config.txt +++ b/binder/config.txt @@ -57,10 +57,6 @@ -class OpenGl_VariableSetterSelector -class OpenGl_LineAttributes --class std::basic_istream --class std::basic_ostream --class std::basic_iostream - -class PCDM_DOMHeaderParser -class AIS_DataMapOfSelStat @@ -1053,6 +1049,9 @@ # Inject trampoline +patch AIS: py::class_py::class_// bind_OSD_StreamBuffer + # Split modules +split Graphic3d +split OpenGl diff --git a/cmake/OCCT_Modules.cmake b/cmake/OCCT_Modules.cmake index 1b67bee17..6b862cbe6 100644 --- a/cmake/OCCT_Modules.cmake +++ b/cmake/OCCT_Modules.cmake @@ -275,6 +275,7 @@ LIST(APPEND OCCT_MODULES StepFEA StepFile StepGeom + StepKinematics StepRepr StepSelect STEPSelections From 015350cfee94abab90abf29b3c77e2bf30dbb048 Mon Sep 17 00:00:00 2001 From: frmdstryr Date: Wed, 17 Nov 2021 11:32:36 -0500 Subject: [PATCH 4/6] ci: Add python 3.10 --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d3cbaae3..7d1470bea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: run: | sudo apt-get update sudo apt-get -q -y install libglu1-mesa-dev libgl1-mesa-dev libxi-dev libglfw3-dev libgles2-mesa-dev - + - name: "Prepare VM" run: | sudo rm -Rf /home/linuxbrew/ @@ -112,17 +112,17 @@ jobs: fail-fast: false matrix: os: ['ubuntu-latest'] - python-version: ['3.6', '3.7', '3.8', '3.9'] + python-version: ['3.6', '3.7', '3.8', '3.9', '3.10'] steps: - name: "Install OpenGL" run: | sudo apt-get update sudo apt-get -q -y install libglu1-mesa-dev libgl1-mesa-dev libxi-dev libglfw3-dev libgles2-mesa-dev - + - name: "Prepare VM" run: sudo rm -Rf /home/linuxbrew/ - + - name: "Clone pyOCCT" uses: actions/checkout@v2 @@ -163,7 +163,7 @@ jobs: fail-fast: false matrix: os: ['windows-latest'] - python-version: ['3.6', '3.7', '3.8', '3.9'] + python-version: ['3.6', '3.7', '3.8', '3.9', '3.10'] steps: - name: "Clone pyOCCT" From 799e9a9ca09f176203bf69c65dcff50de38c0bc2 Mon Sep 17 00:00:00 2001 From: frmdstryr Date: Wed, 17 Nov 2021 14:37:38 -0500 Subject: [PATCH 5/6] Drop opengl compat headers --- binder/config.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/binder/config.txt b/binder/config.txt index 3b74a6f61..aede27c55 100644 --- a/binder/config.txt +++ b/binder/config.txt @@ -635,6 +635,10 @@ -header ProjLib: ProjLib_HCompProjectedCurve.hxx -header ProjLib: ProjLib_HProjectedCurve.hxx +-header OpenGl: OpenGl_BufferCompatT.hxx +-header OpenGl: OpenGl_VertexBufferCompat.hxx +-header OpenGl: bind_OpenGl_BufferCompatT.hxx + +header Aspect: xTypes.h +header AIS: AIS_PyInteractiveObject.hxx +header BinMXCAFDoc: BinTools_LocationSet.hxx From b97b42002898111bc522ca0dc0851bca33c858c1 Mon Sep 17 00:00:00 2001 From: frmdstryr Date: Wed, 17 Nov 2021 16:27:51 -0500 Subject: [PATCH 6/6] revert and drop opengl buffer compat typedefs --- binder/config.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/binder/config.txt b/binder/config.txt index aede27c55..9cbd74ec0 100644 --- a/binder/config.txt +++ b/binder/config.txt @@ -115,6 +115,8 @@ -typedef OpenGl_Layer -typedef OpenGl_ListOfStructure -typedef OpenGl_SetterList +-typedef OpenGl_VertexBufferCompat +-typedef OpenGl_IndexBufferCompat -typedef PCDM_BaseDriverPointer @@ -635,10 +637,6 @@ -header ProjLib: ProjLib_HCompProjectedCurve.hxx -header ProjLib: ProjLib_HProjectedCurve.hxx --header OpenGl: OpenGl_BufferCompatT.hxx --header OpenGl: OpenGl_VertexBufferCompat.hxx --header OpenGl: bind_OpenGl_BufferCompatT.hxx - +header Aspect: xTypes.h +header AIS: AIS_PyInteractiveObject.hxx +header BinMXCAFDoc: BinTools_LocationSet.hxx