Merge pull request #1424 from tpaviot/review/occt790

Review/occt790

Author: tpaviot

CMakeLists.txt

@@ -1,36 +1,36 @@
-##Copyright (c) 2011-2020 Thomas Paviot ([email protected])
+##Copyright (c) 2011-2025 Thomas Paviot ([email protected])
 ##
 ##This file is part of pythonOCC.
 ##
 ##pythonOCC is free software: you can redistribute it and/or modify
-##it under the terms of the GNU General Public License as published by
+##it under the terms of the GNU Lesser General Public License as published by
 ##the Free Software Foundation, either version 3 of the License, or
 ##(at your option) any later version.
 ##
 ##pythonOCC 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 General Public License for more details.
+##GNU Lesser General Public License for more details.
 ##
-##You should have received a copy of the GNU General Public License
+##You should have received a copy of the GNU Lesser General Public License
 ##along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
 
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.18)
 
 project(PYTHONOCC)
 
 # set pythonOCC version
 set(PYTHONOCC_VERSION_MAJOR 7)
-set(PYTHONOCC_VERSION_MINOR 8)
-set(PYTHONOCC_VERSION_PATCH 1)
+set(PYTHONOCC_VERSION_MINOR 9)
+set(PYTHONOCC_VERSION_PATCH 0)
 
 #  Empty for official releases, set to -dev, -rc1, etc for development releases
-set(PYTHONOCC_VERSION_DEVEL 1)
+set(PYTHONOCC_VERSION_DEVEL)
 
 # set OCCT version
 set(OCCT_VERSION_MAJOR 7)
-set(OCCT_VERSION_MINOR 8)
-set(OCCT_VERSION_PATCH 1)
+set(OCCT_VERSION_MINOR 9)
+set(OCCT_VERSION_PATCH 0)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 
@@ -96,7 +96,7 @@ option_with_default(PYTHONOCC_MESHDS_NUMPY "Enable using numpy to speed up mesh
 set(Python3_FIND_STRATEGY LOCATION)
 set(Python3_FIND_FRAMEWORK NEVER)
 if(PYTHONOCC_MESHDS_NUMPY)
-    find_package(Python3 COMPONENTS Interpreter Development NumPy REQUIRED)
+    find_package(Python3 3.9 COMPONENTS Interpreter Development NumPy REQUIRED)
     include_directories(${Python3_NumPy_INCLUDE_DIRS})
     message(STATUS "Numpy include directory: ${Python3_NumPy_INCLUDE_DIRS}")
     set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -DBUILD_MESHDS_NUMPY)
@@ -110,7 +110,8 @@ message(STATUS "Python library release: ${Python3_LIBRARY_RELEASE}")
 ########
 # SWIG #
 ########
-find_package(SWIG 4.2.1 REQUIRED)
+find_package(SWIG 4.2.1...4.3.0 REQUIRED)
+message(STATUS "SWIG version found: ${SWIG_VERSION}")
 include(${SWIG_USE_FILE})
 set(SWIG_FILES_PATH src/SWIG_files/wrapper)
 set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -fvirtual)
@@ -148,7 +149,7 @@ endif()
 # OCE include and lib location #
 ################################
 if(OCCT_HIDE_DEPRECATED)
-  message(STATUS "Disabled deprecation warnings for oce")
+  message(STATUS "Disabled deprecation warnings for OpenCASCADE")
   add_definitions(-DOCCT_NO_DEPRECATED)
 endif(OCCT_HIDE_DEPRECATED)
 
@@ -163,15 +164,15 @@ if(DEFINED OCCT_INCLUDE_DIR)
 # if OCCT_INCLUDE_DIR is not passed at command line,
 # find OCE automatically
 else(OCCT_INCLUDE_DIR)
-  find_package(OpenCASCADE ${OCCT_VERSION_MAJOR}.${OCCT_VERSION_MINOR}.${OCCT_VERSION_PATCH} REQUIRED)
+  find_package(OpenCASCADE ${OCCT_VERSION_MAJOR}.${OCCT_VERSION_MINOR}.${OCCT_VERSION_PATCH} EXACT 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})
     message(STATUS "OpenCASCADE binary directory: " ${OpenCASCADE_BINARY_DIR})
     include_directories(${OpenCASCADE_INCLUDE_DIR})
   else(OpenCASCADE_FOUND)  # set default paths
-    set(OCCT_INCLUDE_DIR /usr/local/include/oce CACHE PATH "OCE include path")
-    set(OCCT_LIBRARY_DIR /usr/local/lib CACHE PATH "OCE lib path")
+    set(OCCT_INCLUDE_DIR /usr/local/include/opencascade CACHE PATH "OpenCASCADE include path")
+    set(OCCT_LIBRARY_DIR /usr/local/lib CACHE PATH "OpenCASCADE lib path")
     include_directories(${OCCT_INCLUDE_DIR})
     link_directories(${OCCT_LIBRARY_DIR})
   endif(OpenCASCADE_FOUND)
@@ -312,6 +313,9 @@ swig_link_libraries(Tesselator ${OCCT_MODEL_LIBRARIES} Python3::Module)
 #################
 if(PYTHONOCC_WRAP_VISU)
     find_package(OpenGL REQUIRED)
+    if(OPENGL_FOUND)
+      message(STATUS "OpenGL found; Visualization support enabled")
+    endif()
     include_directories(OPENGL_INCLUDE_DIR)
 
     foreach(OCCT_MODULE ${OCCT_TOOLKIT_VISUALIZATION})

INSTALL.md

@@ -1,4 +1,4 @@
-# Building pythonOCC 7.8.1.1 - Complete Guide for Linux and Windows
+# Building pythonOCC 7.9.0 - Complete Guide for Linux and Windows
 
 ## Table of Contents
 - [Linux Build Guide](#linux-build-guide)
@@ -35,14 +35,14 @@ Before starting the build process, ensure your system meets these requirements:
 
 ## System Requirements (Linux)
 
-pythonOCC 7.8.1.1 requires the following components:
+pythonOCC 7.9.0 requires the following components:
 
 | Component | Version | Purpose |
 |-----------|---------|---------|
 | Python | ≥ 3.9 | Runtime environment |
-| OpenCascade | 7.8.1.1 | Core CAD functionality |
+| OpenCascade | 7.9.0 | Core CAD functionality |
 | SWIG | 4.2.1 | Interface generation |
-| CMake | ≥ 3.1 | Build system |
+| CMake | ≥ 3.20 | Build system |
 
 ## Build Process (Linux)
 
@@ -72,33 +72,33 @@ sudo apt-get install -y \
 
 ### 2. Building SWIG (Linux)
 
-SWIG 4.2.1 is required but not available in Ubuntu's default repositories. Build it from source:
+SWIG 4.2.1 or higher is required but not available in Ubuntu's default repositories. Build it from source:
 
 ```bash
-wget http://prdownloads.sourceforge.net/swig/swig-4.2.1.tar.gz
-tar -zxvf swig-4.2.1.tar.gz
-cd swig-4.2.1
+wget http://prdownloads.sourceforge.net/swig/swig-4.3.0.tar.gz
+tar -zxvf swig-4.3.0.tar.gz
+cd swig-4.3.0
 ./configure
 make -j$(nproc)
 sudo make install
 ```
 
 ### 3. Building OpenCascade (Linux)
 
-Download and extract OpenCascade 7.8.1.1:
+Download and extract OpenCascade 7.9.0:
 
 ```bash
-wget https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_8_1.tar.gz
-tar -xvzf V7_8_1.tar.gz
-cd OCCT-7.8.1.1
+wget https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_9_0.tar.gz
+tar -xvzf V7_9_0.tar.gz
+cd OCCT-7.9.0
 mkdir cmake-build
 cd cmake-build
 ```
 
 Configure and build OpenCascade:
 
 ```bash
-cmake -DINSTALL_DIR=/opt/occt781 \
+cmake -DINSTALL_DIR=/opt/occt790 \
       -DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF \
       ..
 
@@ -109,7 +109,7 @@ sudo make install
 Add OpenCascade libraries to the system:
 
 ```bash
-sudo bash -c 'echo "/opt/occt781/lib" >> /etc/ld.so.conf.d/occt.conf'
+sudo bash -c 'echo "/opt/occt790/lib" >> /etc/ld.so.conf.d/occt.conf'
 sudo ldconfig
 ```
 
@@ -126,8 +126,8 @@ mkdir cmake-build && cd cmake-build
 PYTHONOCC_INSTALL_DIRECTORY=${PYTHONOCC_INSTALL_DIRECTORY:-/usr/local}
 
 cmake \
-    -DOCCT_INCLUDE_DIR=/opt/occt781/include/opencascade \
-    -DOCCT_LIBRARY_DIR=/opt/occt781/lib \
+    -DOCCT_INCLUDE_DIR=/opt/occt790/include/opencascade \
+    -DOCCT_LIBRARY_DIR=/opt/occt790/lib \
     -DCMAKE_BUILD_TYPE=Release \
     -DPYTHONOCC_INSTALL_DIRECTORY=$PYTHONOCC_INSTALL_DIRECTORY \
     ..
@@ -138,7 +138,7 @@ make -j$(nproc) && sudo make install
 Add OpenCascade libraries to your environment:
 
 ```bash
-echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/occt781/lib' >> ~/.bashrc
+echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/occt790/lib' >> ~/.bashrc
 source ~/.bashrc
 ```
 
@@ -159,11 +159,11 @@ Before starting the build process, ensure your system meets these requirements:
 |-----------|---------|---------------|
 | Visual Studio | 2019 or 2022 Community | [Download](https://visualstudio.microsoft.com/downloads/) |
 | Python | ≥ 3.9 | [Download](https://www.python.org/downloads/) |
-| CMake | ≥ 3.1 | [Download](https://cmake.org/download/) |
+| CMake | ≥ 3.20 | [Download](https://cmake.org/download/) |
 | Git | Latest | [Download](https://git-scm.com/download/win) |
 | RapidJSON | Latest | [Download](https://github.com/Tencent/rapidjson.git) |
-| SWIG | 4.2.1 | [Download](http://www.swig.org/download.html) |
-| OpenCascade | 7.8.1.1 | [Download](https://dev.opencascade.org/download) |
+| SWIG | ≥ 4.2.1 | [Download](http://www.swig.org/download.html) |
+| OpenCascade | 7.9.0 | [Download](https://dev.opencascade.org/download) |
 
 ## Build Process (Windows)
 
@@ -190,7 +190,7 @@ Before starting the build process, ensure your system meets these requirements:
    - Use OpenSSL library
 
 5. Install SWIG:
-   - Download SWIG 4.2.1 for Windows
+   - Download SWIG 4.3.0 for Windows
    - Extract to C:\swigwin
    - Add C:\swigwin to the system PATH
 
@@ -201,18 +201,18 @@ Binaries for dependencies can be downloaded at https://dev.opencascade.org/resou
 
 ### 2. Installing OpenCascade (Windows)
 
-1. Download OpenCascade 7.8.1.1 for Windows
-2. Extract to, for example, occt-7.8.1.1
+1. Download OpenCascade 7.9.0 for Windows
+2. Extract to, for example, occt-7.9.0
 
 If the binaries are not available, consider compiling by yourself OCCT on Windows. Refer to the official OpenCascade Technology documentation https://dev.opencascade.org/doc/overview/html/build_upgrade.html
 
 When installing OpenCascade and third-party libraries, you should have a structure similar to the one described at https://dev.opencascade.org/doc/overview/html/index.html#intro_install_windows
 
-C:\OpenCASCADE-7.8.1.1-vc10-64
+C:\OpenCASCADE-7.9.0-vc10-64
 ├── ffmpeg-3.3.4-gpl-64
 ├── freeimage-3.17.0-vc10-64
 ├── freetype-2.6.3-vc10-64
-├── occt-7.8.1.1
+├── occt-7.9.0
 ├── qt486-vc10-64
 ├── tclkit-86-64
 ├── vtk-6.1.0-vc10-64
@@ -236,16 +236,16 @@ cd cmake-build
 ```batch
 cmake -G "Visual Studio 16 2019" -A x64 ^
     -DCMAKE_BUILD_TYPE=Release ^
-    -DOCCT_INCLUDE_DIR=C:\OpenCASCADE-7.8.1.1-vc10-64\occt-7.8.1.1\inc ^
-    -DOCCT_LIBRARY_DIR=C:\OpenCASCADE-7.8.1.1-vc10-64\occt-7.8.1.1\win64\vc14\lib ^
-    -DOCCT_ESSENTIALS_ROOT=C:\OpenCASCADE-7.8.1.1-vc10-64
+    -DOCCT_INCLUDE_DIR=C:\OpenCASCADE-7.9.0-vc10-64\occt-7.9.0\inc ^
+    -DOCCT_LIBRARY_DIR=C:\OpenCASCADE-7.9.0-vc10-64\occt-7.9.0\win64\vc14\lib ^
+    -DOCCT_ESSENTIALS_ROOT=C:\OpenCASCADE-7.9.0-vc10-64
     ..
 ```
 
 If using CMake GUI, make sure to set these two variables before clicking the "Generate" button:
 ```
-OCCT_INCLUDE_DIR=C:\OpenCASCADE-7.8.1.1-vc10-64\occt-7.8.1.1\inc
-OCCT_LIBRARY_DIR=C:\OpenCASCADE-7.8.1.1-vc10-64\occt-7.8.1.1\win64\vc14\lib
+OCCT_INCLUDE_DIR=C:\OpenCASCADE-7.9.0-vc10-64\occt-7.9.0\inc
+OCCT_LIBRARY_DIR=C:\OpenCASCADE-7.9.0-vc10-64\occt-7.9.0\win64\vc14\lib
 ```
 
 4. Build:

README.md

@@ -2,61 +2,61 @@
 [![Azure Build Status](https://dev.azure.com/tpaviot/pythonocc-core/_apis/build/status/tpaviot.pythonocc-core?branchName=master)](https://dev.azure.com/tpaviot/pythonocc-core/_build?definitionId=2)
 [![Downloads Badge](https://anaconda.org/conda-forge/pythonocc-core/badges/downloads.svg)](https://anaconda.org/conda-forge/pythonocc-core)
 [![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.8.1.1)
+[![Binder](http://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/tpaviot/pythonocc-binderhub/7.9.0)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3605364.svg)](https://doi.org/10.5281/zenodo.3605364)
 
 pythonocc-core
 --------------
 
 About
 -----
-pythonocc provides 3D modeling and dataexchange features. It is intended to CAD/PDM/PLM/BIM development. It is based on the OpenCascade Technology modeling kernel.
+pythonocc provides 3D modeling and dataexchange features. It is intended for CAD/PDM/PLM/BIM development. It is based on the OpenCascade Technology modeling kernel.
 
-Latest release: [pythonocc-core 7.8.1.1 (December 2024)](https://github.com/tpaviot/pythonocc-core/releases/tag/7.8.1.1)
+Latest release: [pythonocc-core 7.9.0 (April 2025)](https://github.com/tpaviot/pythonocc-core/releases/tag/7.9.0)
 
 Features
 --------
 pythonocc provides the following features:
 
-*   a full access from Python to almost all af the thousand OpenCascade C++ classes. Classes and methods/functions share the same names, and, as possible as it can be, the same signature
-*   3D visualization from the most famous Python Gui (tkinter, pyQt5 and 6, PySide2 and 6, wxPython)
-*   3D visualization in a web browser using threejs or x3dom frameworks
-*   3D visualization and work within a jupyter notebook
-*   data exchange using most famous formats IGES/STEP/STL/PLY/OBJ/GLTF
-*   various utility Python classes/methods for Topology operations, inertia computations etc.
+* Full access from Python to almost all of the thousand OpenCascade C++ classes. Classes and methods/functions share the same names, and, as possible as it can be, the same signature
+* 3D visualization from the most famous Python Gui (tkinter, pyQt5 and 6, PySide2 and 6, wxPython)
+* 3D visualization in a web browser using threejs or x3dom frameworks
+* 3D visualization and work within a jupyter notebook
+* Data exchange using most famous formats IGES/STEP/STL/PLY/OBJ/GLTF
+* Utility Python classes/methods for Topology operations, inertia computations, and more
 
 Try online at mybinder
 ----------------------
-Click [![Binder](http://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/tpaviot/pythonocc-binderhub/7.8.1.1) to open a jupyter notebook running the latest pythonocc-core 7.8.1.1.
+Click [![Binder](http://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/tpaviot/pythonocc-binderhub/7.9.0) to open a jupyter notebook running the latest pythonocc-core 7.9.0.
 
 Install with conda
 ------------------
-pythonocc provides precompiled [conda packages](https://anaconda.org/pythonocc/pythonocc-core) (they depend on third part libraries made available from the conda-forge channel) for python 3.9, 3.10 and 3.11. This will get you up and running in minutes whether you run win32/win64/linux64/osx64. Here is an example for python 3.10:
+pythonocc provides precompiled [conda packages](https://anaconda.org/pythonocc/pythonocc-core) (they depend on third part libraries made available from the conda-forge channel) for python 3.9, 3.10, 3.11 and 3.12. This will get you up and running in minutes whether you run win32/win64/linux64/osx64. Here is an example for python 3.10:
 
 ```bash
 # first create an environment
 conda create --name=pyoccenv python=3.10
-source activate pyoccenv
-conda install -c conda-forge pythonocc-core=7.8.1.1
+conda activate pyoccenv
+conda install -c conda-forge pythonocc-core=7.9.0
 ```
 
-Other conda channels may provide pythonocc-core packages, check https://anaconda.org/search?q=pythonocc-core.
+Other conda channels may provide pythonocc-core packages, check [search Anaconda](https://anaconda.org/search?q=pythonocc-core)
 
 Build from source
 -----------------
 Read the [INSTALL.md](https://github.com/tpaviot/pythonocc-core/blob/master/INSTALL.md) instructions where you find compilation instructions for all platforms.
 
 Cite as
 -------
-pythonocc is widely used in the industrial and academic communities. It is registered as a Zenodo open access software (https://zenodo.org/record/7471333) and should be cited as:
+pythonocc is widely used in the industrial and academic communities. It is registered as a [Zenodo open access softwar](https://zenodo.org/record/7471333) and should be cited as:
 
 Paviot, T. (2022). "pythonocc". Zenodo. https://doi.org/10.5281/zenodo.3605364
 
 Professional support
 --------------------
 pythonocc is backed by [meeDIA](https://meedia.ai/pythonocc-en), a company co-founded by pythonocc's creator and lead maintainer. For professional support inquiries, please contact us.
 
-<a href="https://meedia.ai/pythonocc-en"><img src="https://www.meedia.ai/wp-content/uploads/go-x/u/d3a61d32-b812-4a39-89c8-57fa93df5780/image-320x95.png" width="150"></a>
+<a href="https://meedia.ai/pythonocc-en"><img src="https://www.meedia.ai/wp-content/uploads/go-x/u/d3a61d32-b812-4a39-89c8-57fa93df5780/image-320x95.png" width="150" alt="meeDIA logo"></a>
 
 Other pythonocc related resources
 ---------------------------------
@@ -67,4 +67,4 @@ Other pythonocc related resources
 
 License
 -------
-You can redistribute it and/or modify it under the terms of the GNU Lesser General Public License version 3 as published by the Free Software Foundation.
+pythonocc-core is licensed under the GNU Lesser General Public License version 3 as published by the Free Software Foundation. You can redistribute and/or modify it under the terms of this license.

ci/conda/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "7.8.1.1" %}
+{% set version = "7.9.0" %}
 
 package:
   name: pythonocc-core
@@ -22,15 +22,15 @@ requirements:
     - {{ cdt('libxi-devel') }}          # [linux]
     - ninja
     - cmake
-    - swig ==4.2.1
+    - swig ==4.3.0
 
   host:
     - python {{ python }}
-    - occt ==7.8.1
+    - occt ==7.9.0
     - numpy >=1.17
 
   run:
-    - occt ==7.8.1
+    - occt ==7.9.0
     - numpy >=1.17
 
 test:

src/Display/WebGl/flask_server.py

@@ -1,4 +1,4 @@
-""" A flask webserver. """
+"""A flask webserver."""
 
 import sys
 import uuid

src/Display/WebGl/simple_server.py

@@ -15,7 +15,7 @@
 ##You should have received a copy of the GNU Lesser General Public License
 ##along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
 
-""" A very simple webserver. """
+"""A very simple webserver."""
 
 import os
 import socket