Merge branch 'dev_py313' into 'main'

updating for Python 3.13 See merge request kit/fast/lb/collaboration/additive-manufacturing/pygcodedecode!38
FAST-LB · Dec 11, 2024 · 83db10b · 83db10b
2 parents 5295c17 + e79fa1d
commit 83db10b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 24 deletions.
diff --git a/.github/workflows/publish_to_pypi.yaml b/.github/workflows/publish_to_pypi.yaml
@@ -24,7 +24,7 @@ jobs:
             - name: setup python
               uses: actions/setup-python@v5
               with:
-                python-version: "3.12"
+                python-version: "3.13"
 
             - name: install build tools
               run: |

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -9,7 +9,7 @@ jobs:
             - name: setup Python
               uses: actions/setup-python@v5
               with:
-                python-version: "3.12"
+                python-version: "3.13"
 
             - name: checkout
               uses: actions/checkout@v4
@@ -26,7 +26,7 @@ jobs:
         strategy:
             matrix:
                 os: [ubuntu-latest] # [ubuntu-latest, windows-latest, macos-latest]
-                python-version: ["3.10"] # ["3.9", "3.10", "3.11", "3.12"]
+                python-version: ["3.9", "3.10", "3.13"]
         steps:
           - name: checkout
             uses: actions/checkout@v4
@@ -47,5 +47,5 @@ jobs:
           - name: upload coverage report
             uses: actions/upload-artifact@v4
             with:
-              name: coverage_report
+              name: coverage_report_${{ matrix.os }}_${{ matrix.python-version }}
               path: ./tests/coverage.xml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
 
 test-lint:
     stage: test
-    image: "python:3.12"
+    image: "python:3.13"
     needs: []
     script:
         - pip install isort black[jupyter] flake8-docstrings
@@ -13,9 +13,13 @@ test-lint:
         - flake8 . -v
     when: always
 
-.test-lin_py:
+test-package:
     stage: test
     needs: []
+    parallel:
+        matrix:
+            - IMAGE: ["python:3.9", "python:3.10", "python:3.13"]
+    image: $IMAGE
     before_script:
         # missing dependencies for pyvista
         - apt-get update && apt-get install libgl1 -y
@@ -32,22 +36,6 @@ test-lint:
                 path: ./tests/coverage.xml
         when: always
 
-test-lin_py_3.9:
-    extends: ".test-lin_py"
-    image: "python:3.9"
-
-test-lin_py_3.10:
-    extends: ".test-lin_py"
-    image: "python:3.10"
-
-test-lin_py_3.11:
-    extends: ".test-lin_py"
-    image: "python:3.11"
-
-test-lin_py_3.12:
-    extends: ".test-lin_py"
-    image: "python:3.12"
-
 doc-compile_paper:
     stage: doc
     needs: []

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -31,7 +31,7 @@ repos:
             additional_dependencies: [flake8-docstrings]
     # strip output of notebooks
     - repo: https://github.com/kynan/nbstripout
-      rev: 0.7.1
+      rev: 0.8.1
       hooks:
           - id: nbstripout
     # pyupgrade

diff --git a/pyproject.toml b/pyproject.toml
@@ -10,7 +10,7 @@ where = ["."]
 
 [project]
 name = "pyGCodeDecode"
-version = "1.2.0"
+version = "1.3.0"
 authors = [
     { name = "FAST-LB at KIT", email = "lt-github@fast.kit.edu" },
     { name = "Jonathan Knirsch", email = "jonathan.knirsch@student.kit.edu" },
@@ -30,6 +30,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Scientific/Engineering",
 ]
 requires-python = ">=3.9"