From 4b0f2521704ef5905543c03f5d5f54cb4c0d8b68 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Wed, 10 Jan 2018 21:46:10 -0800
Subject: [PATCH] Sort out dependencies in travis/tox (#4186)

* Make travis a bit more lean

* Bump npm to 5.6.0
---
 .travis.yml | 5 -----
 tox.ini     | 8 +++++++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 89ca5b6e5e7a..ba589d4590d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ cache:
 env:
   global:
     - TRAVIS_CACHE=$HOME/.travis_cache/
-    - TRAVIS_NODE_VERSION="8.8.1"
   matrix:
     - TOX_ENV=flake8
     - TOX_ENV=javascript
@@ -19,8 +18,6 @@ env:
     - TOX_ENV=py34-sqlite
     - TOX_ENV=py27-mysql
     - TOX_ENV=py27-sqlite
-before_install:
-  - npm install -g npm@'>=5.4.1'
 before_script:
   - mysql -u root -e "DROP DATABASE IF EXISTS superset; CREATE DATABASE superset DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci"
   - mysql -u root -e "CREATE USER 'mysqluser'@'localhost' IDENTIFIED BY 'mysqluserpassword';"
@@ -31,6 +28,4 @@ before_script:
 install:
   - pip install --upgrade pip
   - pip install tox tox-travis
-  - pip install --upgrade flake8
-  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
 script: tox -e $TOX_ENV
diff --git a/tox.ini b/tox.ini
index b9b8c11047b9..a4d5af4aa6f2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,6 +29,9 @@ find_links =
 deps =
     wheel
     coveralls
+whitelist_externals =
+    pip
+    npm
 passenv =
     HOME
     TRAVIS
@@ -48,6 +51,7 @@ commands =
 
 [testenv:flake8]
 commands =
+    pip install --upgrade flake8
     flake8
 deps =
     flake8
@@ -56,7 +60,9 @@ deps =
     flake8-quotes
 
 [testenv:javascript]
-commands = {toxinidir}/superset/assets/js_build.sh
+commands =
+    npm install -g npm@'>=5.6.0'
+    {toxinidir}/superset/assets/js_build.sh
 
 [testenv:pylint]
 commands =