From e70d6d49d9d8a5caf3e5db93aeeeb9d4ae65e243 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 12 May 2016 11:07:17 +0200
Subject: [PATCH] travis: Separate requirement files

This way we can update pip independently before installing the rest, and
avoid installing codecov (and thus coverage which attempts to build C
extension) where it's not needed.
---
 scripts/dev/ci/requirements-codecov.txt                  | 3 +++
 .../ci/{requirements-travis.txt => requirements-pip.txt} | 2 --
 scripts/dev/ci/requirements-tox.txt                      | 4 ++++
 scripts/dev/ci/travis_install.sh                         | 9 ++++++---
 4 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 scripts/dev/ci/requirements-codecov.txt
 rename scripts/dev/ci/{requirements-travis.txt => requirements-pip.txt} (56%)
 create mode 100644 scripts/dev/ci/requirements-tox.txt

diff --git a/scripts/dev/ci/requirements-codecov.txt b/scripts/dev/ci/requirements-codecov.txt
new file mode 100644
index 000000000..738ee1445
--- /dev/null
+++ b/scripts/dev/ci/requirements-codecov.txt
@@ -0,0 +1,3 @@
+codecov==2.0.3
+coverage==4.0.3
+requests==2.10.0
diff --git a/scripts/dev/ci/requirements-travis.txt b/scripts/dev/ci/requirements-pip.txt
similarity index 56%
rename from scripts/dev/ci/requirements-travis.txt
rename to scripts/dev/ci/requirements-pip.txt
index c9bfc164d..04e43adf8 100644
--- a/scripts/dev/ci/requirements-travis.txt
+++ b/scripts/dev/ci/requirements-pip.txt
@@ -1,3 +1 @@
 pip==8.1.1  # rq.filter: != 8.1.2
-codecov==2.0.3
-tox==2.3.1
diff --git a/scripts/dev/ci/requirements-tox.txt b/scripts/dev/ci/requirements-tox.txt
new file mode 100644
index 000000000..57a912109
--- /dev/null
+++ b/scripts/dev/ci/requirements-tox.txt
@@ -0,0 +1,4 @@
+pluggy==0.3.1
+py==1.4.31
+tox==2.3.1
+virtualenv==15.0.1
diff --git a/scripts/dev/ci/travis_install.sh b/scripts/dev/ci/travis_install.sh
index c002a03f9..a9847aebd 100644
--- a/scripts/dev/ci/travis_install.sh
+++ b/scripts/dev/ci/travis_install.sh
@@ -54,7 +54,7 @@ brew_install() {
 
 pip_install() {
     # this uses python2
-    travis_retry sudo -H python -m pip install -r scripts/dev/ci/requirements-travis.txt
+    travis_retry sudo -H python -m pip install -r scripts/dev/ci/requirements-$1.txt
 }
 
 npm_install() {
@@ -84,17 +84,20 @@ elif [[ $TRAVIS_OS_NAME == osx ]]; then
     # Disable App Nap
     defaults write NSGlobalDomain NSAppSleepDisabled -bool YES
     brew_install python3 pyqt5
-    pip_install
+    pip_install pip
+    pip_install tox
     check_pyqt
     exit 0
 fi
 
 pyqt_pkgs="python3-pyqt5 python3-pyqt5.qtwebkit"
 
-pip_install
+pip_install pip
+pip_install tox
 
 case $TESTENV in
     py34-cov)
+        pip_install codecov
         apt_install xvfb $pyqt_pkgs libpython3.4-dev
         check_pyqt
         ;;