Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Upgrade to Python 3.12 #2344

Merged
merged 3 commits into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions .dockerignore

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snyk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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:
Expand Down
Empty file removed .venv/.gitkeep
Empty file.
24 changes: 0 additions & 24 deletions Dockerfile

This file was deleted.

1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ graft portal/static
graft portal/templates
prune cfl_common
prune example_project
graft portal/frontend
6 changes: 3 additions & 3 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "*"
Expand All @@ -26,4 +26,4 @@ black = "*"
isort = "*"

[requires]
python_version = "3.8"
python_version = "3.12"
301 changes: 165 additions & 136 deletions Pipfile.lock

Large diffs are not rendered by default.

13 changes: 0 additions & 13 deletions docker-compose.yml

This file was deleted.

11 changes: 4 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
Loading