From 544e72ade827ac7fc3011edd12a63a7bf4c1d5ae Mon Sep 17 00:00:00 2001 From: Trevor Laughlin Date: Sun, 30 May 2021 09:41:04 -0400 Subject: [PATCH] Update to OCCT 7.5.2 (#82) * Update to OCCT 7.5.2 * Use Python 3.7 for binding generation --- CMakeLists.txt | 8 ++++---- OCCT/__init__.py | 2 +- binder/environment.yml | 2 +- ci/conda/meta.yaml | 6 +++--- setup.py | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df1ff9e0..87814ba8 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.1.2 LANGUAGES C CXX) +project(pyOCCT VERSION 7.5.2.0 LANGUAGES C CXX) # --------------------------------------------------------------------------- # @@ -32,8 +32,8 @@ option(ENABLE_WARNINGS "Disable warning output." OFF) # --------------------------------------------------------------------------- # set(pyOCCT_MAJOR_VERSION 7) set(pyOCCT_MINOR_VERSION 5) -set(pyOCCT_PATCH_VERSION 1) -set(pyOCCT_TWEAK_VERSION 2) +set(pyOCCT_PATCH_VERSION 2) +set(pyOCCT_TWEAK_VERSION 0) if(WIN32) set(EXTENSION ".pyd") @@ -118,7 +118,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.1 REQUIRED) + find_package(OpenCASCADE 7.5.2 REQUIRED) endif() if(NOT EXISTS ${OpenCASCADE_INCLUDE_DIR}) diff --git a/OCCT/__init__.py b/OCCT/__init__.py index 2357e142..1bb9cbfd 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.1.2' +__version__ = '7.5.2.0' diff --git a/binder/environment.yml b/binder/environment.yml index ec0b837a..4bcaa143 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -5,5 +5,5 @@ dependencies: - python=3.7 - clangdev - python-clang - - occt=7.5.1 + - occt=7.5.2 - tbb-devel diff --git a/ci/conda/meta.yaml b/ci/conda/meta.yaml index 8a518510..5cf76319 100644 --- a/ci/conda/meta.yaml +++ b/ci/conda/meta.yaml @@ -1,6 +1,6 @@ package: name: pyocct - version: 7.5.1.2 + version: 7.5.2.0 source: path: ../.. @@ -20,12 +20,12 @@ requirements: host: - python - pybind11 - - occt ==7.5.1 + - occt ==7.5.2 - tbb-devel run: - python - - occt ==7.5.1 + - occt ==7.5.2 test: source_files: diff --git a/setup.py b/setup.py index 907f6cb6..b4065f96 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='OCCT', - version='7.5.1.2', + version='7.5.2.0', packages=['OCCT', 'OCCT.Exchange', 'OCCT.Visualization'], package_data={'OCCT': ['*.so', '*.pyd', '*.dll', 'Visualization/_resources/*']}, author='Trevor Laughlin',