From 6da3be4ebfee77e17f311d42ebe196e3c875d56b Mon Sep 17 00:00:00 2001 From: Manuel Guenther <manuel.guenther@idiap.ch> Date: Fri, 22 May 2015 16:12:25 +0200 Subject: [PATCH] Added scipy to dependencies --- .travis.yml | 2 +- requirements.txt | 1 + setup.py | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba4a48c..38723b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ before_install: - sudo add-apt-repository -y ppa:biometrics/bob - sudo apt-get update -qq - sudo apt-get install -qq --force-yes libjpeg8-dev libnetpbm10-dev libpng12-dev libtiff4-dev libgif-dev libboost-all-dev libblitz1-dev libhdf5-serial-dev libvl-dev dvipng texlive-latex-base texlive-latex-extra texlive-math-extra texlive-latex-recommended texlive-fonts-recommended libatlas-dev libatlas-base-dev liblapack-dev -- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel sphinx nose numpy matplotlib coverage +- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel sphinx nose numpy scipy matplotlib coverage - pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel --pre -r requirements.txt coveralls install: - python bootstrap-buildout.py diff --git a/requirements.txt b/requirements.txt index 69e5174..1cfacef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ setuptools +scipy bob.io.image # image IO bob.ip.base # tan-triggs dct-blocks bob.ip.color # color image conversion diff --git a/setup.py b/setup.py index 02afa89..7896b08 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,6 @@ # allows you to test your package with new python dependencies w/o requiring # administrative interventions. - from setuptools import setup, find_packages, dist dist.Distribution(dict(setup_requires=['bob.extension'])) -- GitLab