From cdc79339fbcc2ea2918717e6b2f20fb1480d5512 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 12 May 2016 20:09:44 +0200 Subject: [PATCH] travis: Use requirement files for pip This way we can pin tox/pip versions (which are used in the native Travis environment) *and* get notified about updates by requires.io. --- scripts/dev/ci/requirements-travis.txt | 3 +++ scripts/dev/ci/travis_install.sh | 14 ++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) create mode 100644 scripts/dev/ci/requirements-travis.txt diff --git a/scripts/dev/ci/requirements-travis.txt b/scripts/dev/ci/requirements-travis.txt new file mode 100644 index 000000000..c9bfc164d --- /dev/null +++ b/scripts/dev/ci/requirements-travis.txt @@ -0,0 +1,3 @@ +pip==8.1.1 # rq.filter: != 8.1.2 +codecov==2.0.3 +tox==2.3.1 diff --git a/scripts/dev/ci/travis_install.sh b/scripts/dev/ci/travis_install.sh index a38ee3731..32b44bca1 100644 --- a/scripts/dev/ci/travis_install.sh +++ b/scripts/dev/ci/travis_install.sh @@ -52,9 +52,7 @@ brew_install() { } pip_install() { - # Make sure pip is up-to-date first - travis_retry sudo -H python3 -m pip install -U pip - travis_retry sudo -H python3 -m pip install -U "$@" + travis_retry sudo -H python3 -m pip install -r scripts/dev/ci/requirements-travis.txt } npm_install() { @@ -84,7 +82,7 @@ elif [[ $TRAVIS_OS_NAME == osx ]]; then # Disable App Nap defaults write NSGlobalDomain NSAppSleepDisabled -bool YES brew_install python3 pyqt5 - pip_install tox + pip_install check_pyqt exit 0 fi @@ -94,31 +92,25 @@ pyqt_pkgs="python3-pyqt5 python3-pyqt5.qtwebkit" case $TESTENV in py34-cov) apt_install python3-pip xvfb $pyqt_pkgs - pip_install tox codecov check_pyqt ;; pylint|vulture) apt_install python3-pip $pyqt_pkgs - pip_install tox check_pyqt ;; flake8) # We need an up-to-date Python because of: # https://github.com/google/yapf/issues/46 apt_install -t trusty-updates python3.4 python3-pip - pip_install tox ;; docs) apt_install python3-pip $pyqt_pkgs asciidoc - pip_install tox check_pyqt ;; misc|pyroma|check-manifest) - pip_install tox ;; eslint) apt_install python3-pip npm nodejs nodejs-legacy - pip_install tox npm_install eslint ;; *) @@ -126,3 +118,5 @@ case $TESTENV in exit 1 ;; esac + +pip_install