travis/readthedocs fix 2

vitruvianscience · May 12, 2015 · 9a2d1a3 · 9a2d1a3
1 parent 1bf0df5
commit 9a2d1a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,13 +4,11 @@ python:
   - "3.2"
   - "3.3"
   - "3.4"
-  - "pypy"
-  - "pypy3"
   - "nightly"
 # command to install dependencies
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -y gcc g++ gfortran build-essential libopenblas-dev liblapack-dev
+  - sudo apt-get install -y gcc g++ gfortran build-essential git wget linux-image-generic libopenblas-dev python-dev python-pip python-nose python-numpy python-scipy
 install:
   - "pip install -r requirements.txt"
 # command to run tests

diff --git a/requirements.txt b/requirements.txt
@@ -15,4 +15,6 @@ PyYAML>=3.11
 # Bokeh for plotting (with bokeh-server)
 bokeh>=0.8.2
 # Mock for use in sphinx's conf.py in python versions < 3.3
-mock>=1.0.1
+mock>=1.0.1
+# Numpydoc used in sphinx's conf.py for parsing docstrings
+numpydoc>=0.5
diff --git a/setup.py b/setup.py
@@ -75,7 +75,7 @@ def run(self):
     ],
 
     dependency_links=['git+http://github.com/Theano/Theano.git#egg=Theano'],
-    install_requires=["numpy>=1.9.2", "scipy>=0.15.1", "Theano>=0.7.0", "Pillow>=2.8.1"],
+    install_requires=["numpy>=1.9.2", "scipy>=0.13.3", "Theano>=0.7.0", "Pillow>=2.8.1"],
 
     packages=find_packages(),
     # If there are data files included in your packages that need to be