Skip to content

Commit

Permalink
Update requirements, test with python 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
nouiz authored and dmitriy-serdyuk committed Sep 6, 2018
1 parent 3668c6c commit e2d28d8
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 16 deletions.
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,17 @@ before_install:
# Setup Python environment with BLAS libraries
- |
if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then
wget -q http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
# "./.travis-data.sh: line 8: fuel-download: command not found" with minocnda 4.4.10
wget -q http://repo.continuum.io/miniconda/Miniconda2-4.3.31-Linux-x86_64.sh -O miniconda.sh
else
wget -q http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
wget -q http://repo.continuum.io/miniconda/Miniconda3-4.3.31-Linux-x86_64.sh -O miniconda.sh
fi
- chmod +x miniconda.sh
- ./miniconda.sh -b -p $HOME/miniconda
- export PATH=$HOME/miniconda/bin:$PATH
- conda update -q --yes conda
- python --version
- pip --version
- conda --version
- export FUEL_DATA_PATH=$TRAVIS_BUILD_DIR/data
- export FUEL_LOCAL_DATA_PATH=$TRAVIS_BUILD_DIR/data_local
- export FUEL_FLOATX=float64
Expand All @@ -49,6 +52,7 @@ script:
- function fail { export FAILED=1; }
- |
if [[ $TESTS == 'blocks' ]]; then
export MKL_THREADING_LAYER=GNU # For Theano
bokeh-server &> /dev/null &
export PYTHONPATH=$HOME/blocks
nose2 tests --start-dir $HOME/blocks || fail
Expand Down
10 changes: 5 additions & 5 deletions req-travis-conda.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
coverage==4.0.3
h5py==2.5.0
h5py==2.8.0
mock==1.3.0
nose==1.3.7
numpy==1.10.4
pillow==3.1.1
pytables==3.2.2
pyyaml==3.11
pillow==5.2.0
pytables==3.4.4
pyyaml==3.13
pyzmq==15.2.0
requests==2.9.1
requests==2.19.1
scipy==0.17.0
six==1.10.0
2 changes: 1 addition & 1 deletion req-travis-pip.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
nose2[coverage_plugin]==0.6.4
nose2[coverage_plugin]==0.8.0
coveralls==1.1
picklable-itertools==0.1.1
progressbar2==3.6.2
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
h5py==2.5.0
h5py==2.8.0
numpy==1.10.4
tables==3.2.2
tables==3.4.4
picklable-itertools==0.1.1
pillow==3.1.1
pillow==5.2.0
progressbar2==3.6.2
pyyaml==3.11
pyyaml==3.13
pyzmq==15.2.0
requests==2.9.1
requests==2.19.1
scipy==0.17.0
six==1.10.0
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@
],
keywords='dataset data iteration pipeline processing',
packages=find_packages(exclude=['tests']),
install_requires=['numpy', 'six', 'picklable_itertools', 'pyyaml', 'h5py', 'tables',
'progressbar2', 'pyzmq', 'scipy', 'pillow', 'requests'],
install_requires=['numpy', 'six', 'picklable_itertools', 'pyyaml',
'h5py', 'tables',
'progressbar2', 'pyzmq', 'scipy', 'pillow>=3.3.2',
'requests'],
extras_require={
'test': ['mock', 'nose', 'nose2'],
'docs': ['sphinx', 'sphinx-rtd-theme']
Expand Down

0 comments on commit e2d28d8

Please sign in to comment.