scipy from pip timed out, trying something new.

vitruvianscience · May 13, 2015 · 656622e · 656622e
1 parent 052213f
commit 656622e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ python:
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y gcc g++ gfortran build-essential git wget linux-image-generic libopenblas-dev python-dev python-pip python-nose
+  - pip install --upgrade pip
   - pip install cython
   - mkdir deps
   - cd deps
@@ -24,14 +25,6 @@ before_install:
   - python setup.py config
   - python setup.py build --fcompiler=gnu95
   - python setup.py install
-  - cd ..
-  - git clone https://github.com/scipy/scipy
-  - cd scipy
-  - touch site.cfg
-  - echo -e "[default]\ninclude_dirs = /opt/openblas/include\nlibrary_dirs = /opt/openblas/lib\n\n[openblas]\nopenblas_libs = openblas\nlibrary_dirs = /opt/openblas/lib\n\n[lapack]\nlapack_libs = openblas\nlibrary_dirs = /opt/openblas/lib" >> site.cfg
-  - python setup.py config
-  - python setup.py build --fcompiler=gnu95
-  - python setup.py install
   - cd ../..
 
 install:

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -206,6 +206,12 @@ Contents:
    :maxdepth: 3
 
    opendeep
+   opendeep.data
+   opendeep.models
+   opendeep.optimization
+   opendeep.monitor
+   opendeep.utils
+   opendeep.log
 
 Indices and tables
 ==================