Fix build

Jon Wayne Parrott · Jon Wayne Parrott · commit 9ee1995bb595 · 2016-10-14T09:57:50.000-07:00
Change-Id: I67f0fadbc876e3fece02ba64eea1bd73330993ba
diff --git a/nox.py b/nox.py
@@ -165,7 +165,7 @@ def run_tests_in_sesssion(
     """
     session.interpreter = interpreter
     session.install(REPO_TOOLS_REQ)
-    session.install('-r', 'requirements-dev.txt')
+    session.install('-r', 'testing/requirements-dev.txt')
 
     if use_appengine:
         setup_appengine(session)
@@ -294,10 +294,10 @@ def session_reqrollup(session):
     """
     requirements = set()
     requirements_files = list(list_files('.', 'requirements*.txt'))
-    requirements_files.append('./requirements-dev.in')
+    requirements_files.append('./testing/requirements-dev.in')
 
     for filename in requirements_files:
-        if filename == './requirements-dev.txt':
+        if filename == './testing/requirements-dev.txt':
             continue
 
         with open(filename, 'r') as f:
@@ -315,7 +315,7 @@ def mark_if_necessary(requirement):
     requirements = [
         mark_if_necessary(requirement) for requirement in requirements]
 
-    with open('requirements-dev.txt', 'w') as f:
+    with open('testing/requirements-dev.txt', 'w') as f:
         f.write('# This file is generated by nox -s reqrollup. Do not edit.\n')
         for requirement in sorted(requirements, key=lambda s: s.lower()):
             if not requirement.startswith('#'):
diff --git a/scripts/travis.sh b/scripts/travis.sh
@@ -1,13 +1,11 @@
 #!/bin/bash
 
-# Decrypt secrets if not on an external PR.
+# Decrypt secrets and run tests if not on an external PR.
 if [[ $TRAVIS_SECURE_ENV_VARS == "true" ]]; then
     scripts/decrypt-secrets.sh "$SECRETS_PASSWORD"
-fi
-
-if [[ $TRAVIS_SECURE_ENV_VARS == "true" ]]; then
-     source ${TRAVIS_BUILD_DIR}/testing/test-env.sh;
-     nox --stop-on-first-error -s lint travis;
+    source ${TRAVIS_BUILD_DIR}/testing/test-env.sh;
+    export GOOGLE_APPLICATION_CREDENTIALS=${TRAVIS_BUILD_DIR}/testing/service-account.json
+    nox --stop-on-first-error -s lint travis;
 else
     # only run lint on external PRs
     echo 'External PR: only running lint.'
