Skip to content

BLD/TST/DEV: update tox to use python 3.4 #7389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 31 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,21 @@
# and then run "tox" from this directory.

[tox]
envlist = py26, py27, py32, py33
envlist = py26, py27, py32, py33, py34

[testenv]
deps =
cython
numpy >= 1.6.1
nose
pytz >= 2011k
pytz>=2011k
python-dateutil
beautifulsoup4
lxml
openpyxl<2.0.0
xlsxwriter
xlrd
six
sqlalchemy

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

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

Expand All @@ -37,9 +43,30 @@ commands =
pip uninstall pandas -qy

[testenv:py26]
deps =
numpy==1.6.1
boto
bigquery
{[testenv]deps}

[testenv:py27]
deps =
numpy==1.8.1
boto
bigquery
{[testenv]deps}

[testenv:py32]
deps =
numpy==1.7.1
{[testenv]deps}

[testenv:py33]
deps =
numpy==1.8.0
{[testenv]deps}

[testenv:py34]
deps =
numpy==1.8.0
{[testenv]deps}
8 changes: 0 additions & 8 deletions tox.sh

This file was deleted.

46 changes: 0 additions & 46 deletions tox_prll.ini

This file was deleted.

28 changes: 0 additions & 28 deletions tox_prll.sh

This file was deleted.