Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge remote-tracking branch 'origin/master' into drf-3.18

Roland Geiderdbdedfe028c1
diff --cc pyproject.toml
index 7f4100a27,7b78a5d88..3b8ea2b86
--- a/pyproject.toml
+++ b/pyproject.toml
@@@ -46,14 -46,14 +46,14 @@@ dependencies =
"django-sortedm2m~=4.0.0",
"django-storages~=1.14.6",
"djangorestframework-simplejwt[crypto]~=5.5.1",
- "djangorestframework~=3.18.0",
- "django~=6.0.7",
- "djangorestframework~=3.17.1",
++ "djangorestframework~=3.18.1",
+ "django[argon2]~=6.0.7",
"drf-spectacular[sidecar]~=0.30.0",
"easy-thumbnails~=2.10.1",
- "flower~=2.1.0",
+ "flower~=2.2.0",
"fontawesomefree~=6.6.0",
"gevent>=26.5.0",
- "icalendar~=7.2.0",
+ "icalendar~=7.3.0",
"invoke~=3.0.3",
"lingua-language-detector~=2.2.0",
"markdownify~=1.2",
diff --cc uv.lock
index 4778133f5,0aae1e21a..253a30e28
--- a/uv.lock
+++ b/uv.lock
@@@ -742,14 -875,14 +875,14 @@@ wheels =
[[package]]
name = "djangorestframework"
- version = "3.18.0"
-version = "3.17.2"
++version = "3.18.1"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "django" },
]
- sdist = { url = "https://files.pythonhosted.org/packages/79/bc/de04e3d4dc65e8b926700956ee70d4f084f2005603d21122d4d0683006fd/djangorestframework-3.18.0.tar.gz", hash = "sha256:2323a5111837e0b784dcb8323abc78ecc54fa2a5af7aff2677cf50cdd849477f", size = 913667, upload-time = "2026-08-07T14:53:33.571Z" }
-sdist = { url = "https://files.pythonhosted.org/packages/3b/35/c96055e700fdff25da3a7b7756cfd1d4dc54f38b9bc6d6c5e19e3a0fdc20/djangorestframework-3.17.2.tar.gz", hash = "sha256:89ed713b6dc83e1539f214b7d10808ae19bb8511004beba886225da6d5c9dafa", size = 906683, upload-time = "2026-08-05T07:47:22.5Z" }
++sdist = { url = "https://files.pythonhosted.org/packages/8a/2e/b3ce9d449b1ed9f9dd74fb7dfbc5f20860d5f40c2b4b10a2c3eabd8ff579/djangorestframework-3.18.1.tar.gz", hash = "sha256:605d79fa2ec2f02905492e5ea13d903c2d842d0b4c915a57f7bf02ab9f3c91dd", size = 915653, upload-time = "2026-09-07T18:04:08.288Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/51/d7/7461738e819b853275b35fd35712a85806c09a327e1fd5f8ff766bdd317e/djangorestframework-3.18.0-py3-none-any.whl", hash = "sha256:381fc44d3249c9565c5f723850855b734e99030eb30957a49f506d3fe11d7dcb", size = 900032, upload-time = "2026-08-07T14:53:31.881Z" },
- { url = "https://files.pythonhosted.org/packages/a2/46/c14108e400b208c394325eb63fbae06c81341b6447fa1a6f9da718b17fe7/djangorestframework-3.17.2-py3-none-any.whl", hash = "sha256:cb0546a7415d5b46c04e0f4fe0a54b2109f4fdd5e83ca773c8c6183a6493d042", size = 899109, upload-time = "2026-08-05T07:47:20.853Z" },
++ { url = "https://files.pythonhosted.org/packages/e8/83/5ed615e47339d8e65f62eb1a8133f8f046492eb3a25ad40d90acb9a208b3/djangorestframework-3.18.1-py3-none-any.whl", hash = "sha256:f1409d698967aaf82d5d98d76b549c8fba8bd92ebd0d83d24454508f72168dc2", size = 901373, upload-time = "2026-09-07T18:04:06.237Z" },
]
[[package]]
@@@ -2044,7 -2203,7 +2203,7 @@@ requires-dist =
{ name = "django-simple-history", specifier = "~=3.13.0" },
{ name = "django-sortedm2m", specifier = "~=4.0.0" },
{ name = "django-storages", specifier = "~=1.14.6" },
- { name = "djangorestframework", specifier = "~=3.18.0" },
- { name = "djangorestframework", specifier = "~=3.17.1" },
++ { name = "djangorestframework", specifier = "~=3.18.1" },
{ name = "djangorestframework-simplejwt", extras = ["crypto"], specifier = "~=5.5.1" },
{ name = "drf-spectacular", extras = ["sidecar"], specifier = "~=0.30.0" },
{ name = "easy-thumbnails", specifier = "~=2.10.1" },