From 46524cc2e2362db15e23a046fc2aac68d552a3af Mon Sep 17 00:00:00 2001 From: MaurizioPilia Date: Thu, 9 Oct 2025 12:30:22 +0200 Subject: [PATCH 1/9] Support new python and django versions --- .github/workflows/lint-and-test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index d23c565..afe19da 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -26,11 +26,11 @@ jobs: test: strategy: matrix: - python_version: ["3.10", 3.11, 3.12] - django_version: [3.2, 4.0, 4.1.0, 4.2.2, 5.0, 5.1.4] - exclude: - - python_version: 3.12 - django_version: 3.2 + python_version: ["3.10", 3.11, 3.12, 3.13, 3.14] + django_version: [4.2, 5.2, 6.0] +# exclude: +# - python_version: 3.12 +# django_version: 3.2 runs-on: ubuntu-latest steps: @@ -44,7 +44,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -q Django==${{ matrix.django_version }} + pip install -q Django~=${{ matrix.django_version }} pip install coverage pytest if [ -f requirements.txt ]; then pip install -r requirements.txt; fi From 8e42622d23c115e36a643751bbddcec98701697a Mon Sep 17 00:00:00 2001 From: MaurizioPilia Date: Thu, 9 Oct 2025 12:35:24 +0200 Subject: [PATCH 2/9] Fix python_version and django_version --- .github/workflows/lint-and-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index afe19da..d0d3749 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -26,8 +26,8 @@ jobs: test: strategy: matrix: - python_version: ["3.10", 3.11, 3.12, 3.13, 3.14] - django_version: [4.2, 5.2, 6.0] + python_version: ["3.10", "3.11", "3.12", "3.13", "3.14"] + django_version: ["4.2", "5.2", "6.0"] # exclude: # - python_version: 3.12 # django_version: 3.2 From d9ce6b35fade36aeed4b3dbbb7121716a931d630 Mon Sep 17 00:00:00 2001 From: MaurizioPilia Date: Thu, 9 Oct 2025 12:36:33 +0200 Subject: [PATCH 3/9] 6.0 not found --- .github/workflows/lint-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index d0d3749..a76094f 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: python_version: ["3.10", "3.11", "3.12", "3.13", "3.14"] - django_version: ["4.2", "5.2", "6.0"] + django_version: ["4.2", "5.2"] # exclude: # - python_version: 3.12 # django_version: 3.2 From b163a163ccc9c5051ec3678091ac93580bf8747a Mon Sep 17 00:00:00 2001 From: MaurizioPilia Date: Thu, 9 Oct 2025 12:39:25 +0200 Subject: [PATCH 4/9] Exclude python 3.13 with django 4.2 --- .github/workflows/lint-and-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index a76094f..c9c4a78 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -28,9 +28,9 @@ jobs: matrix: python_version: ["3.10", "3.11", "3.12", "3.13", "3.14"] django_version: ["4.2", "5.2"] -# exclude: -# - python_version: 3.12 -# django_version: 3.2 + exclude: + - python_version: 3.13 + django_version: 4.2 runs-on: ubuntu-latest steps: From 4fc0fd85c7e44d944b530e6180d007ec1b5bff9c Mon Sep 17 00:00:00 2001 From: MaurizioPilia Date: Thu, 9 Oct 2025 12:41:17 +0200 Subject: [PATCH 5/9] python 3.13 not supported --- .github/workflows/lint-and-test.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index c9c4a78..78f5bac 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -26,11 +26,9 @@ jobs: test: strategy: matrix: - python_version: ["3.10", "3.11", "3.12", "3.13", "3.14"] + python_version: ["3.10", "3.11", "3.12", "3.14"] django_version: ["4.2", "5.2"] - exclude: - - python_version: 3.13 - django_version: 4.2 + runs-on: ubuntu-latest steps: From 50c859b44e78719e78605941cf43a3750f2b015e Mon Sep 17 00:00:00 2001 From: MaurizioPilia Date: Thu, 9 Oct 2025 12:53:00 +0200 Subject: [PATCH 6/9] Update lint-and-test.yml --- .github/workflows/lint-and-test.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index 78f5bac..7a5a12a 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -26,8 +26,13 @@ jobs: test: strategy: matrix: - python_version: ["3.10", "3.11", "3.12", "3.14"] - django_version: ["4.2", "5.2"] + python_version: ["3.10", "3.11", "3.12", "3.13", "3.14"] + django_version: ["4.2", "5.1", "5.2"] + exclude: + - python_version: 3.13 + django_version: 4.2 + - python_version: 3.14 + django_version: 4.2 runs-on: ubuntu-latest From 8a4b29040fc9032fcd530d70f883981071fa53ca Mon Sep 17 00:00:00 2001 From: MaurizioPilia Date: Thu, 9 Oct 2025 12:54:31 +0200 Subject: [PATCH 7/9] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 92abdf2..5b7c6fc 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ packages=["encrypted_fields"], version="0.3.0", install_requires=[ - "Django>=3.2", + "Django>=4.2", "cryptography>=35.0.0", ], ) From cad656814c623cfd6c22a8063440417ecacc363d Mon Sep 17 00:00:00 2001 From: MaurizioPilia Date: Thu, 9 Oct 2025 12:56:09 +0200 Subject: [PATCH 8/9] Update requirements.txt --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index de8bfbc..df636f6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -cffi==1.14.6 -cryptography==35.0.0 -pycparser==2.20 -Django>=3.2 +cffi==2.0.0 +cryptography==46.0.2 +pycparser==2.23 +Django>=4.2 From 7f983133bbf4f277a1cd7feb38ae943797a3670d Mon Sep 17 00:00:00 2001 From: MaurizioPilia Date: Thu, 9 Oct 2025 12:57:58 +0200 Subject: [PATCH 9/9] Update lint-and-test.yml --- .github/workflows/lint-and-test.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index 7a5a12a..0f2ac9c 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -28,12 +28,7 @@ jobs: matrix: python_version: ["3.10", "3.11", "3.12", "3.13", "3.14"] django_version: ["4.2", "5.1", "5.2"] - exclude: - - python_version: 3.13 - django_version: 4.2 - - python_version: 3.14 - django_version: 4.2 - + runs-on: ubuntu-latest steps: