Fixes to install steps

manylinux @ 8786096e

-Subproject commit ca01c729bc0b6e7aa2ba5ffe8df0f6020d588516
+Subproject commit 8786096ec20bf5a11976b8489873602776303cc3

travis_osx_steps.sh

@@ -23,7 +23,7 @@ function build_wheels {
     #  BUILD_DEPENDS
     #  BUILD_COMMIT
     #  WHEELHOUSE
-    if [-n "$BUILD_DEPENDS" ]; then pip install $BUILD_DEPENDS; fi
+    if [ -n "$BUILD_DEPENDS" ]; then pip install $BUILD_DEPENDS; fi
     if [ -n "$REPO_DIR" ]; then
         cd $REPO_DIR
         git fetch origin

travis_steps.sh

@@ -3,8 +3,8 @@
 git submodule update --init --recursive
 
 WHEELHOUSE=$PWD/wheelhouse
-
 MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")
+MANYLINUX_URL=${MANYLINUX_URL:-https://nipy.bic.berkeley.edu/manylinux}
 
 if [ ! -d "$WHEELHOUSE" ]; then mkdir $WHEELHOUSE; fi
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
@@ -13,12 +13,25 @@ else
     source $MULTIBUILD_DIR/travis_linux_steps.sh
 fi
 
+# Specify REPO_DIR to build from directory in this repository.
+# Specify PKG_SPEC to build from pip requirement (e.g numpy==1.7.1)
+# PKG_SPEC is hardly tested, please let us know of bugs.
 if [ -z "$REPO_DIR$PKG_SPEC" ]; then
     echo "Must specify REPO_DIR or PKG_SPEC"
     exit 1
 fi
 
 function install_wheel {
-    if [ -n "$TEST_DEPENDS" ]; then pip install $TEST_DEPENDS; fi
-    pip install $(python $MULTIBUILD_DIR/supported_wheels.py $WHEELHOUSE/*.whl)
+    # Install test dependencies and built wheel
+    # Pass any input flags to pip install steps
+    # Depends on:
+    #     MANYLINUX_URL
+    #     WHEELHOUSE
+    #     TEST_DEPENDS  (optional)
+    if [ -n "$TEST_DEPENDS" ]; then
+        pip install --find-links $MANYLINUX_URL $@ $TEST_DEPENDS
+    fi
+    # Install compatible wheel
+    pip install --find-links $MANYLINUX_URL $@ \
+        $(python $MULTIBUILD_DIR/supported_wheels.py $WHEELHOUSE/*.whl)
 }