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

Fix pip installs on CI

Browse Source
This commit is contained in:
Florian Bruhin 2016-11-03 08:30:21 +01:00
parent 75a3b9ab1b
commit 55d8239671
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/dev/ci/appveyor_install.py
View File

@ -62,6 +62,7 @@ print("Installing PyQt5...")
subprocess.check_call([r'C:\install-PyQt5.exe', '/S']) subprocess.check_call([r'C:\install-PyQt5.exe', '/S'])
print("Installing tox") print("Installing tox")
pip_install('pip')
pip_install(r'-rmisc\requirements\requirements-tox.txt') pip_install(r'-rmisc\requirements\requirements-tox.txt')
print("Linking Python...") print("Linking Python...")

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

@ -54,7 +54,7 @@ brew_install() {
pip_install() { pip_install() {
# this uses python2 # this uses python2
travis_retry sudo -H python -m pip install -r misc/requirements/requirements-$1.txt travis_retry sudo -H python -m pip install $1
} }
npm_install() { npm_install() {
@ -95,7 +95,7 @@ elif [[ $TRAVIS_OS_NAME == osx ]]; then
brew --version brew --version
brew_install python3 qt5 pyqt5 brew_install python3 qt5 pyqt5
pip_install tox pip_install -r misc/requirements/requirements-tox.txt
pip --version pip --version
tox --version tox --version
check_pyqt check_pyqt
@ -105,14 +105,14 @@ fi
pyqt_pkgs="python3-pyqt5 python3-pyqt5.qtwebkit" pyqt_pkgs="python3-pyqt5 python3-pyqt5.qtwebkit"
pip_install pip pip_install pip
pip_install tox pip_install -r misc/requirements/requirements-tox.txt
pip --version pip --version
tox --version tox --version
case $TESTENV in case $TESTENV in
py34-cov) py34-cov)
pip_install codecov pip_install -r misc/requirements/requirements-codecov.txt
apt_install xvfb $pyqt_pkgs libpython3.4-dev apt_install xvfb $pyqt_pkgs libpython3.4-dev
check_pyqt check_pyqt
;; ;;