Add python 3.12 support

Author: robbievanleeuwen

.github/workflows/tests.yml

@@ -16,16 +16,20 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { python: "3.11", os: "ubuntu-latest", session: "pre-commit" }
+          - { python: "3.12", os: "ubuntu-latest", session: "pre-commit" }
+          - { python: "3.12", os: "ubuntu-latest", session: "mypy" }
           - { python: "3.11", os: "ubuntu-latest", session: "mypy" }
           - { python: "3.10", os: "ubuntu-latest", session: "mypy" }
           - { python: "3.9", os: "ubuntu-latest", session: "mypy" }
+          - { python: "3.12", os: "ubuntu-latest", session: "tests" }
           - { python: "3.11", os: "ubuntu-latest", session: "tests" }
           - { python: "3.10", os: "ubuntu-latest", session: "tests" }
           - { python: "3.9", os: "ubuntu-latest", session: "tests" }
+          - { python: "3.12", os: "windows-latest", session: "tests" }
           - { python: "3.11", os: "windows-latest", session: "tests" }
           - { python: "3.10", os: "windows-latest", session: "tests" }
           - { python: "3.9", os: "windows-latest", session: "tests" }
+          - { python: "3.12", os: "macos-latest", session: "tests" }
           - { python: "3.11", os: "macos-latest", session: "tests" }
           - { python: "3.10", os: "macos-latest", session: "tests" }
           - { python: "3.9", os: "macos-latest", session: "tests" }

CONTRIBUTING.md

@@ -40,7 +40,7 @@ duplication of work, and allows for feedback on your ideas.
 
 ## How to set up your development environment
 
-You need Python 3.9, 3.10 or 3.11, and the following tools:
+You need Python 3.9, 3.10, 3.11 or 3.12, and the following tools:
 
 - [Poetry]
 - [Nox]

docs/contributing.rst

@@ -49,7 +49,7 @@ on your ideas.
 How to set up your development environment
 ------------------------------------------
 
-You need Python 3.9, 3.10 or 3.11, and the following tools:
+You need Python 3.9, 3.10, 3.11 or 3.12, and the following tools:
 
 -  `Poetry <https://python-poetry.org/>`__
 -  `Nox <https://nox.thea.codes/>`__

docs/installation.rst

@@ -4,7 +4,7 @@ Installation
 ============
 
 These instructions will get you a copy of ``sectionproperties`` up and running on your
-machine. You will need a working copy of python 3.9, 3.10 or 3.11 to get started.
+machine. You will need a working copy of python 3.9, 3.10, 3.11 or 3.12 to get started.
 
 Installing ``sectionproperties``
 --------------------------------
@@ -71,3 +71,6 @@ To install ``sectionproperties`` with the above functionality, use the ``dxf`` a
 
     pip install sectionproperties[dxf]
     pip install sectionproperties[rhino]
+
+..  warning:: The "rhino" extras do not currently support python 3.12, this may only be
+  installed for python 3.9, 3.10 and 3.11.

noxfile.py

@@ -23,7 +23,7 @@
 
 
 package = "sectionproperties"
-python_versions = ["3.11", "3.10", "3.9"]
+python_versions = ["3.12", "3.11", "3.10", "3.9"]
 nox.needs_version = ">= 2021.6.6"
 nox.options.sessions = (
     "pre-commit",
@@ -161,9 +161,21 @@ def tests(session: Session) -> None:
     Args:
         session: Nox session
     """
-    session.run_always(
-        "poetry", "install", "--only", "main", "--extras", "dxf rhino", external=True
-    )
+    # if python version is 3.12, don't install rhino extras
+    if session.python == "3.12":
+        session.run_always(
+            "poetry", "install", "--only", "main", "--extras", "dxf", external=True
+        )
+    else:
+        session.run_always(
+            "poetry",
+            "install",
+            "--only",
+            "main",
+            "--extras",
+            "dxf rhino",
+            external=True,
+        )
 
     # install relevant tooling
     session.install("coverage[toml]", "pytest", "pygments", "pytest-check")
@@ -201,7 +213,7 @@ def coverage(session: Session) -> None:
     session.run("coverage", *args)
 
 
-@session(name="docs-build", python=python_versions[1])
+@session(name="docs-build", python=python_versions[2])
 def docs_build(session: Session) -> None:
     """Build the documentation.
 
@@ -241,7 +253,7 @@ def docs_build(session: Session) -> None:
     session.run("sphinx-build", *args)
 
 
-@session(python=python_versions[1])
+@session(python=python_versions[2])
 def docs(session: Session) -> None:
     """Build and serve the documentation with live reloading on file changes.
 

poetry.lock

@@ -29,6 +29,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
 ]
 packages = [
     { include = "sectionproperties", from = "src" },
@@ -47,9 +48,9 @@ Changelog = "https://github.com/robbievanleeuwen/section-properties/releases"
 "Bug Tracker" = "https://github.com/robbievanleeuwen/section-properties/issues"
 
 [tool.poetry.dependencies]
-python = ">=3.9.0,<3.12"
-numpy = "^1.24.4"
-scipy = "^1.10.1"
+python = ">=3.9.0,<3.13"
+numpy = "^1.26.4"
+scipy = "^1.12.0"
 matplotlib = "^3.8.3"
 shapely = "^2.0.3"
 triangle = "^20230923"
@@ -58,8 +59,8 @@ click = "^8.1.7"
 more-itertools = "^10.2.0"
 numba = { version = "^0.59.0", optional = true }
 cad-to-shapely = { version = "^0.3.1", optional = true }
-rhino-shapley-interop = { version = "^0.0.4", optional = true }
-rhino3dm = { version = "^8.4.0", optional = true }
+rhino-shapley-interop = { version = "^0.0.4", python = ">=3.9.0,<3.12", optional = true }
+rhino3dm = { version = "^8.4.0", python = ">=3.9.0,<3.12", optional = true }
 pypardiso = { version = "^0.4.5", optional = true }
 intel-openmp = { version = "==2023.2.0", optional = true }
 mkl = { version = "==2023.2.0", optional = true }

pyproject.toml

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import json
+import sys
 from pathlib import Path
 
 import pytest
@@ -479,6 +480,7 @@ def test_geometry_from_dxf():
     assert sp_geom.Geometry.from_dxf(section_holes_dxf).geom.wkt == poly
 
 
+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="requires python < 3.12")
 def test_geometry_from_3dm_file_simple():
     """Tests loading geometry from a simple .3dm file."""
     section = Path(__file__).parent.absolute() / "3in x 2in.3dm"
@@ -487,6 +489,7 @@ def test_geometry_from_3dm_file_simple():
     assert (test.geom - exp).is_empty
 
 
+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="requires python < 3.12")
 def test_geometry_from_3dm_file_complex():
     """Tests loading geometry from a complex .3dm file."""
     section_3dm = Path(__file__).parent.absolute() / "complex_shape.3dm"
@@ -498,6 +501,7 @@ def test_geometry_from_3dm_file_complex():
     assert (test.geom - exp).is_empty
 
 
+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="requires python < 3.12")
 def test_geometry_from_3dm_file_compound():
     """Tests loading compound geometry from a .3dm file."""
     section_3dm = Path(__file__).parent.absolute() / "compound_shape.3dm"
@@ -509,6 +513,7 @@ 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, 12), reason="requires python < 3.12")
 def test_geometry_from_3dm_encode():
     """Tests loading compound geometry from a .json file."""
     section_3dm = Path(__file__).parent.absolute() / "rhino_data.json"