Skip to content

Commit 7f8aefc

Browse files
committed
MAINT: update tox.ini
Remove unsupported Python versions, flip the NPY_SEPARATE_COMPILATION flags, and add NPY_RELAXED_STRIDES, mirroring the travis configuration.
1 parent c6fc9a2 commit 7f8aefc

File tree

1 file changed

+19
-11
lines changed

1 file changed

+19
-11
lines changed

tox.ini

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# - Use pip to install the numpy sdist into the virtualenv
1414
# - Run the numpy tests
1515
# To run against a specific subset of Python versions, use:
16-
# tox -e py24,py27
16+
# tox -e py27
1717

1818
# Extra arguments will be passed to test-installed-numpy.py. To run
1919
# the full testsuite:
@@ -22,27 +22,35 @@
2222
# tox -- -v
2323

2424
# Tox assumes that you have appropriate Python interpreters already
25-
# installed and that they can be run as 'python2.4', 'python2.5', etc.
25+
# installed and that they can be run as 'python2.7', 'python3.3', etc.
2626

2727
[tox]
28-
envlist = py24,py25,py26,py27,py31,py32,py27-separate,py32-separate
28+
envlist = py26,py27,py32,py33,py27-monolithic,py33-monolithic,py27-relaxed-strides,py33-relaxed-strides
2929

3030
[testenv]
3131
deps=
3232
nose
3333
changedir={envdir}
34-
commands=python {toxinidir}/tools/test-installed-numpy.py {posargs:}
34+
commands={envpython} {toxinidir}/tools/test-installed-numpy.py --mode=full {posargs:}
3535

36-
[testenv:py27-separate]
36+
[testenv:py27-monolithic]
3737
basepython=python2.7
38-
env=NPY_SEPARATE_COMPILATION=1
38+
env=NPY_SEPARATE_COMPILATION=0
3939

40-
[testenv:py32-separate]
41-
basepython=python3.2
42-
env=NPY_SEPARATE_COMPILATION=1
40+
[testenv:py33-monolithic]
41+
basepython=python3.3
42+
env=NPY_SEPARATE_COMPILATION=0
43+
44+
[testenv:py27-relaxed-strides]
45+
basepython=python2.7
46+
env=NPY_RELAXED_STRIDES_CHECKING=1
47+
48+
[testenv:py33-relaxed-strides]
49+
basepython=python3.3
50+
env=NPY_RELAXED_STRIDES_CHECKING=1
4351

4452
# Not run by default. Set up the way you want then use 'tox -e debug'
4553
# if you want it:
4654
[testenv:debug]
47-
basepython=PYTHON-WITH-DEBUG-INFO
48-
commands=gdb --args {envpython} {toxinidir}/tools/test-installed-numpy.py {posargs:}
55+
basepython=python-dbg
56+
commands=gdb --args {envpython} {toxinidir}/tools/test-installed-numpy.py --mode=full {posargs:}

0 commit comments

Comments
 (0)