Simplify tox.ini

pytest-dev · Feb 2, 2016 · 04a2f46 · 04a2f46
1 parent 7e4790a
commit 04a2f46
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 226 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 .DS_Store
 .Python
 .cache/
+.python-version
 .tox*
 bin/
 build/*

diff --git a/tox.ini b/tox.ini
@@ -1,230 +1,13 @@
+# 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 =
-    py26-pt223-x, py26-pt223, 
-    py26-pt224-x, py26-pt224,
-    py26-pt23-x, py26-pt23,
-    py26-pt231-x, py26-pt231,
-    py26-pt232-x, py26-pt232,
-    py26-pt233-x, py26-pt233,
-    py26-pt234-x, py26-pt231,
-    py26-pt242-x, py26-pt242,
-    py26-ptlatest-x, py26-ptlatest,
-    py27-pt223-x, py27-pt223, 
-    py27-pt224-x, py27-pt224,
-    py27-pt23-x, py27-pt23,
-    py27-pt231-x, py27-pt231,
-    py27-pt232-x, py27-pt232,
-    py27-pt233-x, py27-pt233,
-    py27-pt234-x, py27-pt234,
-    py27-pt242-x, py27-pt242,
-    py27-ptlatest-x, py27-ptlatest,
+envlist = py{26,27,32,33,34,35,py,py3}-pytest{27,28}
 
 [testenv]
-recreate=True
-sitepackages=False
-commands =
-    {envbindir}/py.test . {posargs}
-
-# ENVIRONMENT MATRIX
-# python versions 2.6, 2.7
-# py.test versions 2.2.3, 2.2.4, 2.3, 2.3.1, 2.3.2, 2.3.4 - current
-# pytest-xdist installed / not installed
-
-[testenv:py26-pt223-x]
-basepython = python2.6
-deps =
-    pytest==2.2.3
-    pytest-xdist
-
-[testenv:py26-pt223]
-basepython = python2.6
-deps =
-    pytest==2.2.3
-
-[testenv:py26-pt224-x]
-basepython = python2.6
-deps =
-    pytest==2.2.4
-    pytest-xdist
-
-[testenv:py26-pt224]
-basepython = python2.6
-deps =
-    pytest==2.2.4
-
-[testenv:py26-pt23-x]
-basepython = python2.6
-deps =
-    pytest==2.3
-    pytest-xdist
-
-[testenv:py26-pt23]
-basepython = python2.6
-deps =
-    pytest==2.3
-
-[testenv:py26-pt231-x]
-basepython = python2.6
-deps =
-    pytest==2.3.1
-    pytest-xdist
-
-[testenv:py26-pt231]
-basepython = python2.6
-deps =
-    pytest==2.3.1
-
-[testenv:py26-pt232-x]
-basepython = python2.6
-deps =
-    pytest==2.3.2
-    pytest-xdist
-
-[testenv:py26-pt232]
-basepython = python2.6
-deps =
-    pytest==2.3.2
-
-[testenv:py26-pt233-x]
-basepython = python2.6
-deps =
-    pytest==2.3.3
-    pytest-xdist
-
-[testenv:py26-pt233]
-basepython = python2.6
-deps =
-    pytest==2.3.3
-
-[testenv:py26-pt234-x]
-basepython = python2.6
-deps =
-    pytest==2.3.4
-    pytest-xdist
-
-[testenv:py26-pt234]
-basepython = python2.6
-deps =
-    pytest==2.3.4
-
-[testenv:py26-pt242-x]
-basepython = python2.6
-deps =
-    pytest==2.4.2
-    pytest-xdist
-
-[testenv:py26-pt242]
-basepython = python2.6
-deps =
-    pytest==2.4.2
-
-[testenv:py26-ptlatest-x]
-basepython = python2.6
-deps =
-    pytest
-    pytest-xdist
-
-[testenv:py26-ptlatest]
-basepython = python2.6
-deps =
-    pytest
-
-
-[testenv:py27-pt223-x]
-basepython = python2.7
-deps =
-    pytest==2.2.3
-    pytest-xdist
-
-[testenv:py27-pt223]
-basepython = python2.7
-deps =
-    pytest==2.2.3
-
-[testenv:py27-pt224-x]
-basepython = python2.7
-deps =
-    pytest==2.2.4
-    pytest-xdist
-
-[testenv:py27-pt224]
-basepython = python2.7
-deps =
-    pytest==2.2.4
-
-[testenv:py27-pt23-x]
-basepython = python2.7
-deps =
-    pytest==2.3
-    pytest-xdist
-
-[testenv:py27-pt23]
-basepython = python2.7
-deps =
-    pytest==2.3
-
-[testenv:py27-pt231-x]
-basepython = python2.7
-deps =
-    pytest==2.3.1
-    pytest-xdist
-
-[testenv:py27-pt231]
-basepython = python2.7
-deps =
-    pytest==2.3.1
-
-[testenv:py27-pt232-x]
-basepython = python2.7
-deps =
-    pytest==2.3.2
-    pytest-xdist
-
-[testenv:py27-pt232]
-basepython = python2.7
-deps =
-    pytest==2.3.2
-
-[testenv:py27-pt233-x]
-basepython = python2.7
-deps =
-    pytest==2.3.3
-    pytest-xdist
-
-[testenv:py27-pt233]
-basepython = python2.7
-deps =
-    pytest==2.3.3
-
-[testenv:py27-pt234-x]
-basepython = python2.7
-deps =
-    pytest==2.3.4
-    pytest-xdist
-
-[testenv:py27-pt234]
-basepython = python2.7
-deps =
-    pytest==2.3.4
-
-[testenv:py27-pt242-x]
-basepython = python2.7
-deps =
-    pytest==2.4.2
-    pytest-xdist
-
-[testenv:py27-pt242]
-basepython = python2.7
-deps =
-    pytest==2.4.2
-
-[testenv:py27-ptlatest-x]
-basepython = python2.7
-deps =
-    pytest
-    pytest-xdist
-
-[testenv:py27-ptlatest]
-basepython = python2.7
+commands = py.test test_pytest_rerunfailures.py {posargs}
 deps =
-    pytest
+    pytest27: pytest==2.7.*
+    pytest28: pytest==2.8.*