Skip to content

Commit

Permalink
Update project test suite and metadata for Django 4.0 support
Browse files Browse the repository at this point in the history
  • Loading branch information
thibaudcolas committed Dec 21, 2021
1 parent 65b7d97 commit b18524d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
with:
poetry-version: '1.1.12'
- run: pip install tox
- run: tox -e lint,py310-dj32
- run: tox -e lint,py310-dj40
test_compatibility:
needs: test
runs-on: ubuntu-latest
Expand All @@ -29,10 +29,11 @@ jobs:
- python: "3.7"
toxenv: py37-dj22,py37-dj30,py37-dj31,py37-dj32
- python: "3.8"
toxenv: py38-dj22,py38-dj30,py38-dj31,py38-dj32
toxenv: py38-dj22,py38-dj30,py38-dj31,py38-dj32,py38-dj40
- python: "3.9"
toxenv: py39-dj22,py39-dj30,py39-dj31,py39-dj32
toxenv: py39-dj22,py39-dj30,py39-dj31,py39-dj32,py39-dj40
- python: "3.10"
# Skip testing Django 4.0, already tested in previous workflow job.
toxenv: py310-dj32,py310-djmain
steps:
- uses: actions/checkout@v2
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ classifiers = [
"Framework :: Django :: 3.0",
"Framework :: Django :: 3.1",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.0",
]
packages = [
{ include = "pattern_library" },
Expand All @@ -38,7 +39,7 @@ exclude = [

[tool.poetry.dependencies]
python = "^3.7"
Django = ">=2.2,<4.0"
Django = ">=2.2,<4.1"
PyYAML = ">=5.1,<7.0"
Markdown = "^3.1"

Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{37,38,39,310}-dj{22,30,31,32,main}, lint
envlist = py{37,38,39,310}-dj{22,30,31,32,40,main}, lint
skipsdist = true

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

[testenv:lint]
Expand Down

0 comments on commit b18524d

Please sign in to comment.