Skip to content

Commit

Permalink
Set setuptools version to <45 for Python2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
RobinD42 committed Jan 22, 2020
1 parent 57df21f commit 733c11f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .azure/ci-linux-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .azure/ci-macos-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .azure/ci-windows-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 3 additions & 1 deletion requirements/devel.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 733c11f

Please sign in to comment.