Skip to content

Commit

Permalink
add support for Django 5.0 and acme 2.8
Browse files Browse the repository at this point in the history
  • Loading branch information
mathiasertl committed Dec 27, 2023
1 parent 6a7f0c5 commit 7775449
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 6 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,13 @@ jobs:
matrix:
os: [ ubuntu-latest ]
python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
django-version: [ "4.2" ]
django-version: [ "4.2", "5.0", ]
cryptography-version: [ "41.0" ]
exclude:
- python-version: 3.8
django-version: 5.0
- python-version: 3.9
django-version: 5.0

name: Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }}, cryptography ${{ matrix.cryptography-version }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions devscripts/validation/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

from devscripts import config
from devscripts.commands import CommandError, DevCommand
from devscripts.out import err, ok
from devscripts.out import err, info, ok

if typing.TYPE_CHECKING: # pragma: only py<3.10 # remove TYPE_CHECKING check once support for 3.9 is dropped
# protected by TYPE_CHECKING as ParamSpec is new in Python 3.10.
Expand Down Expand Up @@ -138,7 +138,7 @@ def check_tox() -> int:
# pylint: enable=consider-using-f-string
# Check disabled as long as different Django versions support different Python versions
if expected_env_list not in tox_config["tox"]["envlist"].splitlines():
errors += err(f"Expected envlist item not found: {expected_env_list}")
info(f"(disabled) Expected envlist item not found: {expected_env_list}")

# Check that conditional dependencies are up-to-date
for component in ["django", "cryptography", "acme"]:
Expand Down
2 changes: 2 additions & 0 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ ChangeLog
1.28.0 (TBR)
************

* Add support for ``Django~=5.0`` and ``acme==2.8.0``.

REST API changes
================

Expand Down
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ build-backend = "setuptools.build_meta"
# https://devguide.python.org/versions/#versions
python = ["3.8", "3.9", "3.10", "3.11", "3.12"]
# https://www.djangoproject.com/download/
django = ["4.2"]
django = ["4.2", "5.0"]
cryptography = ["41.0"]
acme = ["2.7"]
acme = ["2.7", "2.8"]

# https://alpinelinux.org/releases/
alpine = [
Expand Down Expand Up @@ -70,6 +70,7 @@ 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",
"Intended Audience :: Developers",
"Intended Audience :: System Administrators",
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
[tox]
envlist = pylint,docs,lint,mypy,demo,dist-test
py{38,39,310,311,312}-dj{4.2}-cg{41.0}-acme{2.7}
py{310,311,312}-dj{5.0}-cg{41.0}-acme{2.7,2.8}
py{38,39,310,311,312}-dj{4.2}-cg{41.0}-acme{2.7,2.8}

[testenv]
skipsdist = True
deps =
-r requirements.txt
-r requirements/requirements-test.txt
dj4.2: Django~=4.2
dj5.0: Django~=5.0
cg41.0: cryptography~=41.0
acme2.7: acme~=2.7
acme2.8: acme~=2.8
setenv =
COVERAGE_FILE = {envdir}/.coverage
commands =
Expand Down

0 comments on commit 7775449

Please sign in to comment.