Merge pull request #248 from micahcochran/caching

Travis: cache pip and compiled libgeos binaries

Author: WeatherGod

.travis.yml

@@ -22,7 +22,12 @@ addons:
 
 language: python
 
-cache: pip
+cache:
+  directories:
+    # cache for wheels generated by pip
+    - $HOME/.cache/pip
+    # cache for libgeos library binaries
+    - $HOME/.libgeos
 
 
 # matrix generates 6 test cases
@@ -54,7 +59,7 @@ matrix:
     - python: 3.4
       env: 
         - MPL=matplotlib==1.4.3
-#        - NUMPY="numpy>=1.9.0,<1.10.0"  # use the default install of numpy
+        - NUMPY=numpy==1.9.3
 
     # "latest and greatest" stable environments
     # this uses the current stable versions
@@ -88,47 +93,52 @@ matrix:
   # - source venv/bin/activate
 
 install:
-  # Upgrade pip and setuptools. Mock has issues with the default version of
-  # setuptools
+  # Upgrade pip and setuptools.  Install wheel.
   - pip install --upgrade pip
-  - pip install --upgrade setuptools
+  - pip install --upgrade setuptools 
+  - pip install wheel
 
   # the development version of numpy requires Cython
   - if [[ $TRAVIS_PYTHON_VERSION == 'nightly' ]]; then pip install --install-option="--no-cython-compile" Cython; fi
 
-  # workaround for "middle of the road" configuration to use pre-installed numpy, others "upgrade" numpy
-  - if [[ $TRAVIS_PYTHON_VERSION != '3.4' ]]; then pip install --upgrade $NUMPY; fi
 
-  - pip install --upgrade $MPL
-  - pip install --upgrade $PYPROJ
+  - pip install --upgrade $NUMPY
+  - pip install $MPL
+  - pip install $PYPROJ
   - pip install -r requirements.txt
 
   # extra requirements to support Python 2.6  
   - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install -r .requirements-2.6.txt; fi
 
-  # compile GEOS internally or download external version to compile
   - |
+    # Is libgeos suppose to be built?
     if [[ $BUILD_LIBGEOS != 'false' ]]; then
-      if [[ $BUILD_LIBGEOS == 'internal' ]]; then
-        echo 'Building internal libgeos'
-        cd geos-3.3.3
-      # does this string contain a "git" substring?
-      elif [[ $BUILD_LIBGEOS == *"git"* ]]; then
-        echo 'Using git to download libgeos development'
-        git clone ${BUILD_LIBGEOS}
-        cd libgeos
-        ./autogen.sh
-      else
-        echo 'Downloading and building external libgeos'
-        wget https://github.com/libgeos/libgeos/archive/${BUILD_LIBGEOS}.tar.gz
-        tar zxf ${BUILD_LIBGEOS}.tar.gz
-        cd libgeos-${BUILD_LIBGEOS}
-        ./autogen.sh
+      export GEOS_DIR=$HOME/.libgeos/${BUILD_LIBGEOS}/
+      # Does this path (for libgeos binaries) not exist in cache?
+      if [[ ! -d "$GEOS_DIR" ]] ; then
+        # Download and Compile libgeos
+        if [[ $BUILD_LIBGEOS == 'internal' ]]; then
+          echo 'Building internal libgeos'
+          cd geos-3.3.3
+        # Does this string contain a "git" substring?
+        elif [[ $BUILD_LIBGEOS == *"git"* ]]; then
+          echo 'Using git to download libgeos development'
+          git clone ${BUILD_LIBGEOS}
+          cd libgeos
+          ./autogen.sh
+          # do NOT cache libgeos git
+          export GEOS_DIR=$HOME/dont-cache-me/
+        else
+          echo 'Downloading and building external libgeos'
+          wget https://github.com/libgeos/libgeos/archive/${BUILD_LIBGEOS}.tar.gz
+          tar zxf ${BUILD_LIBGEOS}.tar.gz
+          cd libgeos-${BUILD_LIBGEOS}
+          ./autogen.sh
+        fi
+        ./configure --prefix=$GEOS_DIR
+        make; make install
+        cd ..
       fi
-      export GEOS_DIR=$HOME/.local/
-      ./configure --prefix=$GEOS_DIR
-      make; make install
-      cd ..
     fi
 #  - pip install pep8
   - pip install .