From f40f87b83293e226648f77215e26ae890b70ea65 Mon Sep 17 00:00:00 2001
From: Christoffer Jansson <cjansss@gmail.com>
Date: Tue, 10 Oct 2017 16:56:37 +0200
Subject: [PATCH 1/2] Remove incorrect and unused dep

---
 build/ensure_gcloud_sdk_is_installed.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build/ensure_gcloud_sdk_is_installed.py b/build/ensure_gcloud_sdk_is_installed.py
index 1a3e6e549..30deed636 100644
--- a/build/ensure_gcloud_sdk_is_installed.py
+++ b/build/ensure_gcloud_sdk_is_installed.py
@@ -3,7 +3,6 @@
 import os
 import sys
 import requests
-import certifi
 import tarfile
 import subprocess
 

From 82753d8a40fb8d5fcad249089066c53782e7eb4e Mon Sep 17 00:00:00 2001
From: Christoffer Jansson <cjansss@gmail.com>
Date: Wed, 11 Oct 2017 16:14:50 +0200
Subject: [PATCH 2/2] set language to python and bump version

---
 .travis.yml  | 11 +++++++----
 Gruntfile.js |  7 ++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3fd40d15d..00520684c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 dist: trusty
-language: node_js
-node_js:
-  - 6
+language: python
+python: 2.7.13
 
 cache:
   directories:
@@ -30,13 +29,17 @@ matrix:
   allow_failures:
     - env: BROWSER=chrome  BVER=unstable
 
+before_install:
+  - nvm install 6
+  - nvm use 6
+
 before_script:
   - npm install
   - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/cucumber_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1600x1200x16
   - pulseaudio --start
 
 script:
-  - grunt --verbose
+  - ./node_modules/.bin/grunt  --verbose
 
 notifications:
   email:
diff --git a/Gruntfile.js b/Gruntfile.js
index 2a390b7c4..01091e002 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -3,6 +3,10 @@
 /* globals module */
 var out_app_engine_dir = 'out/app_engine';
 var app_engine_path = 'temp/google-cloud-sdk/platform/google_appengine'
+// Check if running on travis, if so do not install in User due to using
+// pythonEnv.
+var isTravis = ('TRAVIS' in process.env && 'CI' in process.env) ?
+    '' : '--user';
 
 module.exports = function(grunt) {
   // configure project
@@ -47,7 +51,8 @@ module.exports = function(grunt) {
 
     shell: {
       pipInstall : {
-        command: 'pip install --user --requirement requirements.txt'
+        command: ['pip install', isTravis, '--requirement requirements.txt']
+            .join(' ')
       },
       ensureGcloudSDKIsInstalled: {
         command: 'python build/ensure_gcloud_sdk_is_installed.py'