summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorBruno Alla <browniebroke@users.noreply.github.com>2018-03-10 18:20:13 +0000
committerJohannes Linke <karyon@users.noreply.github.com>2018-03-10 19:20:13 +0100
commite835b4d14547cd6936f4f8a693d5770b87caf653 (patch)
treeaf4d23db0060b25dd5a361e26d5d19f7758a9c81 /tox.ini
parentb04006bc3c13351ad3071de60a5da6073dc25e5a (diff)
downloaddjango-compressor-e835b4d14547cd6936f4f8a693d5770b87caf653.tar.gz
Add django 2.0 to the build matrix (#896)
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini6
1 files changed, 4 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 126accf..ed5921d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,8 @@ three =
[tox]
envlist =
{py27,py34,py35}-{1.8.X,1.9.X,1.10.X,1.11.X}
- {py36}-{1.11.X}
+ {py34,py35}-2.0.X
+ {py36}-{1.11.X,2.0.X}
[testenv]
basepython =
py27: python2.7
@@ -46,7 +47,8 @@ deps =
1.8.X: Django>=1.8,<1.9
1.9.X: Django>=1.9,<1.10
1.10.X: Django>=1.10,<1.11
- 1.11.X: Django>=1.11,<1.12
+ 1.11.X: Django>=1.11,<2.0
+ 2.0.X: Django>=2.0,<2.1
py27: {[deps]two}
py34: {[deps]three}
py35: {[deps]three}