Skip to content

Commit

Permalink
Pin newest setuptools wherever we use it (#29410)
Browse files Browse the repository at this point in the history
* pin latest setuptools such that it won't be uninstalled during combined install
* Update eng/pipelines/templates/jobs/tests-nightly-python.yml

Co-authored-by: McCoy Patiño <[email protected]>
  • Loading branch information
scbedd and mccoyp authored Mar 17, 2023
1 parent 953df9d commit b62e8e7
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion eng/ci_tools.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# requirements leveraged by ci tools
cryptography<4
setuptools==44.1.0; python_version == '2.7'
setuptools==46.4.0; python_version >= '3.5'
setuptools==67.6.0; python_version >= '3.5'
virtualenv==20.13.2
wheel==0.37.0
Jinja2==2.11.2
Expand Down
2 changes: 1 addition & 1 deletion eng/conda_test_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ trio
typing_extensions>=3.7.2
cryptography
adal
setuptools==46.4.0
setuptools==67.6.0; python_version >= '3.5'
pytest-asyncio==0.12.0
-e sdk/core/azure-core/tests/testserver_tests/coretestserver
azure-mgmt-storage
6 changes: 3 additions & 3 deletions eng/pipelines/templates/jobs/tests-nightly-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- script: |
python -m pip freeze
python -m pip --version
python -m pip install setuptools==56.0.0 wheel==0.37.0 tox==3.24.3 tox-monorepo==0.1.2 packaging==21.0 requests
python -m pip install setuptools==67.6.0 wheel==0.37.0 tox==3.24.3 tox-monorepo==0.1.2 packaging==21.0 requests
python -m pip install $(Build.SourcesDirectory)/tools/azure-sdk-tools[build]
displayName: Install Dependencies
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
sudo apt-get install build-essential -y
python -m pip freeze
python -m pip --version
python -m pip install setuptools==56.0.0 wheel==0.37.0 tox==3.24.3 tox-monorepo==0.1.2 packaging==21.0 requests
python -m pip install setuptools==67.6.0 wheel==0.37.0 tox==3.24.3 tox-monorepo==0.1.2 packaging==21.0 requests
python -m pip install $(Build.SourcesDirectory)/tools/azure-sdk-tools[build]
displayName: Install Dependencies
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
export PATH=~/.local/bin:$PATH
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
python3 get-pip.py
python3 -m pip install setuptools wheel
python3 -m pip install setuptools==67.6.0 wheel
python3 -m pip install tox tox-monorepo packaging twine codecov beautifulsoup4
python3 --version
cd $(Build.SourcesDirectory)
Expand Down
2 changes: 1 addition & 1 deletion eng/regression_tools.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# requirements leveraged by ci tools
cryptography==3.3.2
setuptools==44.1.0; python_version == '2.7'
setuptools==46.4.0; python_version >= '3.5'
setuptools==67.6.0; python_version >= '3.5'
virtualenv==20.0.23
wheel==0.34.2
Jinja2==2.11.2
Expand Down
2 changes: 1 addition & 1 deletion eng/tox/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ setenv =
PROXY_URL=http://localhost:5000
VIRTUALENV_WHEEL=0.37.0
VIRTUALENV_PIP=20.3.3
VIRTUALENV_SETUPTOOLS=59.6.0
VIRTUALENV_SETUPTOOLS=67.6.0
deps = {[base]deps}
changedir = {toxinidir}
install_command = python -m pip install {opts} {packages} --cache-dir {toxinidir}/../.tox_pip_cache_{envname} --ignore-installed
Expand Down
2 changes: 1 addition & 1 deletion tools/azure-sdk-tools/ci_tools/versioning/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
packaging==19.2
pyparsing==2.4.5
six==1.13.0
setuptools==44.1.1
setuptools==67.6.0

0 comments on commit b62e8e7

Please sign in to comment.