Skip to content

Commit 06d7553

Browse files
authored
Added django 4 to CI (#580)
* Added django 4 to the strategy matrix in github actions * Dropped support for django 2.2 * Raised django requirement * Fixed classifiers and enabled django 4 matrix in tox * Restored django 2.2 * Added comments on why python 3.6 and 3.7 are not tested with django 4 in CI
1 parent 218e47c commit 06d7553

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
- '2.2'
2525
- '3.1'
2626
- '3.2'
27+
- '4.0'
2728
redis-version:
2829
- 'latest'
2930

3031
# only test pre-release dependencies for the latest Python
3132
include:
32-
# TODO: re-enable with https://github.com/jazzband/django-redis/issues/569
3333
# latest Django with pre-release redis
34-
- django-version: '3.2'
34+
- django-version: '4.0'
3535
redis-version: 'master'
3636
python-version: '3.10'
3737

@@ -40,12 +40,19 @@ jobs:
4040
redis-version: 'latest'
4141
python-version: '3.10'
4242

43-
# TODO: re-enable with https://github.com/jazzband/django-redis/issues/569
4443
# pre-release Django and redis
4544
- django-version: 'main'
4645
redis-version: 'master'
4746
python-version: '3.10'
4847

48+
# exclude python 3.6 and 3.7 for django 4.x as they are not supported see https://docs.djangoproject.com/en/dev/releases/4.0/#python-compatibility
49+
exclude:
50+
- django-version: '4.0'
51+
python-version: '3.6'
52+
53+
- django-version: '4.0'
54+
python-version: '3.7'
55+
4956
steps:
5057
- uses: actions/checkout@v2
5158

changelog.d/579.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add support for django 4

setup.cfg

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ classifiers =
1515
Framework :: Django :: 2.2
1616
Framework :: Django :: 3.1
1717
Framework :: Django :: 3.2
18+
Framework :: Django :: 4.0
1819
Intended Audience :: Developers
1920
License :: OSI Approved :: BSD License
2021
Operating System :: OS Independent
@@ -71,9 +72,9 @@ envlist =
7172
isort
7273
mypy
7374
# tests against released versions
74-
py{36,37,38,39,310}-dj{22,31,32}-redislatest
75+
py{36,37,38,39,310}-dj{22,31,32,40}-redislatest
7576
# tests against unreleased versions
76-
py310-dj32-redismaster
77+
py310-dj40-redismaster
7778
py310-djmain-redis{latest,master}
7879

7980
[gh-actions]
@@ -89,6 +90,7 @@ DJANGO =
8990
2.2: dj22
9091
3.1: dj31
9192
3.2: dj32
93+
4.0: dj40
9294
main: djmain
9395
REDIS =
9496
latest: redislatest
@@ -113,6 +115,7 @@ deps =
113115
dj22: Django>=2.2,<2.3
114116
dj31: Django>=3.1,<3.2
115117
dj32: Django>=3.2,<3.3
118+
dj40: Django>=4.0,<4.1
116119
djmain: https://github.com/django/django/archive/main.tar.gz
117120
msgpack>=0.6.0
118121
pytest

0 commit comments

Comments
 (0)