travis: Update travis_install.sh

This commit is contained in:
Florian Bruhin 2017-09-09 22:03:16 +02:00
parent eae276b539
commit 49a389542e
2 changed files with 6 additions and 10 deletions

View File

@ -66,10 +66,6 @@ cache:
- $HOME/.cache/pip - $HOME/.cache/pip
- $HOME/build/qutebrowser/qutebrowser/.cache - $HOME/build/qutebrowser/qutebrowser/.cache
before_install:
# We need to do this so we pick up the system-wide python properly
- 'export PATH="/usr/bin:$PATH"'
install: install:
- bash scripts/dev/ci/travis_install.sh - bash scripts/dev/ci/travis_install.sh
- ulimit -c unlimited - ulimit -c unlimited

View File

@ -60,7 +60,7 @@ brew_install() {
pip_install() { pip_install() {
# this uses python2 # this uses python2
travis_retry sudo -H python -m pip install "$@" travis_retry python -m pip install "$@"
} }
npm_install() { npm_install() {
@ -124,22 +124,22 @@ case $TESTENV in
check_pyqt check_pyqt
;; ;;
py3*-pyqt*) py3*-pyqt*)
apt_install xvfb geoclue gdb apport #apt_install xvfb geoclue gdb apport
;; ;;
pylint|vulture) pylint|vulture)
apt_install $pyqt_pkgs libpython3.4-dev #apt_install $pyqt_pkgs libpython3.4-dev
check_pyqt check_pyqt
;; ;;
flake8) flake8)
apt_install libpython3.4-dev #apt_install libpython3.4-dev
;; ;;
docs) docs)
apt_install $pyqt_pkgs asciidoc libpython3.4-dev #apt_install $pyqt_pkgs asciidoc libpython3.4-dev
asciidoc --version asciidoc --version
check_pyqt check_pyqt
;; ;;
misc) misc)
apt_install libpython3.4-dev #apt_install libpython3.4-dev
;; ;;
pyroma|check-manifest) pyroma|check-manifest)
;; ;;