rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

travis: Use python2 for pip

Browse Source 
This means we won't need to install pip via apt-get, and using a
Python 2 tox/pip is fine.
This commit is contained in:
Florian Bruhin 2016-05-12 08:49:52 +02:00
parent 3033f77f99
commit e13320b398
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/dev/ci/travis_install.sh
View File

@ -53,7 +53,8 @@ brew_install() {
} }
pip_install() { pip_install() {
travis_retry sudo -H python3 -m pip install -r scripts/dev/ci/requirements-travis.txt # this uses python2
travis_retry sudo -H python -m pip install -r scripts/dev/ci/requirements-travis.txt
} }
npm_install() { npm_install() {
@ -90,28 +91,30 @@ fi
pyqt_pkgs="python3-pyqt5 python3-pyqt5.qtwebkit" pyqt_pkgs="python3-pyqt5 python3-pyqt5.qtwebkit"
pip_install
case $TESTENV in case $TESTENV in
py34-cov) py34-cov)
apt_install python3-pip xvfb $pyqt_pkgs apt_install xvfb $pyqt_pkgs
check_pyqt check_pyqt
;; ;;
pylint|vulture) pylint|vulture)
apt_install python3-pip $pyqt_pkgs apt_install $pyqt_pkgs
check_pyqt check_pyqt
;; ;;
flake8) flake8)
# We need an up-to-date Python because of: # We need an up-to-date Python because of:
# https://github.com/google/yapf/issues/46 # https://github.com/google/yapf/issues/46
apt_install -t trusty-updates python3.4 python3-pip apt_install -t trusty-updates python3.4
;; ;;
docs) docs)
apt_install python3-pip $pyqt_pkgs asciidoc apt_install $pyqt_pkgs asciidoc
check_pyqt check_pyqt
;; ;;
misc|pyroma|check-manifest) misc|pyroma|check-manifest)
;; ;;
eslint) eslint)
apt_install python3-pip npm nodejs nodejs-legacy apt_install npm nodejs nodejs-legacy
npm_install eslint npm_install eslint
;; ;;
*) *)
@ -119,5 +122,3 @@ case $TESTENV in
exit 1 exit 1
;; ;;
esac esac
pip_install