Merge pull request #352 from thunder-project/check-dependencies

remove unused conda installs
thunder-project · Aug 5, 2016 · 33ae844 · 33ae844
2 parents d638220 + cf42dc7
commit 33ae844
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,7 @@ install:
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda info -a
-  - conda create --yes -q -n test python=$TRAVIS_PYTHON_VERSION pip numpy scipy scikit-learn scikit-image matplotlib pytest boto
+  - conda create --yes -q -n test python=$TRAVIS_PYTHON_VERSION pip numpy scipy pytest boto
   - source activate test
   - pip install .
   - pip install -r requirements-dev.txt

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,7 @@
 numpy
 scipy
+six
+pillow>=2.1.0
 boto >= 2.36.0
 bolt-python >= 0.7.0
 tifffile >= 0.9.2