Merge pull request #556 from frewsxcv/develop

Run automated tests on Django 1.7
django-compressor · Sep 3, 2014 · 191145b · 191145b
2 parents b4dcb80 + 1a96480
commit 191145b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,10 @@ install:
 script:
   - tox
 env:
+  - TOXENV=py34-1.7.X
+  - TOXENV=py33-1.7.X
+  - TOXENV=py32-1.7.X
+  - TOXENV=py27-1.7.X
   - TOXENV=py33-1.6.X
   - TOXENV=py32-1.6.X
   - TOXENV=py27-1.6.X

diff --git a/tox.ini b/tox.ini
@@ -54,6 +54,30 @@ commands =
     django-admin.py --version
     make test
 
+[testenv:py34-1.7.X]
+basepython = python3.4
+deps =
+    Django>=1.7,<1.8
+    {[deps]three}
+
+[testenv:py33-1.7.X]
+basepython = python3.3
+deps =
+    Django>=1.7,<1.8
+    {[deps]three}
+
+[testenv:py32-1.7.X]
+basepython = python3.2
+deps =
+    Django>=1.7,<1.8
+    {[deps]three_two}
+
+[testenv:py27-1.7.X]
+basepython = python2.7
+deps =
+    Django>=1.7,<1.8
+    {[deps]two}
+
 [testenv:py33-1.6.X]
 basepython = python3.3
 deps =