From a987b714de6504fc46416139db3014d2aba05d82 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 29 May 2016 15:14:42 +0200 Subject: [PATCH] appveyor: Install pip/tox from requirements files --- scripts/dev/ci/appveyor_install.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/dev/ci/appveyor_install.py b/scripts/dev/ci/appveyor_install.py index e78ac36dd..49c0fb7c4 100644 --- a/scripts/dev/ci/appveyor_install.py +++ b/scripts/dev/ci/appveyor_install.py @@ -43,6 +43,11 @@ def check_setup(executable): subprocess.check_call([executable, '--version']) +def pip_install(pkg): + subprocess.check_call([r'C:\Python34\python', '-m', 'pip', 'install', '-U', + pkg]) + + print("Getting PyQt5...") qt_version = '5.5.1' pyqt_version = '5.5.1' @@ -61,9 +66,8 @@ print("Installing PyQt5...") subprocess.check_call([r'C:\install-PyQt5.exe', '/S']) print("Installing pip/tox") -subprocess.check_call([r'C:\Python34\python', '-m', 'pip', 'install', '-U', - 'pip']) -subprocess.check_call([r'C:\Python34\Scripts\pip', 'install', '-U', 'tox']) +pip_install(r'scripts\dev\ci\requirements-pip.txt') +pip_install(r'scripts\dev\ci\requirements-tox.txt') print("Linking Python...") with open(r'C:\Windows\system32\python3.bat', 'w') as f: