Skip to content

Commit 4e2dfa0

Browse files
committed
Run tests on Django 2.0
Closes #530
1 parent 502ebcd commit 4e2dfa0

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ env:
88
- TOXENV=py27-django111
99
- TOXENV=py34-django111
1010
- TOXENV=py36-django111
11+
- TOXENV=py36-django20
1112
- TOXENV=py36-djangomaster
1213
- TOXENV=docs
1314
- TOXENV=flake8

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ classifiers =
1212
Environment :: Web Environment
1313
Framework :: Django
1414
Framework :: Django :: 1.11
15+
Framework :: Django :: 2.0
1516
Intended Audience :: Developers
1617
License :: OSI Approved :: BSD License
1718
Operating System :: OS Independent

tox.ini

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[tox]
22
envlist =
33
py27-django{111},
4-
py35-django{111,master},
5-
py36-django{111,master},
4+
py35-django{111,20,master},
5+
py36-django{111,20,master},
66
docs,
77
flake8
88

@@ -16,7 +16,8 @@ setenv =
1616
PYTHONPATH = {toxinidir}
1717
PYTHONWARNINGS = all
1818
deps =
19-
django111: Django >=1.11, <2.0
19+
django111: Django>=1.11,<2.0
20+
django20: Django>=2.0,<2.1
2021
djangomaster: https://github.com/django/django/archive/master.tar.gz
2122
djangorestframework >=3.5
2223
coverage
@@ -34,6 +35,7 @@ commands = make html
3435
deps = sphinx
3536

3637
[testenv:flake8]
38+
skip_install = True
3739
commands =
3840
flake8 {toxinidir} {posargs}
3941
isort {toxinidir} -c

0 commit comments

Comments
 (0)