Skip to content

Commit 510fc30

Browse files
author
y-p
committed
CLN: cleanup tox.ini, remove stale pandas/setup.py, fix tox warning
tox was complaining about "this is the wrong setup.py to use" because tox.ini was manually invoking pandas/setup.py, which has been superceeed by the root setup.py - the use of changedir= has been made clearer. - now removes the pandas uninstall from the venv after the tests. (but only if they succeed due to a limitation in tox)
1 parent 8ea1a51 commit 510fc30

File tree

2 files changed

+23
-35
lines changed

2 files changed

+23
-35
lines changed

pandas/setup.py

-26
This file was deleted.

tox.ini

+23-9
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,36 @@
77
envlist = py25, py26, py27, py31, py32
88

99
[testenv]
10-
commands =
11-
{envpython} setup.py clean build_ext install
12-
{envbindir}/nosetests tests
13-
/bin/rm -rf {toxinidir}/build {toxinidir}/tests
1410
deps =
1511
cython
1612
numpy >= 1.6.1
1713
nose
1814
pytz
1915

16+
# cd to anything but the default {toxinidir} which
17+
# contains the pandas subdirectory and confuses
18+
# nose away from the fresh install in site-packages
19+
changedir = {envdir}
20+
21+
commands =
22+
# TODO: --exe because of GH #761
23+
{envbindir}/nosetests --exe pandas.tests
24+
# cleanup the temp. build dir created by the tox build
25+
/bin/rm -rf {toxinidir}/build
26+
27+
# quietly rollback the install.
28+
# Note this line will only be reached if the tests
29+
# previous lines succeed (in particular, the tests),
30+
# but an uninstall is really only required when
31+
# files are removed from source tree, in which case,
32+
# stale versions of files will will remain in the venv,
33+
# until the next time uninstall is run.
34+
#
35+
# tox should provide a preinstall-commands hook.
36+
pip uninstall pandas -qy
37+
38+
2039
[testenv:py25]
21-
changedir = .tox/py25/lib/python2.5/site-packages/pandas
2240
deps =
2341
cython
2442
numpy >= 1.6.1
@@ -27,13 +45,9 @@ deps =
2745
simplejson
2846

2947
[testenv:py26]
30-
changedir = .tox/py26/lib/python2.6/site-packages/pandas
3148

3249
[testenv:py27]
33-
changedir = .tox/py27/lib/python2.7/site-packages/pandas
3450

3551
[testenv:py31]
36-
changedir = .tox/py31/lib/python3.1/site-packages/pandas
3752

3853
[testenv:py32]
39-
changedir = .tox/py32/lib/python3.2/site-packages/pandas

0 commit comments

Comments
 (0)