Skip to content

Commit

Permalink
Merge pull request #51 from carltongibson/django-30
Browse files Browse the repository at this point in the history
Added testing against Django 3.0
  • Loading branch information
charettes committed Jun 5, 2020
2 parents 2405a2a + 69976ae commit 44dfeb9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
'Framework :: Django',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
Expand Down
7 changes: 4 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ envlist =
isort,
py27-1.11,
py35-{1.11,2.2},
py36-{1.11,2.2,master},
py37-{1.11,2.2,master},
py38-{2.2,master},
py36-{1.11,2.2,3.0,master},
py37-{1.11,2.2,3.0,master},
py38-{2.2,3.0,master},

[tox:travis]
2.7 = py27
Expand All @@ -35,6 +35,7 @@ deps =
2.0: Django>=2.0,<2.1
2.1: Django>=2.1,<2.2
2.2: Django>=2.2,<3.0
3.0: Django>=3.0,<3.1
master: https://github.com/django/django/archive/master.tar.gz

[testenv:flake8]
Expand Down

0 comments on commit 44dfeb9

Please sign in to comment.