From 8edb0598319df02d5866057f204b13e5b668d361 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 27 May 2025 13:34:16 +0200 Subject: [PATCH 1/7] specify storage for static files --- src/servala/settings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/servala/settings.py b/src/servala/settings.py index c5905c2..046c468 100644 --- a/src/servala/settings.py +++ b/src/servala/settings.py @@ -117,7 +117,10 @@ if all( "addressing_style": SERVALA_S3_ADDRESSING_STYLE, "signature_version": SERVALA_S3_SIGNATURE_VERSION, }, - } + }, + "staticfiles": { + "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage", + }, } ####################################### From 9d012ca2f8702329e694fc6648eae757cd58892a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 27 May 2025 12:49:53 +0000 Subject: [PATCH 2/7] Update dependency django to v5.2.1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 740bb70..7cb0977 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ requires-python = ">=3.12" dependencies = [ "argon2-cffi>=23.1.0", "cryptography>=44.0.2", - "django==5.2", + "django==5.2.1", "django-allauth>=65.5.0", "django-fernet-encrypted-fields>=0.3.0", "django-scopes>=2.0.0", From 3976d2905bcfa5c002c18e27688953d87487a46b Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 27 May 2025 14:58:00 +0200 Subject: [PATCH 3/7] define the github token for renovate --- .forgejo/workflows/renovate.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/renovate.yaml b/.forgejo/workflows/renovate.yaml index 39328b3..1d198f5 100644 --- a/.forgejo/workflows/renovate.yaml +++ b/.forgejo/workflows/renovate.yaml @@ -27,3 +27,4 @@ jobs: RENOVATE_ENDPOINT: ${{ vars.RENOVATE_ENDPOINT }} RENOVATE_PLATFORM: gitea RENOVATE_REPOSITORIES: ${{ github.repository }} + RENOVATE_GITHUB_COM_TOKEN: ${{ secrets.RENOVATE_GITHUB_TOKEN }} From e0a1197a70151b064f714597cb7dd39316177c7c Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 27 May 2025 15:03:12 +0200 Subject: [PATCH 4/7] adapt renovate config to recommendations --- .forgejo/workflows/renovate.yaml | 3 ++ renovate.json | 58 +++++++++++++++++++------------- 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/.forgejo/workflows/renovate.yaml b/.forgejo/workflows/renovate.yaml index 1d198f5..2f9d7d5 100644 --- a/.forgejo/workflows/renovate.yaml +++ b/.forgejo/workflows/renovate.yaml @@ -28,3 +28,6 @@ jobs: RENOVATE_PLATFORM: gitea RENOVATE_REPOSITORIES: ${{ github.repository }} RENOVATE_GITHUB_COM_TOKEN: ${{ secrets.RENOVATE_GITHUB_TOKEN }} + RENOVATE_GIT_AUTHOR: "Renovate Bot " + RENOVATE_USERNAME: renovate + RENOVATE_ENABLE_PYTHON_TOOL_VERSIONS: true diff --git a/renovate.json b/renovate.json index 3dbec6b..93dadaa 100644 --- a/renovate.json +++ b/renovate.json @@ -3,40 +3,50 @@ "extends": [ "config:recommended" ], + "hostRules": [ + { + "matchHost": "github.com", + "token": "{{ secrets.RENOVATE_GITHUB_TOKEN }}" + } + ], "packageRules": [ - { - "matchManagers": [ - "pip_requirements" - ], - "matchFileNames": [ - "pyproject.toml", - "requirements.txt", - "requirements/*.txt" - ] - }, - { - "matchManagers": [ - "dockerfile" - ], - "matchFileNames": [ - "Dockerfile", - "**/*.dockerfile", - "**/Dockerfile.*" - ] - }, { "matchManagers": [ "github-actions" ], "matchFileNames": [ ".forgejo/workflows/*.yml", - ".forgejo/workflows/*.yaml", - ".github/workflows/*.yml", - ".github/workflows/*.yaml" + ".forgejo/workflows/*.yaml" ] + }, + { + "matchManagers": [ + "pep621" + ], + "rangeStrategy": "bump" + }, + { + "matchPackageNames": [ + "python" + ], + "matchManagers": [ + "dockerfile" + ], + "versioning": "docker" } ], + "python": { + "installToolchain": true + }, "labels": [ "dependencies" - ] + ], + "lockFileMaintenance": { + "enabled": true, + "schedule": [ + "before 5am on monday" + ] + }, + "prConcurrentLimit": 5, + "branchConcurrentLimit": 10 } \ No newline at end of file From 4d5c8e3784bd649b9a9363b15a2f7b5d9c6fba23 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 27 May 2025 15:08:05 +0200 Subject: [PATCH 5/7] remove invalid setting from renovate config --- renovate.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/renovate.json b/renovate.json index 93dadaa..464948f 100644 --- a/renovate.json +++ b/renovate.json @@ -35,9 +35,6 @@ "versioning": "docker" } ], - "python": { - "installToolchain": true - }, "labels": [ "dependencies" ], From 880b38ce3f4d3d029e1054532b31568b7008255f Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 27 May 2025 15:11:51 +0200 Subject: [PATCH 6/7] remove wrong secret ref This becomes annoying - Claude really didn't help with Renovate --- renovate.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/renovate.json b/renovate.json index 464948f..727bdf6 100644 --- a/renovate.json +++ b/renovate.json @@ -3,12 +3,6 @@ "extends": [ "config:recommended" ], - "hostRules": [ - { - "matchHost": "github.com", - "token": "{{ secrets.RENOVATE_GITHUB_TOKEN }}" - } - ], "packageRules": [ { "matchManagers": [ From 87838a38c3906b6dfeac9593e4a0e5988d032b3f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 27 May 2025 13:15:42 +0000 Subject: [PATCH 7/7] Update dependency django to v5.2.1 --- pyproject.toml | 2 +- uv.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 740bb70..7cb0977 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ requires-python = ">=3.12" dependencies = [ "argon2-cffi>=23.1.0", "cryptography>=44.0.2", - "django==5.2", + "django==5.2.1", "django-allauth>=65.5.0", "django-fernet-encrypted-fields>=0.3.0", "django-scopes>=2.0.0", diff --git a/uv.lock b/uv.lock index f2e6662..7feca76 100644 --- a/uv.lock +++ b/uv.lock @@ -289,16 +289,16 @@ wheels = [ [[package]] name = "django" -version = "5.2" +version = "5.2.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "asgiref" }, { name = "sqlparse" }, { name = "tzdata", marker = "sys_platform == 'win32'" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/4c/1b/c6da718c65228eb3a7ff7ba6a32d8e80fa840ca9057490504e099e4dd1ef/Django-5.2.tar.gz", hash = "sha256:1a47f7a7a3d43ce64570d350e008d2949abe8c7e21737b351b6a1611277c6d89", size = 10824891, upload-time = "2025-04-02T13:08:06.874Z" } +sdist = { url = "https://files.pythonhosted.org/packages/ac/10/0d546258772b8f31398e67c85e52c66ebc2b13a647193c3eef8ee433f1a8/django-5.2.1.tar.gz", hash = "sha256:57fe1f1b59462caed092c80b3dd324fd92161b620d59a9ba9181c34746c97284", size = 10818735, upload-time = "2025-05-07T14:06:17.543Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/63/e0/6a5b5ea350c5bd63fe94b05e4c146c18facb51229d9dee42aa39f9fc2214/Django-5.2-py3-none-any.whl", hash = "sha256:91ceed4e3a6db5aedced65e3c8f963118ea9ba753fc620831c77074e620e7d83", size = 8301361, upload-time = "2025-04-02T13:08:01.465Z" }, + { url = "https://files.pythonhosted.org/packages/90/92/7448697b5838b3a1c6e1d2d6a673e908d0398e84dc4f803a2ce11e7ffc0f/django-5.2.1-py3-none-any.whl", hash = "sha256:a9b680e84f9a0e71da83e399f1e922e1ab37b2173ced046b541c72e1589a5961", size = 8301833, upload-time = "2025-05-07T14:06:10.955Z" }, ] [[package]] @@ -1022,7 +1022,7 @@ dev = [ requires-dist = [ { name = "argon2-cffi", specifier = ">=23.1.0" }, { name = "cryptography", specifier = ">=44.0.2" }, - { name = "django", specifier = "==5.2" }, + { name = "django", specifier = "==5.2.1" }, { name = "django-allauth", specifier = ">=65.5.0" }, { name = "django-fernet-encrypted-fields", specifier = ">=0.3.0" }, { name = "django-scopes", specifier = ">=2.0.0" },