From f2756140ac718452faf492e29450b672189976e7 Mon Sep 17 00:00:00 2001 From: Ramon de Jezus Date: Thu, 2 Oct 2025 11:15:58 +0200 Subject: [PATCH 1/3] Add Django 6.0 to the test matrix; don't test Python 3.11 since minimum for Django 6 is Python 3.12 --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dfc01111..13f3f6e7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,12 +17,14 @@ jobs: strategy: matrix: - django-version: ['4.2', '5.2'] + django-version: ['4.2', '5.2', '6.0'] python-version: ['3.11', '3.12', '3.13'] working-directory: ['./packages/hidp'] exclude: - django-version: '4.2' python-version: '3.13' + - django-version: '6.0' # Django 6.0 supports Python 3.12 and 3.13 + python-version: '3.11' include: - working-directory: './project' python-version: '3.12' From 48bcfdd08c36d51c3dde95d68c6ba476dcfaac38 Mon Sep 17 00:00:00 2001 From: Ramon de Jezus Date: Thu, 2 Oct 2025 11:57:07 +0200 Subject: [PATCH 2/3] Use 6.0 alpha 1 version instead of 6.0 --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 13f3f6e7..d5066256 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,13 +17,13 @@ jobs: strategy: matrix: - django-version: ['4.2', '5.2', '6.0'] + django-version: ['4.2', '5.2', '6.0a1'] python-version: ['3.11', '3.12', '3.13'] working-directory: ['./packages/hidp'] exclude: - django-version: '4.2' python-version: '3.13' - - django-version: '6.0' # Django 6.0 supports Python 3.12 and 3.13 + - django-version: '6.0a1' # Django 6.0a1 supports Python 3.12 and 3.13 python-version: '3.11' include: - working-directory: './project' From d96110c07f78c459a1a9d6d750364d76d1549107 Mon Sep 17 00:00:00 2001 From: Ramon de Jezus Date: Thu, 2 Oct 2025 12:00:17 +0200 Subject: [PATCH 3/3] Remove .0 from Django version. make django-hidp less strict --- packages/hidp/Makefile | 2 +- packages/hidp/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/hidp/Makefile b/packages/hidp/Makefile index 17c3730d..50e9b494 100644 --- a/packages/hidp/Makefile +++ b/packages/hidp/Makefile @@ -142,7 +142,7 @@ clean: ../../var/requirements_frozen.txt: # Pin Django directly to LTS version provided by the test matrix - echo 'Django~=${DJANGO_VERSION}.0' > ../../var/constraints.txt + echo 'Django~=${DJANGO_VERSION}' > ../../var/constraints.txt uv pip compile pyproject.toml --extra oidc_provider -q -o "${@}" --no-annotate --no-header --constraints ../../var/constraints.txt @echo "### Package dependencies :package:" >> ${GITHUB_STEP_SUMMARY} @echo '```' >> ${GITHUB_STEP_SUMMARY} diff --git a/packages/hidp/requirements.txt b/packages/hidp/requirements.txt index 695cec6b..02fe571c 100644 --- a/packages/hidp/requirements.txt +++ b/packages/hidp/requirements.txt @@ -1,4 +1,4 @@ -Django>=4.2,<6 +Django>=4.2 django-ratelimit>=4.1.0,<5 jwcrypto>=1.5,<2 requests>=2.32,<3