Skip to content

Commit

Permalink
update requirements, run som optional tests on travis
Browse files Browse the repository at this point in the history
  • Loading branch information
alimanfoo committed Oct 21, 2016
1 parent b6da666 commit 9911d5c
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 28 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@ python:
- "3.4"
- "2.7"
- "2.6"
# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
#install: pip install -r requirements.txt --use-mirrors
# command to run tests, e.g. python setup.py test
install: pip install -r ci_requirements.txt --use-mirrors
script: nosetests -v
15 changes: 15 additions & 0 deletions ci_requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Cython==0.24.1
numpy==1.11.2
numexpr==2.6.1
bcolz==1.1.0
tables==3.3.0
intervaltree==2.1.0
lxml==3.6.4
openpyxl==2.4.0
pandas==0.19.0
#psycopg2==2.6.2
#PyMySQL==0.7.9
#SQLAlchemy==1.1.2
Whoosh==2.7.4
xlrd==1.0.0
xlwt-future==0.8.0
24 changes: 12 additions & 12 deletions optional_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Cython==0.23.4
numpy==1.10.1
numexpr==2.4.6
bcolz==0.12.1
tables==3.2.2
Cython==0.24.1
numpy==1.11.2
numexpr==2.6.1
bcolz==1.1.0
tables==3.3.0
intervaltree==2.1.0
lxml==3.5.0
lxml==3.6.4
openpyxl==2.4.0
pandas==0.17.1
psycopg2==2.6.1
PyMySQL==0.6.7
SQLAlchemy==1.0.9
Whoosh==2.7.0
xlrd==0.9.4
pandas==0.19.0
psycopg2==2.6.2
PyMySQL==0.7.9
SQLAlchemy==1.1.2
Whoosh==2.7.4
xlrd==1.0.0
xlwt-future==0.8.0
22 changes: 9 additions & 13 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,19 @@
# uncomment to test with only minimal requirements
#envlist = py26, py27, py34, doctests, docs
# test with all optional requirements
envlist = {py26,py27,py34}-optional, pypy, doctests, doctests-optional, docs, lxml, mysqldb
envlist = {py26,py27,py34}-optional, doctests, doctests-optional, docs, lxml
# trick to enable pre-installation of numpy and numexpr
indexserver =
preinstall1 = https://pypi.python.org/pypi
preinstall2 = https://pypi.python.org/pypi

[testenv]
# N.B., set these locally
#setenv =
# C_INCLUDE_PATH = /usr/lib/openmpi/include
# HDF5_DIR = /usr/lib/x86_64-linux-gnu/hdf5/openmpi
commands =
nosetests -v --stop petl
deps =
optional: :preinstall1: Cython==0.23.4
optional: :preinstall1: numpy==1.10.1
optional: :preinstall2: numexpr==2.4.6
optional: :preinstall1: Cython==0.24.1
optional: :preinstall1: numpy==1.11.2
optional: :preinstall2: numexpr==2.6.1
-rtest_requirements.txt
optional: -roptional_requirements.txt

Expand Down Expand Up @@ -51,9 +47,9 @@ commands =
nosetests -v --with-doctest --doctest-options=+NORMALIZE_WHITESPACE petl/transform/intervals.py
nosetests -v --with-doctest --doctest-options=+NORMALIZE_WHITESPACE petl/io/bcolz.py
deps =
:preinstall1: Cython==0.23.4
:preinstall1: numpy==1.10.1
:preinstall2: numexpr==2.4.6
:preinstall1: Cython==0.24.1
:preinstall1: numpy==1.11.2
:preinstall2: numexpr==2.6.1
-rtest_requirements.txt
-roptional_requirements.txt

Expand All @@ -70,7 +66,7 @@ basepython = python3.4
setenv =
PYTHONHASHSEED = 42
deps =
lxml==3.5.0
lxml==3.6.4
-rtest_requirements.txt
commands =
nosetests -v --stop petl
Expand All @@ -81,7 +77,7 @@ setenv =
PYTHONHASHSEED = 42
deps =
MySQL-python==1.2.5
SQLAlchemy==1.0.9
SQLAlchemy==1.1.2
-rtest_requirements.txt
commands =
nosetests -v --stop petl

0 comments on commit 9911d5c

Please sign in to comment.