Merge pull request #1401 from tpaviot/review/prepare-7.8.1.1

Review/prepare 7.8.1.1

CMakeLists.txt

@@ -25,7 +25,7 @@ set(PYTHONOCC_VERSION_MINOR 8)
 set(PYTHONOCC_VERSION_PATCH 1)
 
 #  Empty for official releases, set to -dev, -rc1, etc for development releases
-set(PYTHONOCC_VERSION_DEVEL )
+set(PYTHONOCC_VERSION_DEVEL 1)
 
 # set OCCT version
 set(OCCT_VERSION_MAJOR 7)

INSTALL.md

@@ -1,4 +1,4 @@
-# Building pythonOCC 7.8.1 - Complete Guide for Linux and Windows
+# Building pythonOCC 7.8.1.1 - Complete Guide for Linux and Windows
 
 ## Table of Contents
 - [Linux Build Guide](#linux-build-guide)
@@ -35,12 +35,12 @@ Before starting the build process, ensure your system meets these requirements:
 
 ## System Requirements (Linux)
 
-pythonOCC 7.8.1 requires the following components:
+pythonOCC 7.8.1.1 requires the following components:
 
 | Component | Version | Purpose |
 |-----------|---------|---------|
 | Python | ≥ 3.9 | Runtime environment |
-| OpenCascade | 7.8.1 | Core CAD functionality |
+| OpenCascade | 7.8.1.1 | Core CAD functionality |
 | SWIG | 4.2.1 | Interface generation |
 | CMake | ≥ 3.1 | Build system |
 
@@ -85,12 +85,12 @@ sudo make install
 
 ### 3. Building OpenCascade (Linux)
 
-Download and extract OpenCascade 7.8.1:
+Download and extract OpenCascade 7.8.1.1:
 
 ```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
+cd OCCT-7.8.1.1
 mkdir cmake-build
 cd cmake-build
 ```
@@ -163,7 +163,7 @@ Before starting the build process, ensure your system meets these requirements:
 | 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 | [Download](https://dev.opencascade.org/download) |
+| OpenCascade | 7.8.1.1 | [Download](https://dev.opencascade.org/download) |
 
 ## Build Process (Windows)
 
@@ -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 for Windows
-2. Extract to, for example, occt-7.8.1
+1. Download OpenCascade 7.8.1.1 for Windows
+2. Extract to, for example, occt-7.8.1.1
 
 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-vc10-64
+C:\OpenCASCADE-7.8.1.1-vc10-64
 ├── ffmpeg-3.3.4-gpl-64
 ├── freeimage-3.17.0-vc10-64
 ├── freetype-2.6.3-vc10-64
-├── occt-7.8.1
+├── occt-7.8.1.1
 ├── 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-vc10-64\occt-7.8.1\inc ^
-    -DOCCT_LIBRARY_DIR=C:\OpenCASCADE-7.8.1-vc10-64\occt-7.8.1\win64\vc14\lib ^
-    -DOCCT_ESSENTIALS_ROOT=C:\OpenCASCADE-7.8.1-vc10-64
+    -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
     ..
 ```
 
 If using CMake GUI, make sure to set these two variables before clicking the "Generate" button:
 ```
-OCCT_INCLUDE_DIR=C:\OpenCASCADE-7.8.1-vc10-64\occt-7.8.1\inc
-OCCT_LIBRARY_DIR=C:\OpenCASCADE-7.8.1-vc10-64\occt-7.8.1\win64\vc14\lib
+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
 ```
 
 4. Build:

NEWS

@@ -1,5 +1,29 @@
-Current
-=======
+Version 7.8.1.1 - December 2024
+===============================
+
+Bugfix release. This release requires opencascade-7.8.1
+
+* wrapper: add support for SWIG-4.3.0
+
+* wrapper: add numpy interface for curve and surfaces, #1381 #1396
+
+* wrapper: add missing SelectMegr methods, #1387
+
+* wrapper: add __hash__ __eq__ and __neq__ methods to TShape, #1375
+
+* wrapper: fix BRepTools.Merge, #1342
+
+* wrapper: fix NCollection, #1332
+
+* wrapper: fix TopTools_ListIteratorOfListOfShape import, #1355
+
+* display: fix deprecation warning, #1386
+
+* test: move test suite to pytest, #1335
+
+* data exchange: fix gtlf importer
+
+* install: fix windows dll import, #1347 #1351, #1352
 
 Version 7.8.1 - May 2024
 ========================

README.md

@@ -2,7 +2,7 @@
 [![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)
+[![Binder](http://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/tpaviot/pythonocc-binderhub/7.8.1.1)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3605364.svg)](https://doi.org/10.5281/zenodo.3605364)
 
 pythonocc-core
@@ -12,7 +12,7 @@ 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.
 
-Latest release: [pythonocc-core 7.8.1 (May 2024)](https://github.com/tpaviot/pythonocc-core/releases/tag/7.8.1)
+Latest release: [pythonocc-core 7.8.1.1 (Decembre 2024)](https://github.com/tpaviot/pythonocc-core/releases/tag/7.8.1.1)
 
 Features
 --------
@@ -27,7 +27,7 @@ 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.8.1) to open a jupyter notebook running the latest pythonocc-core 7.8.1, 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.8.1.1) to open a jupyter notebook running the latest pythonocc-core 7.8.1.1.
 
 Install with conda
 ------------------
@@ -37,7 +37,7 @@ pythonocc provides precompiled [conda packages](https://anaconda.org/pythonocc/p
 # first create an environment
 conda create --name=pyoccenv python=3.10
 source activate pyoccenv
-conda install -c conda-forge pythonocc-core=7.8.1
+conda install -c conda-forge pythonocc-core=7.8.1.1
 ```
 
 Other conda channels may provide pythonocc-core packages, check https://anaconda.org/search?q=pythonocc-core.
@@ -56,7 +56,7 @@ 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.
 
-<img src="https://www.meedia.ai/wp-content/uploads/go-x/u/d3a61d32-b812-4a39-89c8-57fa93df5780/image-320x95.png" width="150">
+<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>
 
 Other pythonocc related resources
 ---------------------------------

ci/conda/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "7.8.1" %}
+{% set version = "7.8.1.1" %}
 
 package:
   name: pythonocc-core

src/PkgBase/__init__.py

@@ -8,7 +8,7 @@
 PYTHONOCC_VERSION_PATCH = 1
 
 # Empty for official releases, set to -dev, -rc1, etc for development releases
-PYTHONOCC_VERSION_DEVEL = ""
+PYTHONOCC_VERSION_DEVEL = ".1"
 
 VERSION = f"{PYTHONOCC_VERSION_MAJOR}.{PYTHONOCC_VERSION_MINOR}.{PYTHONOCC_VERSION_PATCH}{PYTHONOCC_VERSION_DEVEL}"