From 66247a8261f7969effe2f2e61bd4157a0ae890e0 Mon Sep 17 00:00:00 2001 From: Tennessee Leeuwenburg Date: Fri, 17 Jul 2015 09:06:36 +1000 Subject: [PATCH] Added h5py to the conda install Test with some travis steps removes Testing Tweaking Tweaking Tweaking Final tweaking --- .travis.yml | 7 ++----- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index d212a89624b..45a9113055d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,15 +7,12 @@ before_install: - ./miniconda.sh -b - export PATH=/home/travis/miniconda/bin:$PATH - conda update --yes conda - # The next couple lines fix a crash with multiprocessing on Travis and are not specific to using Miniconda - - sudo rm -rf /dev/shm - - sudo ln -s /run/shm /dev/shm python: - "3.4" # command to install dependencies install: - - conda install --yes python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib pandas pytest + - conda install --yes python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib pandas pytest h5py # Coverage packages are on my binstar channel - python setup.py install # command to run tests -script: py.test +script: py.test tests/ diff --git a/setup.py b/setup.py index 4e9cd8f0208..1ea9e30d563 100644 --- a/setup.py +++ b/setup.py @@ -9,6 +9,6 @@ url = 'https://github.com/fchollet/keras', download_url = 'https://github.com/fchollet/keras/tarball/0.1.1', license = 'MIT', - install_requires = ['theano', 'pyyaml'], + install_requires = ['theano', 'pyyaml', 'h5py'], packages = find_packages(), -) \ No newline at end of file +)