Lock node_modules into SCITRAN_RUNTIME_PATH

bin/install-dev-osx.sh

@@ -74,17 +74,3 @@ else
     MONGODB_VERSION=$($SCITRAN_RUNTIME_PATH/bin/mongod --version | grep "db version" | cut -d "v" -f 3)
     echo "MongoDB version $MONGODB_VERSION installed"
 fi
-
-
-# Install Node.js
-if [ ! -f "$SCITRAN_RUNTIME_PATH/bin/node" ]; then
-    echo "Installing Node.js"
-    NODE_URL="https://nodejs.org/dist/v6.4.0/node-v6.4.0-darwin-x64.tar.gz"
-    curl $NODE_URL | tar xz -C $VIRTUAL_ENV --strip-components 1
-fi
-
-
-# Install testing dependencies
-echo "Installing testing dependencies"
-pip install --no-cache-dir -r "test/integration_tests/requirements-integration-test.txt"
-npm install test/integration_tests

requirements.txt

@@ -12,4 +12,4 @@ strict-rfc3339==0.7
 uwsgi==2.0.13.1
 webapp2==2.5.2
 WebOb==1.5.1
-git+https://github.com/flywheel-io/gears.git@65aae6ae6f8634bf45d744332641b3838fc06668
+git+https://github.com/flywheel-io/gears.git@65aae6ae6f8634bf45d744332641b3838fc06668#egg=gears

test/bin/run-integration-tests.sh

@@ -59,13 +59,14 @@ set +u
 # If no VIRTUAL_ENV, make sure /usr/local/bin is in the path
 if [ -z "$VIRTUAL_ENV" ]; then
     PATH="/usr/local/bin:$PATH"
+    npm install test/integration_tests
+else
+    npm install --global test/integration_tests
 fi
 set -u
 
 PATH="$(npm bin):$PATH"
 
-npm install test/integration_tests
-
 # Allow us to require modules from package.json,
 # since abao_test_hooks.js is not being called from the package directory
 integration_test_node_modules="$( pwd )/node_modules/scitran-core-integration-tests/node_modules"

test/bin/run-tests-osx.sh

 #!/usr/bin/env bash
+
 set -e
 
 unset CDPATH
@@ -24,13 +25,22 @@ clean_up () {
   coverage report -m
   coverage html
 }
-
 trap clean_up EXIT
 
 ./bin/install-dev-osx.sh
 
-# Note this will fail with "unbound variable" errors if "set -u" is enabled
-. "$SCITRAN_RUNTIME_PATH/bin/activate"
+source $SCITRAN_RUNTIME_PATH/bin/activate # will fail with `set -u`
+
+# Install Node.js
+if [ ! -f "$SCITRAN_RUNTIME_PATH/bin/node" ]; then
+    echo "Installing Node.js"
+    NODE_URL="https://nodejs.org/dist/v6.10.2/node-v6.10.2-darwin-x64.tar.gz"
+    curl $NODE_URL | tar xz -C $VIRTUAL_ENV --strip-components 1
+fi
+
+# Install testing dependencies
+echo "Installing testing dependencies"
+pip install --no-cache-dir -r "test/integration_tests/requirements-integration-test.txt"
 
 ./test/bin/lint.sh api