From d220d7ba56e1559b2b2fb7ff7dabf62202466eb7 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 17 Oct 2019 19:30:23 +0800 Subject: =?UTF-8?q?Don=E2=80=99t=20downgrade=20pip=20on=20windows=20wheel?= =?UTF-8?q?=20building=20(#5015)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Don’t downgrade pip on windows wheel building * Conditionally install enum34 * Syntax --- .azure-pipelines/wheel-builder.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to '.azure-pipelines') diff --git a/.azure-pipelines/wheel-builder.yml b/.azure-pipelines/wheel-builder.yml index a93ec836..d07967da 100644 --- a/.azure-pipelines/wheel-builder.yml +++ b/.azure-pipelines/wheel-builder.yml @@ -106,7 +106,7 @@ jobs: displayName: Create virtualenv - script: .venv/bin/pip install -U pip==10.0.1 displayName: Downgrade pip lol - - script: .venv/bin/pip install cffi six ipaddress enum34 + - script: .venv/bin/pip install cffi six ipaddress "enum34; python_version < '3'" displayName: Install our Python dependencies - script: | set -e @@ -215,9 +215,8 @@ jobs: OPENSSL_DIR: 'OpenSSL-Win64-2015' WINDOWS_ARCH: 'x86_64' steps: - - script: '"C:/Python%PYTHON_VERSION%/python.exe" -m pip install -U pip==10.0.1' - displayName: Downgrade pip lol - - script: '"C:/Python%PYTHON_VERSION%/Scripts/pip" install wheel cffi six ipaddress enum34' + - script: | + "C:/Python%PYTHON_VERSION%/Scripts/pip" install cffi six ipaddress "enum34; python_version < '3'" displayName: Install wheel and our Python dependencies - script: | set INCLUDE=C:/%OPENSSL_DIR%/include;%INCLUDE% -- cgit v1.2.3