Merge pull request #1895 from gchq/dev/BAI-1592-add-python-3.13-support

Update Python client to support Python 3.13

.github/workflows/build.js.yml

@@ -507,10 +507,10 @@ jobs:
           ./backend/src/scripts/waitForIt.sh localhost:27017 -t 10
 
       # Setup python
-      - name: Set up Python 3.11
+      - name: Set up Python 3.13
         uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.13"
 
       # Install dependencies
       - name: Install dependencies
@@ -525,6 +525,8 @@ jobs:
         run: |
           cd lib/python
           python -m pytest -m integration
+        env:
+          PYTEST_RUN_PATH: "lib/python"
 
       - name: Dump docker compose logs
         if: always()

.github/workflows/modelscan.yml

@@ -31,9 +31,13 @@ jobs:
         run: |
           cd lib/modelscan_api
           python -m pytest
+        env:
+          PYTEST_RUN_PATH: "lib/modelscan_api"
 
       # Pytest -m integration
       - name: Run integration testing
         run: |
           cd lib/modelscan_api
           python -m pytest -m integration
+        env:
+          PYTEST_RUN_PATH: "lib/modelscan_api"

.github/workflows/python-publish-test.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.13"
 
       # Install build package
       - name: Install pypa/build

.github/workflows/python-publish.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.13"
 
       # Install build package
       - name: Install pypa/build

.github/workflows/python.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
       - uses: actions/checkout@v4
@@ -43,3 +43,5 @@ jobs:
         run: |
           cd lib/python
           python -m pytest
+        env:
+          PYTEST_RUN_PATH: "lib/python"

.github/workflows/web.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.13"
 
       - name: Install dependencies
         run: |

lib/modelscan_api/.pre-commit-config.yaml → .pre-commit-config.yaml

@@ -2,7 +2,7 @@ ci:
   autoupdate_commit_msg: 'chore: update pre-commit hooks'
   autofix_commit_msg: 'style: pre-commit fixes'
 
-files: ^lib/modelscan_api/
+files: ^(backend/docs/|lib/python/|lib/modelscan_api/)
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -29,14 +29,26 @@ repos:
     rev: v3.19.1
     hooks:
       - id: pyupgrade
+        name: pyupgrade 3.9 (main)
+        args: ['--py39-plus']
+        # Pydantic fails check so ignore the one problematic file
+        exclude: lib/modelscan_api/bailo_modelscan_api/config.py
+      - id: pyupgrade
+        name: pyupgrade 3.9 (pedantic)
         args: ['--py39-plus', '--keep-runtime-typing']
+        # scan problematic separately with extra arg to workaround problem
+        files: lib/modelscan_api/bailo_modelscan_api/config.py
+      - id: pyupgrade
+        name: pyupgrade 3.10 (main)
+        args: ['--py310-plus']
+        # backend/docs/ has the minimum python version 3.10
+        files: backend/docs/
 
   - repo: https://github.com/hadialqattan/pycln
     rev: v2.5.0
     hooks:
       - id: pycln
-        # use the same config as for /lib/python
-        args: [--config=../python/pyproject.toml]
+        args: [--config=lib/python/pyproject.toml]
         stages: [manual]
 
   - repo: https://github.com/codespell-project/codespell

backend/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM python:3.12.9-bullseye AS sphinx-docs
+FROM python:3.13.2-bullseye AS sphinx-docs
 
 # Prevents Python from writing pyc files.
 ENV PYTHONDONTWRITEBYTECODE=1

backend/Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM python:3.12.9-bullseye AS sphinx-docs
+FROM python:3.13.2-bullseye AS sphinx-docs
 
 # Prevents Python from writing pyc files.
 ENV PYTHONDONTWRITEBYTECODE=1

lib/modelscan_api/requirements-dev.txt

@@ -2,3 +2,4 @@
 black==25.1.0
 pre_commit==4.1.0
 pytest==8.3.4
+pytest-github-actions-annotate-failures==0.3.0

lib/python/pyproject.toml

@@ -16,6 +16,8 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 requires-python = ">=3.9"
 dynamic = ["version"]