Better Tox and Travis configuration. Credits to github.com/mrmachine …

…who creates this PR: #60
paulocheque · May 22, 2015 · 4b09bfd · 4b09bfd
1 parent 8fb4db3
commit 4b09bfd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 132 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,17 +9,17 @@ script:
   - tox
 
 env:
-  - TOXENV=py27-django12
-  - TOXENV=py27-django13
   - TOXENV=py27-django14
   - TOXENV=py27-django15
   - TOXENV=py27-django16
-  - TOXENV=py33-django16
   - TOXENV=py27-django17
+  - TOXENV=py27-django18
   - TOXENV=py33-django17
+  - TOXENV=py33-django18
   - TOXENV=py34-django17
-  - TOXENV=pypy-django16
+  - TOXENV=py34-django18
   - TOXENV=pypy-django17
+  - TOXENV=pypy-django18
 
 after_success:
   - coveralls
diff --git a/tox.ini b/tox.ini
@@ -1,137 +1,32 @@
-# Tox (http://tox.testrun.org/) is a tool for running tests
-# in multiple virtualenvs. This configuration file will run the
-# test suite on all supported python versions. To use it, "pip install tox"
-# and then run "tox" from this directory.
-
 [tox]
 envlist =
-    py27-django12,
-    py27-django13,
-    py27-django14,
-    py27-django15,
-    py27-django16,
-    py27-django17,
-    py27-django18,
-    py33-django16,
-    py33-django17,
-    py33-django18,
-    py34-django17,
-    py34-django18,
-    pypy-django16,
-    pypy-django17,
-    pypy-django18
-
+    django14-py{27},
+    django15-py{27},
+    django16-py{27,33},
+    django17-py{27,33,34,py},
+    django18-py{27,33,34,py},
 
 [testenv]
-setenv = VIRTUAL_ENV={envdir}
-         NOSE_WITH_OPENSTACK=1
-         NOSE_OPENSTACK_COLOR=1
-         NOSE_OPENSTACK_RED=0.05
-         NOSE_OPENSTACK_YELLOW=0.025
-         NOSE_OPENSTACK_SHOW_ELAPSED=1
+setenv =
+    VIRTUAL_ENV={envdir}
+    NOSE_WITH_OPENSTACK=1
+    NOSE_OPENSTACK_COLOR=1
+    NOSE_OPENSTACK_RED=0.05
+    NOSE_OPENSTACK_YELLOW=0.025
+    NOSE_OPENSTACK_SHOW_ELAPSED=1
+
+basepython=
+    py27: python2.7
+    py33: python3.3
+    py34: python3.4
+    pypy: pypy
 
 deps =
     -r{toxinidir}/requirements.txt
+    django14: django>=1.4,<1.5
+    django15: django>=1.5,<1.6
+    django16: django>=1.6,<1.7
+    django17: django>=1.7,<1.8
+    django18: django>=1.8,<1.9
 
 commands = {toxinidir}/runtests.py
-
-
-# py27 ===========================
-
-[testenv:py27-django12]
-basepython=python2.7
-deps=
-    {[testenv]deps}
-    django>=1.2,<1.3
-
-
-[testenv:py27-django13]
-basepython=python2.7
-deps=
-    {[testenv]deps}
-    django>=1.3,<1.4
-
-[testenv:py27-django14]
-basepython=python2.7
-deps=
-    {[testenv]deps}
-    django>=1.4,<1.5
-
-[testenv:py27-django15]
-basepython=python2.7
-deps=
-    {[testenv]deps}
-    django>=1.5,<1.6
-
-[testenv:py27-django16]
-basepython=python2.7
-deps=
-    {[testenv]deps}
-    django>=1.6,<1.7
-
-[testenv:py27-django17]
-basepython=python2.7
-deps=
-    {[testenv]deps}
-    django>=1.7,<1.8
-
-[testenv:py27-django18]
-basepython=python2.7
-deps=
-    {[testenv]deps}
-    django>=1.8,<1.9
-
-# pypy ===========================
-
-[testenv:pypy-django16]
-basepython=pypy
-deps=
-    {[testenv]deps}
-    django==1.6
-
-[testenv:pypy-django17]
-basepython=pypy
-deps=
-    {[testenv]deps}
-    django==1.7
-
-[testenv:pypy-django18]
-basepython=pypy
-deps=
-    {[testenv]deps}
-    django==1.8
-
-# py33 ===========================
-
-[testenv:py33-django16]
-basepython=python3.3
-deps=
-    {[testenv]deps}
-    django>=1.6,<1.7
-
-[testenv:py33-django17]
-basepython=python3.3
-deps=
-    {[testenv]deps}
-    django>=1.7,<1.8
-
-[testenv:py33-django18]
-basepython=python3.3
-deps=
-    {[testenv]deps}
-    django>=1.8,<1.9
-
-
-# py34 ===========================
-
-[testenv:py34-django17]
-basepython=python3.4
-deps=
-    {[testenv]deps}
-    django>=1.7,<1.8
-
-[testenv:py34-django18]
-basepython=python3.4
-deps=
-    {[testenv]deps}
-    django>=1.8,<1.9