Skip to content

Commit

Permalink
Merge pull request webrtc#489 from webrtc/removeUnusedDep
Browse files Browse the repository at this point in the history
Remove incorrect and unused dep
  • Loading branch information
KaptenJansson authored Oct 12, 2017
2 parents c817cb5 + 82753d8 commit db6a194
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
dist: trusty
language: node_js
node_js:
- 6
language: python
python: 2.7.13

cache:
directories:
Expand Down Expand Up @@ -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:
Expand Down
7 changes: 6 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
1 change: 0 additions & 1 deletion build/ensure_gcloud_sdk_is_installed.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import os
import sys
import requests
import certifi
import tarfile
import subprocess

Expand Down

0 comments on commit db6a194

Please sign in to comment.