From bc37d57f76c181ee0b895333a8fd21425f6e2dc7 Mon Sep 17 00:00:00 2001 From: Mathias Ertl Date: Thu, 26 Dec 2024 21:39:28 +0100 Subject: [PATCH] drop support for deprecated software versions --- .github/workflows/tests.yml | 8 +++----- README.md | 2 +- docs/source/changelog/TBR_2.2.0.rst | 6 ++++++ docs/source/intro.rst | 2 +- docs/source/quickstart/as_app.rst | 1 + pyproject.toml | 13 ++++++------- tox.ini | 8 ++------ 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 34c46d788..14c3e579d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,12 +13,10 @@ jobs: matrix: os: [ ubuntu-latest ] python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ] - django-version: [ "4.2.0", "5.0.0", "5.1.0" ] - cryptography-version: [ "43.0", "44.0" ] - pydantic-version: [ "2.9.0", "2.10.0" ] + django-version: [ "4.2.0", "5.1.0" ] + cryptography-version: [ "44.0" ] + pydantic-version: [ "2.10.0" ] exclude: - - python-version: 3.9 - django-version: 5.0.0 - python-version: 3.9 django-version: 5.1.0 diff --git a/README.md b/README.md index eebbb5b32..fa053f43a 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Documentation is available at https://django-ca.readthedocs.org/. 4. Private key storage on the file system, in the database or in a Hardware Security Module (HSM). 5. Management via command line and/or via Django's admin interface. 6. Get email notifications about certificates about to expire. -7. Written in Python 3.9+, Django 4.2+ and cryptography 43+. +7. Written in Python 3.9+, Django 4.2+ and cryptography 44+. Please see https://django-ca.readthedocs.org for more extensive documentation. diff --git a/docs/source/changelog/TBR_2.2.0.rst b/docs/source/changelog/TBR_2.2.0.rst index 284cecf7c..87716681b 100644 --- a/docs/source/changelog/TBR_2.2.0.rst +++ b/docs/source/changelog/TBR_2.2.0.rst @@ -9,6 +9,12 @@ Settings * Dropped support for the old subject format in :ref:`settings-ca-default-subject` and subjects in profiles (deprecated since 1.29.0). +************ +Dependencies +************ + +* **BACKWARDS INCOMPATIBLE:** Dropped support for ``django~=5.0.0``. + ********** Python API ********** diff --git a/docs/source/intro.rst b/docs/source/intro.rst index b094fd0c3..b32826880 100644 --- a/docs/source/intro.rst +++ b/docs/source/intro.rst @@ -12,6 +12,6 @@ Features: #. Private key storage on the file system, in the database or in a Hardware Security Module (HSM). #. Management via command line and/or via Django's admin interface. #. Get email notifications about certificates about to expire. -#. Written in Python 3.9+, Django 4.2+ and cryptography 43+. +#. Written in Python 3.9+, Django 4.2+ and cryptography 44+. Please see https://django-ca.readthedocs.org for the most recent documentation. diff --git a/docs/source/quickstart/as_app.rst b/docs/source/quickstart/as_app.rst index 072aec1c7..c156f0413 100644 --- a/docs/source/quickstart/as_app.rst +++ b/docs/source/quickstart/as_app.rst @@ -35,6 +35,7 @@ tested with what release (changes to previous versions in **bold**): ========= ============== ================== =============== ============= ================ ================== django-ca Python Django cryptography Celery acme pydantic ========= ============== ================== =============== ============= ================ ================== +2.1 3.9 - **3.13** 4.2, 5.1 **43** - **44** 5.4 **2.11** **2.9** - **2.10** 2.1 3.9 - **3.13** 4.2 - 5.1 **43** - **44** 5.4 **2.11** **2.9** - **2.10** 2.0 3.9 - 3.12 4.2 - **5.1** 42 - **43** **5.4** **2.10** - 2.11 **2.7 - 2.9** 1.29 **3.9** - 3.12 4.2 - 5.0 **42** 5.3 - **5.4** **2.9 - 2.11** 2.5 - **2.7** diff --git a/pyproject.toml b/pyproject.toml index 315415516..6aa4b4af2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,10 +9,10 @@ build-backend = "setuptools.build_meta" # https://devguide.python.org/versions/#versions python = ["3.9", "3.10", "3.11", "3.12", "3.13"] # https://www.djangoproject.com/download/ -django = ["4.2", "5.0", "5.1"] -cryptography = ["43", "44"] -acme = ["2.11", "3.0"] -pydantic = ["2.9", "2.10"] +django = ["4.2", "5.1"] +cryptography = ["44"] +acme = ["3.0"] +pydantic = ["2.10"] # https://alpinelinux.org/releases/ alpine = [ @@ -99,7 +99,6 @@ description = "A Django app providing a TLS certificate authority." classifiers = [ "Development Status :: 5 - Production/Stable", "Framework :: Django :: 4.2", - "Framework :: Django :: 5.0", "Framework :: Django :: 5.1", "Framework :: Django", "Intended Audience :: Developers", @@ -124,9 +123,9 @@ dynamic = ["version", "readme"] requires-python = ">=3.9" dependencies = [ "Django>=4.2", - "acme>=2.11", + "acme>=3.0", "asn1crypto>=1.5", - "cryptography>=43", + "cryptography>=44", "django-object-actions>=4.0.0", "dnspython>=2.5", "idna>=3.4", diff --git a/tox.ini b/tox.ini index f2e232439..8cf83c6cd 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = pylint,docs,lint,mypy,demo,dist-test - py{310,311,312,313}-dj{5.0,5.1}-cg{43,44}-acme{2.11,3.0}-pydantic{2.9,2.10} - py{39,310,311,312,313}-dj{4.2}-cg{43,44}-acme{2.11,3.0}-pydantic{2.9,2.10} + py{310,311,312,313}-dj{5.1}-cg{44}-acme{3.0}-pydantic{2.10} + py{39,310,311,312,313}-dj{4.2}-cg{44}-acme{3.0}-pydantic{2.10} faketime [testenv] @@ -10,13 +10,9 @@ deps = -r requirements.txt -r requirements/requirements-test.txt dj4.2: Django~=4.2.0 - dj5.0: Django~=5.0.0 dj5.1: Django~=5.1.0 - cg43: cryptography~=43.0 cg44: cryptography~=44.0 - acme2.11: acme~=2.11.0 acme3.0: acme~=3.0.0 - pydantic2.9: pydantic~=2.9.0 pydantic2.10: pydantic~=2.10.0 setenv = COVERAGE_FILE = {envdir}/.coverage