From b62e8e7ab22a311dd59a0a32a6f3d947c4de9e63 Mon Sep 17 00:00:00 2001 From: Scott Beddall <45376673+scbedd@users.noreply.github.com> Date: Thu, 16 Mar 2023 17:11:05 -0700 Subject: [PATCH] Pin newest `setuptools` wherever we use it (#29410) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 <39780829+mccoyp@users.noreply.github.com> --- eng/ci_tools.txt | 2 +- eng/conda_test_requirements.txt | 2 +- eng/pipelines/templates/jobs/tests-nightly-python.yml | 6 +++--- eng/regression_tools.txt | 2 +- eng/tox/tox.ini | 2 +- tools/azure-sdk-tools/ci_tools/versioning/requirements.txt | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/ci_tools.txt b/eng/ci_tools.txt index 702cb4997055..6a0e97ffb274 100644 --- a/eng/ci_tools.txt +++ b/eng/ci_tools.txt @@ -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 diff --git a/eng/conda_test_requirements.txt b/eng/conda_test_requirements.txt index c3d01d4b1075..fd1dc5b23c58 100644 --- a/eng/conda_test_requirements.txt +++ b/eng/conda_test_requirements.txt @@ -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 \ No newline at end of file diff --git a/eng/pipelines/templates/jobs/tests-nightly-python.yml b/eng/pipelines/templates/jobs/tests-nightly-python.yml index 91658cae66b5..ed6406412cd4 100644 --- a/eng/pipelines/templates/jobs/tests-nightly-python.yml +++ b/eng/pipelines/templates/jobs/tests-nightly-python.yml @@ -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 @@ -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 @@ -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) diff --git a/eng/regression_tools.txt b/eng/regression_tools.txt index 87cea579a85b..fc9756657305 100644 --- a/eng/regression_tools.txt +++ b/eng/regression_tools.txt @@ -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 diff --git a/eng/tox/tox.ini b/eng/tox/tox.ini index d9e410a387bf..a8c438310d15 100644 --- a/eng/tox/tox.ini +++ b/eng/tox/tox.ini @@ -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 diff --git a/tools/azure-sdk-tools/ci_tools/versioning/requirements.txt b/tools/azure-sdk-tools/ci_tools/versioning/requirements.txt index bdfffa4459d0..a5b557a29095 100644 --- a/tools/azure-sdk-tools/ci_tools/versioning/requirements.txt +++ b/tools/azure-sdk-tools/ci_tools/versioning/requirements.txt @@ -1,4 +1,4 @@ packaging==19.2 pyparsing==2.4.5 six==1.13.0 -setuptools==44.1.1 \ No newline at end of file +setuptools==67.6.0 \ No newline at end of file