Skip to content

Commit 982c939

Browse files
committed
Update project test suite and metadata for Django 4.0 support
1 parent 111dea2 commit 982c939

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,24 @@ jobs:
1616
with:
1717
poetry-version: '1.1.10'
1818
- run: pip install tox
19-
- run: tox -e lint,py310-dj32
19+
- run: tox -e lint,py310-dj40
2020
test_compatibility:
2121
needs: test
2222
runs-on: ubuntu-latest
2323
strategy:
2424
matrix:
2525
include:
26+
# Test with all supported Django versions, for all supported Python versions.
27+
# Additionally test on Django’s main branch with the most recent Python version.
2628
- python: "3.7"
29+
# Skip Django 4.0, which doesn’t support Python 3.7.
2730
toxenv: py37-dj22,py37-dj30,py37-dj31,py37-dj32
2831
- python: "3.8"
29-
toxenv: py38-dj22,py38-dj30,py38-dj31,py38-dj32
32+
toxenv: py38-dj22,py38-dj30,py38-dj31,py38-dj32,py38-dj40
3033
- python: "3.9"
31-
toxenv: py39-dj22,py39-dj30,py39-dj31,py39-dj32,py39-djmain
34+
toxenv: py39-dj22,py39-dj30,py39-dj31,py39-dj32,py39-dj40
3235
- python: "3.10"
33-
toxenv: py310-dj22,py310-dj30,py310-dj31,py310-dj32,py310-djmain
36+
toxenv: py310-dj22,py310-dj30,py310-dj31,py310-dj32,py310-dj40,py310-djmain
3437
steps:
3538
- uses: actions/checkout@v2
3639
- uses: actions/setup-python@v2

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ classifiers = [
2525
"Framework :: Django :: 3.0",
2626
"Framework :: Django :: 3.1",
2727
"Framework :: Django :: 3.2",
28+
"Framework :: Django :: 4.0",
2829
]
2930
packages = [
3031
{ include = "pattern_library" },
@@ -38,7 +39,7 @@ exclude = [
3839

3940
[tool.poetry.dependencies]
4041
python = "^3.7"
41-
Django = ">=2.2,<4.0"
42+
Django = ">=2.2,<4.1"
4243
PyYAML = ">=5.1,<7.0"
4344
Markdown = "^3.1"
4445

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{37,38,39,310}-dj{22,30,31,32,main}, lint
2+
envlist = py{37,38,39,310}-dj{22,30,31,32,40,main}, lint
33
skipsdist = true
44

55
[testenv]
@@ -15,6 +15,7 @@ deps =
1515
dj30: Django>=3.0,<3.1
1616
dj31: Django>=3.1,<3.2
1717
dj32: Django>=3.2,<3.3
18+
dj40: Django>=4.0,<4.1
1819
djmain: https://github.com/django/django/archive/main.zip
1920

2021
[testenv:lint]

0 commit comments

Comments
 (0)