Skip to content

Commit fcf1ac6

Browse files
tpaviottpaviot
authored
Merge pull request #1401 from tpaviot/review/prepare-7.8.1.1
Review/prepare 7.8.1.1
2 parents 74b641c + 88291e0 commit fcf1ac6

File tree

6 files changed

+49
-25
lines changed

6 files changed

+49
-25
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set(PYTHONOCC_VERSION_MINOR 8)
2525
set(PYTHONOCC_VERSION_PATCH 1)
2626

2727
# Empty for official releases, set to -dev, -rc1, etc for development releases
28-
set(PYTHONOCC_VERSION_DEVEL )
28+
set(PYTHONOCC_VERSION_DEVEL 1)
2929

3030
# set OCCT version
3131
set(OCCT_VERSION_MAJOR 7)

‎INSTALL.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Building pythonOCC 7.8.1 - Complete Guide for Linux and Windows
1+
# Building pythonOCC 7.8.1.1 - Complete Guide for Linux and Windows
22

33
## Table of Contents
44
- [Linux Build Guide](#linux-build-guide)
@@ -35,12 +35,12 @@ Before starting the build process, ensure your system meets these requirements:
3535

3636
## System Requirements (Linux)
3737

38-
pythonOCC 7.8.1 requires the following components:
38+
pythonOCC 7.8.1.1 requires the following components:
3939

4040
| Component | Version | Purpose |
4141
|-----------|---------|---------|
4242
| Python | ≥ 3.9 | Runtime environment |
43-
| OpenCascade | 7.8.1 | Core CAD functionality |
43+
| OpenCascade | 7.8.1.1 | Core CAD functionality |
4444
| SWIG | 4.2.1 | Interface generation |
4545
| CMake | ≥ 3.1 | Build system |
4646

@@ -85,12 +85,12 @@ sudo make install
8585

8686
### 3. Building OpenCascade (Linux)
8787

88-
Download and extract OpenCascade 7.8.1:
88+
Download and extract OpenCascade 7.8.1.1:
8989

9090
```bash
9191
wget https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_8_1.tar.gz
9292
tar -xvzf V7_8_1.tar.gz
93-
cd OCCT-7.8.1
93+
cd OCCT-7.8.1.1
9494
mkdir cmake-build
9595
cd cmake-build
9696
```
@@ -163,7 +163,7 @@ Before starting the build process, ensure your system meets these requirements:
163163
| Git | Latest | [Download](https://git-scm.com/download/win) |
164164
| RapidJSON | Latest | [Download](https://github.com/Tencent/rapidjson.git) |
165165
| SWIG | 4.2.1 | [Download](http://www.swig.org/download.html) |
166-
| OpenCascade | 7.8.1 | [Download](https://dev.opencascade.org/download) |
166+
| OpenCascade | 7.8.1.1 | [Download](https://dev.opencascade.org/download) |
167167

168168
## Build Process (Windows)
169169

@@ -201,18 +201,18 @@ Binaries for dependencies can be downloaded at https://dev.opencascade.org/resou
201201

202202
### 2. Installing OpenCascade (Windows)
203203

204-
1. Download OpenCascade 7.8.1 for Windows
205-
2. Extract to, for example, occt-7.8.1
204+
1. Download OpenCascade 7.8.1.1 for Windows
205+
2. Extract to, for example, occt-7.8.1.1
206206

207207
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
208208

209209
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
210210

211-
C:\OpenCASCADE-7.8.1-vc10-64
211+
C:\OpenCASCADE-7.8.1.1-vc10-64
212212
├── ffmpeg-3.3.4-gpl-64
213213
├── freeimage-3.17.0-vc10-64
214214
├── freetype-2.6.3-vc10-64
215-
├── occt-7.8.1
215+
├── occt-7.8.1.1
216216
├── qt486-vc10-64
217217
├── tclkit-86-64
218218
├── vtk-6.1.0-vc10-64
@@ -236,16 +236,16 @@ cd cmake-build
236236
```batch
237237
cmake -G "Visual Studio 16 2019" -A x64 ^
238238
-DCMAKE_BUILD_TYPE=Release ^
239-
-DOCCT_INCLUDE_DIR=C:\OpenCASCADE-7.8.1-vc10-64\occt-7.8.1\inc ^
240-
-DOCCT_LIBRARY_DIR=C:\OpenCASCADE-7.8.1-vc10-64\occt-7.8.1\win64\vc14\lib ^
241-
-DOCCT_ESSENTIALS_ROOT=C:\OpenCASCADE-7.8.1-vc10-64
239+
-DOCCT_INCLUDE_DIR=C:\OpenCASCADE-7.8.1.1-vc10-64\occt-7.8.1.1\inc ^
240+
-DOCCT_LIBRARY_DIR=C:\OpenCASCADE-7.8.1.1-vc10-64\occt-7.8.1.1\win64\vc14\lib ^
241+
-DOCCT_ESSENTIALS_ROOT=C:\OpenCASCADE-7.8.1.1-vc10-64
242242
..
243243
```
244244

245245
If using CMake GUI, make sure to set these two variables before clicking the "Generate" button:
246246
```
247-
OCCT_INCLUDE_DIR=C:\OpenCASCADE-7.8.1-vc10-64\occt-7.8.1\inc
248-
OCCT_LIBRARY_DIR=C:\OpenCASCADE-7.8.1-vc10-64\occt-7.8.1\win64\vc14\lib
247+
OCCT_INCLUDE_DIR=C:\OpenCASCADE-7.8.1.1-vc10-64\occt-7.8.1.1\inc
248+
OCCT_LIBRARY_DIR=C:\OpenCASCADE-7.8.1.1-vc10-64\occt-7.8.1.1\win64\vc14\lib
249249
```
250250

251251
4. Build:

‎NEWS

+26-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
1-
Current
2-
=======
1+
Version 7.8.1.1 - December 2024
2+
===============================
3+
4+
Bugfix release. This release requires opencascade-7.8.1
5+
6+
* wrapper: add support for SWIG-4.3.0
7+
8+
* wrapper: add numpy interface for curve and surfaces, #1381 #1396
9+
10+
* wrapper: add missing SelectMegr methods, #1387
11+
12+
* wrapper: add __hash__ __eq__ and __neq__ methods to TShape, #1375
13+
14+
* wrapper: fix BRepTools.Merge, #1342
15+
16+
* wrapper: fix NCollection, #1332
17+
18+
* wrapper: fix TopTools_ListIteratorOfListOfShape import, #1355
19+
20+
* display: fix deprecation warning, #1386
21+
22+
* test: move test suite to pytest, #1335
23+
24+
* data exchange: fix gtlf importer
25+
26+
* install: fix windows dll import, #1347 #1351, #1352
327

428
Version 7.8.1 - May 2024
529
========================

‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[![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)
33
[![Downloads Badge](https://anaconda.org/conda-forge/pythonocc-core/badges/downloads.svg)](https://anaconda.org/conda-forge/pythonocc-core)
44
[![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)
5-
[![Binder](http://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/tpaviot/pythonocc-binderhub/7.8.1)
5+
[![Binder](http://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/tpaviot/pythonocc-binderhub/7.8.1.1)
66
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3605364.svg)](https://doi.org/10.5281/zenodo.3605364)
77

88
pythonocc-core
@@ -12,7 +12,7 @@ About
1212
-----
1313
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.
1414

15-
Latest release: [pythonocc-core 7.8.1 (May 2024)](https://github.com/tpaviot/pythonocc-core/releases/tag/7.8.1)
15+
Latest release: [pythonocc-core 7.8.1.1 (Decembre 2024)](https://github.com/tpaviot/pythonocc-core/releases/tag/7.8.1.1)
1616

1717
Features
1818
--------
@@ -27,7 +27,7 @@ pythonocc provides the following features:
2727

2828
Try online at mybinder
2929
----------------------
30-
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.
30+
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.
3131

3232
Install with conda
3333
------------------
@@ -37,7 +37,7 @@ pythonocc provides precompiled [conda packages](https://anaconda.org/pythonocc/p
3737
# first create an environment
3838
conda create --name=pyoccenv python=3.10
3939
source activate pyoccenv
40-
conda install -c conda-forge pythonocc-core=7.8.1
40+
conda install -c conda-forge pythonocc-core=7.8.1.1
4141
```
4242

4343
Other conda channels may provide pythonocc-core packages, check https://anaconda.org/search?q=pythonocc-core.
@@ -56,7 +56,7 @@ Professional support
5656
--------------------
5757
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.
5858

59-
<img src="https://www.meedia.ai/wp-content/uploads/go-x/u/d3a61d32-b812-4a39-89c8-57fa93df5780/image-320x95.png" width="150">
59+
<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>
6060

6161
Other pythonocc related resources
6262
---------------------------------

‎ci/conda/meta.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set version = "7.8.1" %}
1+
{% set version = "7.8.1.1" %}
22

33
package:
44
name: pythonocc-core

‎src/PkgBase/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
PYTHONOCC_VERSION_PATCH = 1
99

1010
# Empty for official releases, set to -dev, -rc1, etc for development releases
11-
PYTHONOCC_VERSION_DEVEL = ""
11+
PYTHONOCC_VERSION_DEVEL = ".1"
1212

1313
VERSION = f"{PYTHONOCC_VERSION_MAJOR}.{PYTHONOCC_VERSION_MINOR}.{PYTHONOCC_VERSION_PATCH}{PYTHONOCC_VERSION_DEVEL}"
1414

0 commit comments

Comments
 (0)