Skip to content

Commit dd9167e

Browse files
committed
add Django 3.2 and drop Django 3.0 from support list and test matrix
1 parent 26a9baa commit dd9167e

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,27 @@ jobs:
1717
- '3.9'
1818
django-version:
1919
- '2.2'
20-
- '3.0'
2120
- '3.1'
22-
- 'main'
21+
- '3.2'
2322
redis-version:
2423
- 'latest'
25-
- 'master'
26-
exclude:
24+
25+
# only test pre-release dependencies for the latest Python
26+
include:
27+
# latest Django with pre-release redis
28+
- django-version: '3.2'
29+
redis-version: 'master'
30+
python-version: '3.9'
31+
32+
# latest redis with pre-release Django
2733
- django-version: 'main'
28-
python-version: '3.6'
34+
redis-version: 'latest'
35+
python-version: '3.9'
36+
37+
# pre-release Django and redis
2938
- django-version: 'main'
30-
python-version: '3.7'
39+
redis-version: 'master'
40+
python-version: '3.9'
3141

3242
steps:
3343
- uses: actions/checkout@v2

setup.cfg

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ classifiers =
1212
Environment :: Web Environment
1313
Framework :: Django
1414
Framework :: Django :: 2.2
15-
Framework :: Django :: 3.0
1615
Framework :: Django :: 3.1
16+
Framework :: Django :: 3.2
1717
Intended Audience :: Developers
1818
License :: OSI Approved :: BSD License
1919
Operating System :: OS Independent
@@ -53,8 +53,11 @@ envlist =
5353
# needed because tx-gh-actions uses all factors
5454
# see https://github.com/ymyzk/tox-gh-actions/pull/60 for fix
5555
lint-dj31-redislatest
56-
py{36,37,38,39}-dj{22,30,31}-redis{latest,master}
57-
py{38,39}-djmain-redis{latest,master}
56+
# tests against released versions
57+
py{36,37,38,39}-dj{22,31,32}-redislatest
58+
# tests against unreleased versions
59+
py39-dj32-redismaster
60+
py39-djmain-redis{latest,master}
5861

5962
[gh-actions]
6063
python =
@@ -66,8 +69,8 @@ python =
6669
[gh-actions:env]
6770
DJANGO =
6871
2.2: dj22
69-
3.0: dj30
7072
3.1: dj31
73+
3.2: dj32
7174
main: djmain
7275
REDIS =
7376
latest: redislatest
@@ -86,8 +89,8 @@ commands =
8689

8790
deps =
8891
dj22: Django>=2.2,<2.3
89-
dj30: Django>=3.0,<3.1
9092
dj31: Django>=3.1,<3.2
93+
dj32: Django>=3.2,<3.3
9194
djmain: https://github.com/django/django/archive/main.tar.gz
9295
msgpack>=0.6.0
9396
redismaster: https://github.com/andymccurdy/redis-py/archive/master.tar.gz

0 commit comments

Comments
 (0)