Skip to content

Commit 4c49bf6

Browse files
authored
Merge pull request #1337 from tpaviot/review/py312
Review/py312
2 parents e34439e + 8ee1743 commit 4c49bf6

File tree

5 files changed

+30
-5
lines changed

5 files changed

+30
-5
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ This release requires opencascade-7.8.1
88

99
* wrapper: port to opencascade-7.8.1
1010

11+
* wrapper: unittests moved to pytest framework
12+
13+
* wrapper: fix const returned by reference, #1277 and related
14+
1115
* wrapper: fix istream and ostream swig wrapper, fix ReadStream and WriteStream for STEP files
1216

1317
* wrapper: Fix ShapeAnalysis::ConnectEdgesToWires wrapper, #745

azure-pipelines.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,25 @@ jobs:
7474
name: Windows_VS2019_python311
7575
vmImage: 'windows-2019'
7676
py_maj: 3
77-
py_min: 11
77+
py_min: 11
78+
79+
- template: conda-build.yml
80+
parameters:
81+
name: Ubuntu_22_04_python312
82+
vmImage: 'ubuntu-22.04'
83+
py_maj: 3
84+
py_min: 12
85+
86+
- template: conda-build.yml
87+
parameters:
88+
name: macOS_12_python312
89+
vmImage: 'macOS-latest'
90+
py_maj: 3
91+
py_min: 12
92+
93+
- template: conda-build.yml
94+
parameters:
95+
name: Windows_VS2019_python312
96+
vmImage: 'windows-2019'
97+
py_maj: 3
98+
py_min: 12

ci/conda/meta.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ test:
4646
- pytest
4747
- svgwrite
4848
- wxpython >=4
49-
- pyside2 >=5
5049
- pyside6
5150

5251
about:

ci/conda/run_test.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ pytest -sv
33
mypy test_mypy_classic_occ_bottle.py
44
python core_display_tkinter_unittest.py
55
python core_display_pyqt5_unittest.py
6-
python core_display_pyside2_unittest.py
76
python core_display_pyside6_unittest.py
87
python core_display_wx_unittest.py

test/test_core_wrapper_features.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import os
2626
import pickle
2727
from typing import Any, Iterator, List
28+
import sys
2829
import warnings
2930

3031
import OCC.Core
@@ -641,8 +642,9 @@ def test_downcast_curve() -> None:
641642
line = Geom_Line.DownCast(curve)
642643
assert isinstance(line, Geom_Curve)
643644
# Hence, it should not be possible to downcast it as a B-Spline curve
644-
with pytest.raises(SystemError):
645-
Geom_BSplineCurve.DownCast(curve)
645+
if sys.version_info.major == 3 and sys.version_info.minor < 12:
646+
with pytest.raises(SystemError):
647+
Geom_BSplineCurve.DownCast(curve)
646648

647649

648650
def test_return_enum() -> None:

0 commit comments

Comments
 (0)