Skip to content

Commit

Permalink
Merge pull request #43 from mobolic/update-tested-python-and-django-v…
Browse files Browse the repository at this point in the history
…ersions

Update tested python and django versions.
  • Loading branch information
martey authored Dec 12, 2021
2 parents af61501 + d326345 commit 12d2214
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 4 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,15 @@ jobs:
fail-fast: false
max-parallel: 5
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9']
django-version: ['2.2', '3.0', '3.1', 'main']
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
django-version: ['2.2', '3.0', '3.1', '3.2', '4.0', 'main']
exclude:
- django-version: '2.2'
python-version: '3.10'
- django-version: '4.0'
python-version: '3.6'
- django-version: '4.0'
python-version: '3.7'
- django-version: 'main'
python-version: '3.6'
- django-version: 'main'
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Unreleased:
* Add support for Django 3.2 and 4.0.
* Add support for Python 3.10.

1.0.0:
* Add support for Django 2.2, 3.0, and 3.1.
* Add support for Python 3.6, 3.7, 3.8 and 3.9.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Software Development :: Libraries :: Python Modules',
'Topic :: Internet :: WWW/HTTP',
Expand Down
7 changes: 6 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
[tox]
envlist =
py{36,37,38,39}-dj{22,30,31,main}
py{36,37,38,39,310}-dj{22,30,31,32,40,main}

[testenv]
deps =
coverage
dj22: Django>=2.2,<3.0
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.tar.gz
usedevelop = True
ignore_outcome =
Expand All @@ -25,10 +27,13 @@ python =
3.7: py37
3.8: py38
3.9: py39
3.10: py310

[gh-actions:env]
DJANGO =
2.2: dj22
3.0: dj30
3.1: dj31
3.2: dj32
4.0: dj40
main: djmain

0 comments on commit 12d2214

Please sign in to comment.