summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Abramowitz <marc@marc-abramowitz.com>2012-07-07 08:39:55 -0700
committerMarc Abramowitz <marc@marc-abramowitz.com>2012-07-07 08:39:55 -0700
commit4c2f4e949ed4e3cb559fad2d635d2e191dc2f2b2 (patch)
treef9242dbf5041c5c8b4f8bf793f9aa9b2b36e0b87
parent566df972615f913703f9f76161ac197ad52745b4 (diff)
downloadpython-coveragepy-git-4c2f4e949ed4e3cb559fad2d635d2e191dc2f2b2.tar.gz
Simplified tox.ini
-rw-r--r--tox.ini88
1 files changed, 7 insertions, 81 deletions
diff --git a/tox.ini b/tox.ini
index c757496a..eea9dc85 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,89 +4,15 @@
# and then run "tox" from this directory.
[tox]
-envlist = py24_py, py24_c, py25_py, py25_c, py26_py, py26_c, py27_py, py27_c, py32_py, py32_c, py33_py, py33_c, pypy_py
+envlist = py24, py25, py26, py27, py32, py33, pypy
[testenv]
setenv = PYTHONPATH=test/eggsrc
commands =
- {envpython} setup.py -q clean develop
- nosetests -w {toxinidir} -e test_farm
+ {envpython} setup.py clean
+ {envpython} setup.py build_ext --inplace
+ {envpython} setup.py develop
+ make testdata
+ env COVERAGE_TEST_TRACER="py" nosetests -w {toxinidir}
+ env COVERAGE_TEST_TRACER="c" nosetests -w {toxinidir}
deps = nose
-
-[testenv:py24_py]
-basepython = python2.4
-setenv =
- {[testenv]setenv}
- COVERAGE_TEST_TRACER=py
-
-[testenv:py24_c]
-basepython = python2.4
-setenv =
- {[testenv]setenv}
- COVERAGE_TEST_TRACER=c
-
-[testenv:py25_py]
-basepython = python2.5
-setenv =
- {[testenv]setenv}
- COVERAGE_TEST_TRACER=py
-
-[testenv:py25_c]
-basepython = python2.5
-setenv =
- {[testenv]setenv}
- COVERAGE_TEST_TRACER=c
-
-[testenv:py26_py]
-basepython = python2.6
-setenv =
- {[testenv]setenv}
- COVERAGE_TEST_TRACER=py
-
-[testenv:py26_c]
-basepython = python2.6
-setenv =
- {[testenv]setenv}
- COVERAGE_TEST_TRACER=c
-
-[testenv:py27_py]
-basepython = python2.7
-setenv =
- {[testenv]setenv}
- COVERAGE_TEST_TRACER=py
-
-[testenv:py27_c]
-basepython = python2.7
-setenv =
- {[testenv]setenv}
- COVERAGE_TEST_TRACER=c
-
-[testenv:py32_py]
-basepython = python3.2
-setenv =
- {[testenv]setenv}
- COVERAGE_TEST_TRACER=py
-
-[testenv:py32_c]
-basepython = python3.2
-setenv =
- {[testenv]setenv}
- COVERAGE_TEST_TRACER=c
-
-[testenv:py33_py]
-basepython = python3.3
-setenv =
- {[testenv]setenv}
- COVERAGE_TEST_TRACER=py
-
-[testenv:py33_c]
-basepython = python3.3
-setenv =
- {[testenv]setenv}
- COVERAGE_TEST_TRACER=c
-
-[testenv:pypy_py]
-basepython = pypy
-setenv =
- {[testenv]setenv}
- COVERAGE_TEST_TRACER=py