From 4bc7c2b7fa22ab435102e149c2a3bb646c2b0dd2 Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Tue, 29 Sep 2015 14:44:06 -0700
Subject: [PATCH] Updates tox.ini

---
 .travis.yml |  3 +-
 tox.ini     | 83 ++++++++++++-----------------------------------------
 2 files changed, 21 insertions(+), 65 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 67bc505c..c9d23a6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ python:
     - 2.7
     - 3.3
     - 3.4
+    - 3.5
     - pypy
     - pypy3
 before_install:
@@ -17,7 +18,7 @@ before_install:
       python --version
       uname -a
       lsb_release -a
-      sudo pip install tox
+      sudo travis_retry pip install tox
 script: tox -v -e $TRAVIS_PYTHON_VERSION -- -v
 after_success:
     - .tox/$TRAVIS_PYTHON_VERSION/bin/coveralls
diff --git a/tox.ini b/tox.ini
index cee58d3d..9286500c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,71 +1,26 @@
 [tox]
-envlist =
-    2.7,
-    3.3,
-    3.4,
-    pypy,
-    pypy3
+envlist = 2.7,3.3,3.4,3.5,pypy,pypy3
 
 [testenv]
 sitepackages = False
-commands = nosetests
-
-[testenv:3.4]
-basepython = python3.4
-deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/test3.txt
-       -r{toxinidir}/requirements/test-ci3.txt
-commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install -U -r{toxinidir}/requirements/dev.txt
-           nosetests -vds kombu.tests                            \
-                --with-coverage --cover-inclusive --cover-erase []
-
-[testenv:3.3]
-basepython = python3.3
-deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/test3.txt
-       -r{toxinidir}/requirements/test-ci3.txt
-commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install -U -r{toxinidir}/requirements/dev.txt
-           nosetests -vds kombu.tests                            \
-                --with-coverage --cover-inclusive --cover-erase []
-
-[testenv:2.7]
-basepython = python2.7
-deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/test.txt
-       -r{toxinidir}/requirements/test-ci.txt
-commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install -U -r{toxinidir}/requirements/dev.txt
-           nosetests --with-coverage --cover-inclusive --cover-erase []
-
-[testenv:pypy]
-basepython = pypy
-deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/test.txt
-       -r{toxinidir}/requirements/test-ci.txt
-commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install -U -r{toxinidir}/requirements/dev.txt
-           nosetests --with-coverage --cover-inclusive --cover-erase []
-
-[testenv:pypy3]
-basepython = pypy3
-deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/test3.txt
-       -r{toxinidir}/requirements/test-ci3.txt
 setenv = C_DEBUG_TEST = 1
+deps=
+    -r{toxinidir}/requirements/default.txt
+
+    2.7,pypy,jython: -r{toxinidir}/requirements/test.txt
+    2.7,pypy,jython: -r{toxinidir}/requirements/test-ci.txt
+
+    3.3,3.4,3.5,pypy3: -r{toxinidir}/requirements/test3.txt
+    3.3,3.4,3.5,pypy3: -r{toxinidir}/requirements/test-ci3.txt
+basepython =
+    2.7: python2.7
+    3.3: python3.3
+    3.4: python3.4
+    3.5: python3.5
+    pypy: pypy
+    pypy3: pypy3
+    jython: jython
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            pip install -U -r{toxinidir}/requirements/dev.txt
-           nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
-
-
-[testenv:jython]
-basepython = jython
-recreate = True
-where = .tox
-deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/test.txt
-       -r{toxinidir}/requirements/test-ci.txt
-commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install -U -r{toxinidir}/requirements/dev.txt
-           nosetests --with-coverage --cover-inclusive --cover-erase []
+           nosetests -vdsx kombu.tests                           \
+                --with-coverage --cover-inclusive --cover-erase []