Merge pull request #571 from simvue-io/feature/support-3.13

Add Python3.13 Support and drop support for Python3.9

Author: kzscisoft

.github/workflows/test_client_macos.yml

@@ -15,11 +15,11 @@ jobs:
     timeout-minutes: 30
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.12
-      uses: actions/setup-python@v3
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.13
+      uses: actions/setup-python@v5
       with:
-        python-version: "3.12"
+        python-version: "3.13"
     - name: Install dependencies
       run: |
         rm poetry.lock

.github/workflows/test_client_ubuntu.yml

@@ -23,19 +23,19 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.12
-      uses: actions/setup-python@v3
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.13
+      uses: actions/setup-python@v5
       with:
-        python-version: "3.12"
+        python-version: "3.13"
     - name: Install dependencies
       run: python -m pip install poetry
     - name: Test with pytest
       run: |
         export SIMVUE_URL=${{ secrets.SIMVUE_URL }}
         export SIMVUE_TOKEN=${{ secrets.SIMVUE_TOKEN }}
         poetry install --all-extras
-        poetry run python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
+        # poetry run python -m pip install torch --index-url https://download.pytorch.org/whl/cpu FIXME: PyTorch current broken for Python3.13
         poetry run pytest -x --cov --cov-report=xml tests/unit/ tests/refactor/ -m 'not scenario' -c /dev/null -p no:warnings -n 0
     - name: Upload coverage reports to Codecov
       run: |

.github/workflows/test_multiple_python.yml

@@ -22,7 +22,7 @@ jobs:
     timeout-minutes: 30
     strategy:
         matrix:
-            python-version: ['3.9', '3.10', '3.11']
+            python-version: ['3.10', '3.11', '3.12']
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

poetry.lock

@@ -35,7 +35,7 @@ keywords = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.10,<3.14"
 dill = "^0.3.7"
 requests = "^2.31.0"
 msgpack = "^1.0.7"
@@ -45,7 +45,6 @@ psutil = ">=5.9.8,<7.0.0"
 pydantic = "^2.5.3"
 pandas = "^2.2.0"
 plotly = {version = "^5.18.0", optional = true}
-numpy = ">=1.26.3,<3.0.0"
 matplotlib = {version = "^3.8.2", optional = true}
 typing_extensions = { version = "^4.11.0", python = "<3.10" }
 toml = "^0.10.2"
@@ -55,6 +54,7 @@ humanfriendly = "^10.0"
 tabulate = "^0.9.0"
 randomname = "^0.2.1"
 codecarbon = "^2.7.1"
+numpy = "^2.1.2"
 
 [tool.poetry.extras]
 plot = ["matplotlib", "plotly"]

pyproject.toml

@@ -2,6 +2,7 @@
 import hashlib
 import logging
 import json
+import sys
 import tabulate
 import pydantic
 import importlib.util
@@ -137,10 +138,15 @@ def wrapper(self, *args, **kwargs) -> typing.Any:
                 raise RuntimeError(
                     f"Plotting features require the '{extra_name}' extension to Simvue"
                 )
-            elif extra_name == "torch" and not importlib.util.find_spec("torch"):
-                raise RuntimeError(
-                    "PyTorch features require the 'torch' module to be installed"
-                )
+            elif extra_name == "torch":
+                if importlib.util.find_spec("torch"):
+                    raise RuntimeError(
+                        "PyTorch features require the 'torch' module to be installed"
+                    )
+                if sys.version_info.minor > 12:
+                    raise RuntimeError(
+                        "PyTorch features are not yet supported for python>3.12"
+                    )
             elif extra_name not in EXTRAS:
                 raise RuntimeError(f"Unrecognised extra '{extra_name}'")
             return class_func(self, *args, **kwargs) if class_func else None

simvue/utilities.py

@@ -1,5 +1,4 @@
 from simvue.serialization import serialize_object
-import torch
 import pytest
 
 

tests/unit/test_pytorch_tensor_mime_type.py

@@ -1,4 +1,3 @@
-import torch
 from simvue.serialization import serialize_object, deserialize_data
 import pytest