Skip to content

Commit 4487087

Browse files
authored
Cleanup Setuptools (Azure#37035)
* remove a bunch of setuptools pins in favor of the single generic. this is only relevant to setuptools, a greater cleanup along with some CG updates should also be carried out
1 parent 6959f31 commit 4487087

File tree

12 files changed

+16
-23
lines changed

12 files changed

+16
-23
lines changed

eng/ci_tools.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# requirements leveraged by ci tools
2-
setuptools==69.2.0; python_version >= '3.5'
2+
setuptools==72.2.0
33
virtualenv==20.25.1
44
wheel==0.43.0
55
packaging==23.1

eng/conda_test_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ trio
88
typing_extensions>=3.7.2
99
cryptography
1010
adal
11-
setuptools==69.2.0; python_version >= '3.5'
11+
setuptools==72.2.0
1212
pytest-asyncio==0.12.0
1313
-e sdk/core/azure-core/tests/testserver_tests/coretestserver
1414
azure-mgmt-storage

eng/pipelines/generate-all-docs.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
variables:
1010
skipComponentGovernanceDetection: true
11-
11+
1212
timeoutInMinutes: 120
1313

1414
pool:
@@ -21,7 +21,6 @@ jobs:
2121
versionSpec: '$(PythonVersion)'
2222

2323
- script: |
24-
python -m pip install setuptools==58.3.0
2524
python -m pip install -r eng/ci_tools.txt
2625
displayName: 'Prep Environment'
2726
@@ -35,5 +34,5 @@ jobs:
3534
3635
- task: PublishPipelineArtifact@0
3736
inputs:
38-
artifactName: 'documentation'
37+
artifactName: 'documentation'
3938
targetPath: '$(Build.SourcesDirectory)/_docs'

eng/pipelines/templates/jobs/tests-nightly-python.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
- template: /eng/pipelines/templates/steps/use-python-version.yml
1919
parameters:
2020
versionSpec: $(PythonVersion)
21-
21+
2222
- script: |
2323
python -m pip freeze
2424
python -m pip --version
25-
python -m pip install setuptools==58.3.0 wheel==0.37.0 tox==4.5.0 packaging==23.1 requests
25+
python -m pip install setuptools==72.2.0 wheel==0.37.0 tox==4.5.0 packaging==23.1 requests
2626
python -m pip install $(Build.SourcesDirectory)/tools/azure-sdk-tools[build]
2727
displayName: Install Dependencies
2828
@@ -67,7 +67,7 @@ jobs:
6767
sudo apt-get install build-essential -y
6868
python -m pip freeze
6969
python -m pip --version
70-
python -m pip install setuptools==58.3.0 wheel==0.37.0 tox==4.5.0 packaging==23.1 requests
70+
python -m pip install setuptools==72.2.0 wheel==0.37.0 tox==4.5.0 packaging==23.1 requests
7171
python -m pip install $(Build.SourcesDirectory)/tools/azure-sdk-tools[build]
7272
displayName: Install Dependencies
7373
@@ -130,7 +130,7 @@ jobs:
130130
export PATH=~/.local/bin:$PATH
131131
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
132132
python3 get-pip.py
133-
python3 -m pip install setuptools==67.6.0 wheel
133+
python3 -m pip install setuptools==72.2.0 wheel
134134
python3 -m pip install tox packaging twine beautifulsoup4
135135
python3 --version
136136
cd $(Build.SourcesDirectory)

eng/pipelines/templates/stages/python-analyze-weekly-standalone.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ extends:
3838
inputs:
3939
versionSpec: '3.8'
4040
- script: |
41-
python -m pip install setuptools==58.3.0
4241
python -m pip install -r eng/ci_tools.txt
4342
displayName: 'Prep Environment'
4443
- task: PythonScript@0
@@ -100,7 +99,6 @@ extends:
10099
versionSpec: '3.11'
101100

102101
- script: |
103-
python -m pip install setuptools==58.3.0
104102
python -m pip install -r eng/ci_tools.txt
105103
displayName: 'Prep Environment'
106104

eng/pipelines/templates/stages/python-analyze-weekly.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ stages:
2222

2323
variables:
2424
- name: PythonVersion
25-
value: '3.8'
25+
value: '3.8'
2626

2727
pool:
2828
name: $(LINUXPOOL)
@@ -35,7 +35,6 @@ stages:
3535
inputs:
3636
versionSpec: '3.8'
3737
- script: |
38-
python -m pip install setuptools==58.3.0
3938
python -m pip install -r eng/ci_tools.txt
4039
displayName: 'Prep Environment'
4140
- task: PythonScript@0
@@ -97,7 +96,6 @@ stages:
9796
versionSpec: '3.11'
9897

9998
- script: |
100-
python -m pip install setuptools==58.3.0
10199
python -m pip install -r eng/ci_tools.txt
102100
displayName: 'Prep Environment'
103101
@@ -108,7 +106,7 @@ stages:
108106
scriptPath: 'scripts/devops_tasks/dispatch_tox.py'
109107
arguments: >-
110108
${{ parameters.BuildTargetingString }}
111-
--service="${{ parameters.ServiceDirectory }}"
109+
--service="${{ parameters.ServiceDirectory }}"
112110
--toxenv="sphinx"
113111
env:
114112
GH_TOKEN: $(azuresdk-github-pat)

eng/pipelines/templates/steps/analyze_dependency.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ steps:
99
versionSpec: '$(PythonVersion)'
1010

1111
- pwsh: |
12-
python -m pip install setuptools==58.3.0
1312
python -m pip install -r eng/ci_tools.txt
1413
displayName: 'Install Python Tools'
1514
condition: succeededOrFailed()

eng/pipelines/templates/steps/build-extended-artifacts.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ steps:
4545
- template: /eng/pipelines/templates/steps/use-venv.yml
4646

4747
- script: |
48-
python -m pip install setuptools==58.3.0
4948
python -m pip install -r eng/ci_tools.txt
5049
displayName: 'Prep Environment'
5150

eng/pipelines/templates/steps/smoke-test-steps.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ steps:
3232
$packages = Get-ChildItem "$(Pipeline.Workspace)/${{ parameters.ArtifactName }}/${{ parameters.Artifact.name }}/*.tar.gz"
3333
Write-Host "Artifacts found:"
3434
$artifacts = $packages | ForEach-Object {
35-
if ($_.Name -match "([a-zA-Z\-]+)\-(.*).tar.gz") {
35+
if ($_.Name -match "([a-zA-Z\-_]+)\-(.*).tar.gz") {
3636
Write-Host "$($matches[1]): $($matches[2])"
37-
return @{ "name" = $matches[1]; "version" = $matches[2] }
37+
return @{ "name" = $matches[1].ToString().Replace("_", "-"); "version" = $matches[2] }
3838
}
3939
}
4040
if ($artifacts.name -notcontains "${{parameters.Artifact.name}}") {
@@ -58,7 +58,7 @@ steps:
5858
displayName: Override requirements with pipeline build artifact versions
5959
6060
# Retry for pip install due to delay in package availability after publish
61-
# The package is expected to be available for download/installation within 10 minutes
61+
# The package is expected to be available for download/installation within 10 minutes
6262
- pwsh: |
6363
$ErrorActionPreference = "Continue"
6464
while ($retries++ -lt 15) {

eng/regression_tools.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# requirements leveraged by ci tools
2-
setuptools==69.2.0; python_version >= '3.5'
2+
setuptools==72.2.0
33
virtualenv==20.23.0
44
wheel==0.43.0
55
Jinja2==3.1.2

0 commit comments

Comments
 (0)