Skip to content

Commit

Permalink
Merge branch 'update-django' into 'main'
Browse files Browse the repository at this point in the history
Update django and python

See merge request reportcreator/reportcreator!382
  • Loading branch information
MWedl committed Dec 21, 2023
2 parents 0e7d230 + 26466a3 commit df697d3
Show file tree
Hide file tree
Showing 6 changed files with 1,014 additions and 1,082 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ RUN npm run build



FROM python:3.10-slim-bookworm AS api-dev
FROM python:3.11-slim-bookworm AS api-dev

# Add custom CA certificates
ARG CA_CERTIFICATES=""
Expand Down
995 changes: 470 additions & 525 deletions api/poetry.lock

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions api/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@ authors = []
packages = [{include = "reportcreator_api"}]

[tool.poetry.dependencies]
python = "~3.10"
django = { extras = ["argon2"], version = "~4.2" }
python = "~3.11"
django = { extras = ["argon2"], version = "~5.0" }
djangorestframework = "~3.14.0"
adrf = "~0.1.2"
weasyprint = "~60.1"
weasyprint = "~60.2"

django-phonenumber-field = { version = "^7.0.0", extras = ["phonenumberslite"] }
django-csp = "^3.7"
django-storages = "^1.13.2"
drf-nested-routers = "^0.93.4"
django-filter = "^23.1"
drf-spectacular = { extras = ["sidecar"], version = "^0.26.3" }
drf-spectacular = { extras = ["sidecar"], version = "^0.27.0" }
django-simple-history = "^3.4.0"

psycopg = { extras = ["binary"], version = "^3.1.8" }
gunicorn = "^21.2.0"
uvicorn = "^0.23.1"
uvicorn = "^0.25.0"
whitenoise = "^6.4.0"
brotli = "^1.0.9"
requests = "^2.28.2"
httpx = "^0.25.0"
httpx = "^0.26.0"
regex = "^2023.10.3"

jsonschema = "^4.17.3"
Expand All @@ -44,7 +44,7 @@ zipstream-ng = "^1.6.0"
boto3 = "^1.26.5"
playwright = "^1.32.1"
pikepdf = "^8.5.1"
celery = { extras = ["librabbitmq"], version = "^5.3" }
celery = "^5.3.6"

django-debug-toolbar = "^4.0.0"
debugpy = "^1.6.7"
Expand Down
Loading

0 comments on commit df697d3

Please sign in to comment.