diff --git a/scripts/dev/ci/appveyor_install.py b/scripts/dev/ci/appveyor_install.py index 62400e04a..2c04304d5 100644 --- a/scripts/dev/ci/appveyor_install.py +++ b/scripts/dev/ci/appveyor_install.py @@ -62,6 +62,7 @@ print("Installing PyQt5...") subprocess.check_call([r'C:\install-PyQt5.exe', '/S']) print("Installing tox") +pip_install('pip') pip_install(r'-rmisc\requirements\requirements-tox.txt') print("Linking Python...") diff --git a/scripts/dev/ci/travis_install.sh b/scripts/dev/ci/travis_install.sh index 4edb587a4..b6f1f7d6d 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 misc/requirements/requirements-$1.txt + travis_retry sudo -H python -m pip install $1 } npm_install() { @@ -95,7 +95,7 @@ elif [[ $TRAVIS_OS_NAME == osx ]]; then brew --version brew_install python3 qt5 pyqt5 - pip_install tox + pip_install -r misc/requirements/requirements-tox.txt pip --version tox --version check_pyqt @@ -105,14 +105,14 @@ fi pyqt_pkgs="python3-pyqt5 python3-pyqt5.qtwebkit" pip_install pip -pip_install tox +pip_install -r misc/requirements/requirements-tox.txt pip --version tox --version case $TESTENV in py34-cov) - pip_install codecov + pip_install -r misc/requirements/requirements-codecov.txt apt_install xvfb $pyqt_pkgs libpython3.4-dev check_pyqt ;;