fix: Upgrade to Python 3.12 (#2344)

* fix: Upgrade to Python 3.12 * Generic Python Snyk action * Install latest RR
ocadotechnology · Sep 2, 2024 · 06dfa2f · 06dfa2f
1 parent a7b5e4d
commit 06dfa2f
Show file tree

Hide file tree

Showing 11 changed files with 179 additions and 217 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,16 +13,16 @@ jobs:
       OCADO_TECH_ORG_ID: 2088731
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.12"
           architecture: "x64"
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 16.x
       - name: Install dependencies

diff --git a/.github/workflows/publish-python-package.yml b/.github/workflows/publish-python-package.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.12"
           architecture: "x64"
       - name: Install pip requirements
         run: |

diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup python-version
         uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.12"
           architecture: "x64"
       - name: Install Python dependencies
         run: |
@@ -26,7 +26,7 @@ jobs:
       - name: Generate requirements
         run: pip freeze > requirements.txt
       - name: Run Snyk to check for vulnerabilities in Python
-        uses: snyk/actions/python-3.8@master
+        uses: snyk/actions/python@master
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
         with:

diff --git a/.venv/.gitkeep b/.venv/.gitkeep
diff --git a/Dockerfile b/Dockerfile
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -5,4 +5,3 @@ graft portal/static
 graft portal/templates
 prune cfl_common
 prune example_project
-graft portal/frontend
diff --git a/Pipfile b/Pipfile
@@ -12,9 +12,9 @@ django-selenium-clean = "==1.0.0"
 django-test-migrations = "==1.2.0"
 responses = "==0.18.0"
 selenium = "==4.9.0"
-snapshottest = "==0.6.0"
+snapshottest = "==1.0.0a1"
 pytest-django = "==4.5.2"
-pytest = "==7.*"
+pytest = "==8.*"
 django-import-export = "*"
 pytest-cov = "*"
 pytest-xdist = "*"
@@ -26,4 +26,4 @@ black = "*"
 isort = "*"
 
 [requires]
-python_version = "3.8"
+python_version = "3.12"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/setup.py b/setup.py
@@ -24,14 +24,11 @@
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
-        "django==3.2.25",
-        "django-countries==7.3.1",
-        "djangorestframework==3.13.1",
         "django-pipeline==2.0.8",
         "django-recaptcha==2.0.6",
-        "pyyaml==5.4.1",
+        "pyyaml==6.0.2",
         "importlib-metadata==4.13.0",
-        "rapid-router>=6",
+        "rapid-router>=6.3.6",
         "reportlab==3.6.13",
         "django-formtools==2.2",
         "django-otp==1.0.2",  # we needed to fix this due to a wide ranged dependency in django-two-factor-auth
@@ -46,12 +43,12 @@
         "django-ratelimit==3.0.1",
         "django-preventconcurrentlogins==0.8.2",
         "django-csp==3.7",
-        "setuptools==70.3.0",
+        "setuptools==74.0.0",
         "django-import-export",
     ],
     classifiers=[
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.12",
         "Framework :: Django",
     ],
     zip_safe=False,