From 733c11fdbc2f641b82ceb642c91669788f3e2330 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 22 Jan 2020 11:31:14 -0800 Subject: [PATCH] Set setuptools version to <45 for Python2.7 --- .azure/ci-linux-job.yml | 2 +- .azure/ci-macos-job.yml | 2 +- .azure/ci-windows-job.yml | 2 +- requirements/devel.txt | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.azure/ci-linux-job.yml b/.azure/ci-linux-job.yml index 4260ca62..43926cda 100644 --- a/.azure/ci-linux-job.yml +++ b/.azure/ci-linux-job.yml @@ -44,7 +44,7 @@ jobs: $PYTHON --version $MAKE_VENV source venv/bin/activate - python -m pip install -U pip setuptools wheel + python -m pip install -U pip "setuptools<45" wheel python -m pip install -r requirements.txt displayName: 'Install Python dependencies' diff --git a/.azure/ci-macos-job.yml b/.azure/ci-macos-job.yml index 91f4f8f4..b73fb757 100644 --- a/.azure/ci-macos-job.yml +++ b/.azure/ci-macos-job.yml @@ -40,7 +40,7 @@ jobs: - script: | curl -O https://bootstrap.pypa.io/get-pip.py $PYTHON get-pip.py - $PYTHON -m pip install -U setuptools wheel + $PYTHON -m pip install -U "setuptools<45" wheel $PYTHON -m pip install -r requirements.txt displayName: 'Install Python dependencies' diff --git a/.azure/ci-windows-job.yml b/.azure/ci-windows-job.yml index 72053dfd..d01cd6f4 100644 --- a/.azure/ci-windows-job.yml +++ b/.azure/ci-windows-job.yml @@ -53,7 +53,7 @@ jobs: - bash: | curl -O https://bootstrap.pypa.io/get-pip.py python get-pip.py - python -m pip install -U setuptools wheel + python -m pip install -U "setuptools<45" wheel python -m pip install -r requirements.txt displayName: 'Install Python dependencies' diff --git a/requirements/devel.txt b/requirements/devel.txt index 4a0577f3..73a9f9a7 100644 --- a/requirements/devel.txt +++ b/requirements/devel.txt @@ -1,7 +1,9 @@ # Python packages needed for building and testing wxPython Phoenix -r install.txt appdirs -setuptools +setuptools < 45 ; python_version < '3.0' +setuptools ; python_version >= '3.0' + wheel twine requests