Skip to content

Commit c8b3ed4

Browse files
Limit rhino to 3.13 and below, add pyqt6 dev dep for me, update lockfiles
1 parent da6404b commit c8b3ed4

File tree

3 files changed

+189
-121
lines changed

3 files changed

+189
-121
lines changed

pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ numba = [
5151
"numba>=0.60.0",
5252
]
5353
rhino = [
54-
"rhino3dm>=8.17.0",
55-
"rhino-shapley-interop>=0.0.4",
54+
"rhino3dm>=8.17.0; python_version < '3.14'",
55+
"rhino-shapley-interop>=0.0.4; python_version < '3.14'",
5656
]
5757
dxf = [
5858
"cad-to-shapely>=0.3.2",
@@ -66,6 +66,7 @@ dev = [
6666
"ipympl==0.9.7",
6767
"notebook==7.4.1",
6868
"sphinx-autobuild==2024.10.03",
69+
"pyqt6==6.10.1",
6970
]
7071
docs = [
7172
"furo==2024.8.6",

tests/geometry/test_geometry.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import json
66
import platform
7+
import sys
78
from pathlib import Path
89

910
import pytest
@@ -489,6 +490,7 @@ def test_geometry_from_dxf():
489490
assert sp_geom.Geometry.from_dxf(section_holes_dxf).geom.wkt == poly
490491

491492

493+
@pytest.mark.skipif(sys.version_info >= (3, 14), reason="Rhino not support for 3.14")
492494
def test_geometry_from_3dm_file_simple():
493495
"""Tests loading geometry from a simple .3dm file."""
494496
section = Path(__file__).parent.absolute() / "3in x 2in.3dm"
@@ -497,6 +499,7 @@ def test_geometry_from_3dm_file_simple():
497499
assert (test.geom - exp).is_empty
498500

499501

502+
@pytest.mark.skipif(sys.version_info >= (3, 14), reason="Rhino not support for 3.14")
500503
def test_geometry_from_3dm_file_complex():
501504
"""Tests loading geometry from a complex .3dm file."""
502505
section_3dm = Path(__file__).parent.absolute() / "complex_shape.3dm"
@@ -508,6 +511,7 @@ def test_geometry_from_3dm_file_complex():
508511
assert (test.geom - exp).is_empty
509512

510513

514+
@pytest.mark.skipif(sys.version_info >= (3, 14), reason="Rhino not support for 3.14")
511515
def test_geometry_from_3dm_file_compound():
512516
"""Tests loading compound geometry from a .3dm file."""
513517
section_3dm = Path(__file__).parent.absolute() / "compound_shape.3dm"
@@ -519,6 +523,7 @@ def test_geometry_from_3dm_file_compound():
519523
assert (MultiPolygon([ii.geom for ii in test.geoms]) - MultiPolygon(exp)).is_empty
520524

521525

526+
@pytest.mark.skipif(sys.version_info >= (3, 14), reason="Rhino not support for 3.14")
522527
def test_geometry_from_3dm_encode():
523528
"""Tests loading compound geometry from a .json file."""
524529
section_3dm = Path(__file__).parent.absolute() / "rhino_data.json"

0 commit comments

Comments
 (0)