Skip to content

Commit c686c43

Browse files
committed
Merge pull request #7389 from cpcloud/update-tox
BLD/TST/DEV: update tox to use python 3.4
2 parents aef2653 + 795d183 commit c686c43

File tree

4 files changed

+31
-86
lines changed

4 files changed

+31
-86
lines changed

tox.ini

+31-4
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,21 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = py26, py27, py32, py33
7+
envlist = py26, py27, py32, py33, py34
88

99
[testenv]
1010
deps =
1111
cython
12-
numpy >= 1.6.1
1312
nose
14-
pytz >= 2011k
13+
pytz>=2011k
14+
python-dateutil
15+
beautifulsoup4
16+
lxml
17+
openpyxl<2.0.0
18+
xlsxwriter
19+
xlrd
1520
six
21+
sqlalchemy
1622

1723
# cd to anything but the default {toxinidir} which
1824
# contains the pandas subdirectory and confuses
@@ -21,7 +27,7 @@ changedir = {envdir}
2127

2228
commands =
2329
# TODO: --exe because of GH #761
24-
{envbindir}/nosetests --exe pandas -A "not network"
30+
{envbindir}/nosetests --exe pandas {posargs:-A "not network and not disabled"}
2531
# cleanup the temp. build dir created by the tox build
2632
# /bin/rm -rf {toxinidir}/build
2733

@@ -37,9 +43,30 @@ commands =
3743
pip uninstall pandas -qy
3844

3945
[testenv:py26]
46+
deps =
47+
numpy==1.6.1
48+
boto
49+
bigquery
50+
{[testenv]deps}
4051

4152
[testenv:py27]
53+
deps =
54+
numpy==1.8.1
55+
boto
56+
bigquery
57+
{[testenv]deps}
4258

4359
[testenv:py32]
60+
deps =
61+
numpy==1.7.1
62+
{[testenv]deps}
4463

4564
[testenv:py33]
65+
deps =
66+
numpy==1.8.0
67+
{[testenv]deps}
68+
69+
[testenv:py34]
70+
deps =
71+
numpy==1.8.0
72+
{[testenv]deps}

tox.sh

-8
This file was deleted.

tox_prll.ini

-46
This file was deleted.

tox_prll.sh

-28
This file was deleted.

0 commit comments

Comments
 (0)