Merge branch 'master' into master

robbievanleeuwen · web-flow · commit 4d46ee03442c · 2023-10-11T16:42:47.000+11:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
 
       - name: Upgrade pip
         run: |
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { python: "3.9", os: "ubuntu-latest", session: "pre-commit" }
+          - { python: "3.11", os: "ubuntu-latest", session: "pre-commit" }
           - { python: "3.11", os: "ubuntu-latest", session: "tests" }
           - { python: "3.10", os: "ubuntu-latest", session: "tests" }
           - { python: "3.9", os: "ubuntu-latest", session: "tests" }
@@ -26,7 +26,7 @@ jobs:
           - { python: "3.11", os: "macos-latest", session: "tests" }
           - { python: "3.10", os: "macos-latest", session: "tests" }
           - { python: "3.9", os: "macos-latest", session: "tests" }
-          - { python: "3.9", os: "ubuntu-latest", session: "docs-build" }
+          - { python: "3.10", os: "ubuntu-latest", session: "docs-build" }
 
     env:
       NOXSESSION: ${{ matrix.session }}
@@ -123,7 +123,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
 
       - name: Upgrade pip
         run: |
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -5,7 +5,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.9"
+    python: "3.10"
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -83,7 +83,7 @@ poetry install
 Install with the `rhino` and `cad` extras:
 
 ```shell
-poetry install --all-extras
+poetry install --extras "dxf rhino"
 ```
 
 You can now run an interactive Python session, or the command-line interface:
diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -95,7 +95,7 @@ Install with the ``rhino`` and ``cad`` extras:
 
 .. code:: shell
 
-   poetry install --all-extras
+   poetry install --extras "dxf rhino"
 
 You can now run an interactive Python session, or the command-line interface:
 
diff --git a/docs/installation.rst b/docs/installation.rst
@@ -57,6 +57,3 @@ To install ``sectionproperties`` with the above functionality, use the ``dxf`` a
 
     pip install sectionproperties[dxf]
     pip install sectionproperties[rhino]
-
-Note that the ``rhino`` option only supports python ``3.9`` due to incomplete wheel
-coverage of ``rhino3dm``.
diff --git a/docs/user_guide/geometry.rst b/docs/user_guide/geometry.rst
@@ -111,10 +111,10 @@ Various CAD files can be imported to creating ``sectionproperties`` geometries.
     installation. To install ``sectionproperties`` with CAD import functionality,  use
     the ``dxf`` and/or ``rhino`` options:
 
-.. code-block:: shell
+    .. code-block:: shell
 
-    pip install sectionproperties[dxf]
-    pip install sectionproperties[rhino]
+        pip install sectionproperties[dxf]
+        pip install sectionproperties[rhino]
 
 .. _label-geometry-dxf:
 
diff --git a/noxfile.py b/noxfile.py
@@ -22,7 +22,7 @@
 
 
 package = "sectionproperties"
-python_versions = ["3.9", "3.11", "3.10"]
+python_versions = ["3.11", "3.10", "3.9"]
 nox.needs_version = ">= 2021.6.6"
 nox.options.sessions = (
     "pre-commit",
@@ -144,11 +144,9 @@ def tests(session: Session) -> None:
     Args:
         session: Nox session
     """
-    # provide only dxf dependencies if python version is 3.10 or 3.11
-    if session.python == "3.9":
-        session.run_always("poetry", "install", "--all-extras", external=True)
-    else:
-        session.run_always("poetry", "install", "--extras", "dxf", external=True)
+    session.run_always(
+        "poetry", "install", "--only", "main", "--extras", "dxf rhino", external=True
+    )
 
     # install relevant tooling
     session.install("coverage[toml]", "pytest", "pygments", "pytest-check")
@@ -161,7 +159,7 @@ def tests(session: Session) -> None:
             "-m",
             "pytest",
             "-m",
-            "not benchmark",
+            "not benchmark_suite",
             *session.posargs,
         )
     finally:
@@ -186,7 +184,7 @@ def coverage(session: Session) -> None:
     session.run("coverage", *args)
 
 
-@session(name="docs-build", python=python_versions[0])
+@session(name="docs-build", python=python_versions[1])
 def docs_build(session: Session) -> None:
     """Build the documentation.
 
@@ -197,7 +195,9 @@ def docs_build(session: Session) -> None:
     if not session.posargs and "FORCE_COLOR" in os.environ:
         args.insert(0, "--color")
 
-    session.run_always("poetry", "install", "--all-extras", external=True)
+    session.run_always(
+        "poetry", "install", "--only", "main", "--extras", "dxf rhino", external=True
+    )
     session.install(
         "furo",
         "ipykernel",
@@ -218,15 +218,17 @@ def docs_build(session: Session) -> None:
     session.run("sphinx-build", *args)
 
 
-@session(python=python_versions[0])
+@session(python=python_versions[1])
 def docs(session: Session) -> None:
     """Build and serve the documentation with live reloading on file changes.
 
     Args:
         session: Nox session
     """
     args = session.posargs or ["--open-browser", "docs", "docs/_build"]
-    session.run_always("poetry", "install", "--all-extras", external=True)
+    session.run_always(
+        "poetry", "install", "--only", "main", "--extras", "dxf rhino", external=True
+    )
     session.install(
         "furo",
         "ipykernel",
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -58,11 +58,11 @@ click = "^8.1.7"
 more-itertools = "^10.1.0"
 numba = "^0.58.0"
 cad-to-shapely = { version = "^0.3.1", optional = true }
-rhino-shapley-interop = { version = "^0.0.4", python = ">=3.9.0,<3.10", optional = true }
-rhino3dm = { version = "==8.0.0b2", python = ">=3.9.0,<3.10", optional = true }
+rhino-shapley-interop = { version = "^0.0.4", optional = true }
+rhino3dm = { version = "==8.0.0b3", optional = true }
 pypardiso = { version = "^0.4.2", optional = true }
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 black = "^23.9.1"
 coverage = { extras = ["toml"], version = "^7.3.2" }
 darglint = "^1.8.1"
@@ -108,6 +108,7 @@ tests = ["tests", "*/tests"]
 [tool.coverage.run]
 branch = true
 source = ["sectionproperties", "tests"]
+omit = ["*/benchmarks/*"]
 
 [tool.coverage.report]
 show_missing = true
@@ -118,6 +119,7 @@ lines_after_imports = 2
 
 [tool.pytest.ini_options]
 markers = [
+    "benchmark_suite: entire benchmark test suite (select with '-m benchmark_suite')",
     "benchmark_geom: geometry benchmark tests (select with '-m benchmark_geom')",
     "benchmark_mesh: mesh benchmark tests (select with '-m benchmark_mesh')",
     "benchmark_analysis: analysis benchmark tests (select with '-m benchmark_analysis')",
diff --git a/tests/benchmarks/test_benchmark_analysis.py b/tests/benchmarks/test_benchmark_analysis.py
@@ -5,7 +5,7 @@
 from sectionproperties.analysis import Section
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_analysis
 @pytest.mark.parametrize("elements", [50, 500, 5000])
 def test_create_section(benchmark, analysis_geometry, elements):
@@ -18,7 +18,7 @@ def create_section():
     benchmark(create_section)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_analysis
 @pytest.mark.parametrize("elements", [50, 500, 5000])
 def test_geometric_analysis(benchmark, analysis_geometry, elements):
@@ -32,7 +32,7 @@ def geometric_analysis():
     benchmark(geometric_analysis)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_analysis
 def test_plastic_analysis(benchmark, analysis_geometry):
     """Benchmark test for conducting a plastic analysis.
@@ -49,7 +49,7 @@ def plastic_analysis():
     benchmark(plastic_analysis)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_analysis
 @pytest.mark.parametrize("elements", [50, 500, 5000])
 def test_warping_analysis(benchmark, analysis_geometry, elements):
@@ -64,7 +64,7 @@ def warping_analysis():
     benchmark(warping_analysis)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_analysis
 @pytest.mark.parametrize("elements", [50, 500, 5000])
 def test_frame_analysis(benchmark, analysis_geometry, elements):
@@ -78,7 +78,7 @@ def frame_analysis():
     benchmark(frame_analysis)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_analysis
 @pytest.mark.parametrize("elements", [50, 500, 5000])
 def test_stress_analysis(benchmark, analysis_geometry, elements):
diff --git a/tests/benchmarks/test_benchmark_geom.py b/tests/benchmarks/test_benchmark_geom.py
@@ -5,21 +5,21 @@
 from sectionproperties.pre.library import circular_hollow_section, rectangular_section
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_geom
 def test_create_simple_geometry(benchmark):
     """Benchmark test for creating rectangular geometry."""
     benchmark(rectangular_section, d=100, b=50)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_geom
 def test_create_intermediate_geometry(benchmark):
     """Benchmark test for creating CHS geometry."""
     benchmark(circular_hollow_section, d=100, t=3, n=128)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_geom
 def test_create_complex_geometry(benchmark, concrete_column_with_hole):
     """Benchmark test for creating concrete geometry."""
diff --git a/tests/benchmarks/test_benchmark_mesh.py b/tests/benchmarks/test_benchmark_mesh.py
@@ -3,7 +3,7 @@
 import pytest
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_mesh
 @pytest.mark.parametrize("ms", [0.0, 50.0, 5.0])
 def test_create_simple_mesh(benchmark, rect_geom, ms):
@@ -12,7 +12,7 @@ def test_create_simple_mesh(benchmark, rect_geom, ms):
     benchmark(geom.create_mesh, ms)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_mesh
 @pytest.mark.parametrize("ms", [0.0, 1.0, 0.3])
 def test_create_intermediate_mesh(benchmark, chs_geom, ms):
@@ -21,7 +21,7 @@ def test_create_intermediate_mesh(benchmark, chs_geom, ms):
     benchmark(geom.create_mesh, ms)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_mesh
 @pytest.mark.parametrize("ms", [0.0, 100.0, 20.0])
 def test_create_complex_mesh(benchmark, concrete_column_with_hole, ms):
diff --git a/tests/geometry/test_geometry.py b/tests/geometry/test_geometry.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import json
-import sys
 from pathlib import Path
 
 import pytest
@@ -480,7 +479,6 @@ def test_geometry_from_dxf():
     assert sp_geom.Geometry.from_dxf(section_holes_dxf).geom.wkt == poly
 
 
-@pytest.mark.skipif(sys.version_info >= (3, 10), reason="requires python 3.9")
 def test_geometry_from_3dm_file_simple():
     """Tests loading geometry from a simple .3dm file."""
     section = Path(__file__).parent.absolute() / "3in x 2in.3dm"
@@ -489,7 +487,6 @@ def test_geometry_from_3dm_file_simple():
     assert (test.geom - exp).is_empty
 
 
-@pytest.mark.skipif(sys.version_info >= (3, 10), reason="requires python 3.9")
 def test_geometry_from_3dm_file_complex():
     """Tests loading geometry from a complex .3dm file."""
     section_3dm = Path(__file__).parent.absolute() / "complex_shape.3dm"
@@ -501,7 +498,6 @@ def test_geometry_from_3dm_file_complex():
     assert (test.geom - exp).is_empty
 
 
-@pytest.mark.skipif(sys.version_info >= (3, 10), reason="requires python 3.9")
 def test_geometry_from_3dm_file_compound():
     """Tests loading compound geometry from a .3dm file."""
     section_3dm = Path(__file__).parent.absolute() / "compound_shape.3dm"
@@ -513,7 +509,6 @@ def test_geometry_from_3dm_file_compound():
     assert (MultiPolygon([ii.geom for ii in test.geoms]) - MultiPolygon(exp)).is_empty
 
 
-@pytest.mark.skipif(sys.version_info >= (3, 10), reason="requires python 3.9")
 def test_geometry_from_3dm_encode():
     """Tests loading compound geometry from a .json file."""
     section_3dm = Path(__file__).parent.absolute() / "rhino_data.json"
diff --git a/tests/post/test_post.py b/tests/post/test_post.py
