Skip to content

Commit 8b6e24d

Browse files
authored
Address failing main -- trim some deps (#36346)
* trim markupsafe, wrapt, and pyopenssl from azure-sdk-tools install set, add pyopenssl to keyvault certificates dev reqs * update utilized versions of setuptools and wheel
1 parent 550ee55 commit 8b6e24d

File tree

12 files changed

+20
-33
lines changed

12 files changed

+20
-33
lines changed

eng/ci_tools.txt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
# requirements leveraged by ci tools
2-
setuptools==67.6.0; python_version >= '3.5'
2+
setuptools==70.2.0; python_version >= '3.5'
33
virtualenv==20.24.3
4-
wheel==0.37.0
4+
wheel==0.43.0
55
packaging==23.1
66
tox==4.5.0
77
pathlib2==2.3.5
88
doc-warden==0.7.2
99
beautifulsoup4==4.9.1
1010
pkginfo==1.9.6
1111
pip==24.0
12-
wrapt==1.12.1; python_version <= '3.10'
13-
wrapt==1.15.0; python_version >= '3.11'
1412
typing-extensions<=4.6.3
1513
pyproject-api<1.6
1614
cibuildwheel==2.16.5
15+
importlib-metadata==8.0.0
1716

1817
# requirements leveraged for testing
1918
pytest==7.3.1
@@ -22,14 +21,11 @@ coverage==7.2.5
2221

2322
# locking packages defined as deps from azure-sdk-tools
2423
Jinja2==3.1.2
25-
MarkupSafe==2.1.3
2624
json-delta==2.0
2725
readme_renderer==42.0;
28-
pyopenssl==24.0.0
29-
python-dotenv==1.0.0; python_version > '3.7'
26+
python-dotenv==1.0.1
3027
pyyaml==6.0.1
3128
urllib3==2.0.7
32-
ConfigArgParse==1.2.3
3329
six==1.16.0
3430

3531
# local dev packages

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==67.6.0; python_version >= '3.5'
11+
setuptools==70.2.0; python_version >= '3.5'
1212
pytest-asyncio==0.12.0
1313
-e sdk/core/azure-core/tests/testserver_tests/coretestserver
1414
azure-mgmt-storage

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ steps:
4040
ServiceDirectory: ${{ parameters.ServiceDirectory }}
4141

4242
- pwsh: |
43+
Write-Host (Get-Command python).Source
4344
$ErrorActionPreference = 'Stop'
4445
$PSNativeCommandUseErrorActionPreference = $true
4546
python -m pip freeze
4647
python -m pip install pip==23.2.1
47-
python -m pip install setuptools==67.6.0
48-
python -m pip install wheel==0.37.0
48+
python -m pip install wheel==0.43.0 --force-reinstall
49+
python -m pip install setuptools==70.2.0 --force-reinstall
4950
python -m pip install -r eng/ci_tools.txt
5051
pip --version
5152
pip freeze
@@ -152,7 +153,7 @@ steps:
152153
Write-Host "Last exit code: $LASTEXITCODE";
153154
exit $LASTEXITCODE;
154155
155-
- ${{ else }}:
156+
- ${{ else }}:
156157
- task: PythonScript@0
157158
displayName: 'Test Samples'
158159
condition: and(succeeded(), eq(variables['TestSamples'], 'true'))

eng/regression_test_tools.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,11 @@ typing-extensions<=4.6.3
1717
pytoml==0.1.21
1818
readme-renderer[md]==25.0
1919
json-delta==2.0
20-
ConfigArgParse==1.2.3
20+
ConfigArgParse==1.7
2121
six==1.14.0
2222
pyyaml==5.4.1
2323
packaging==23.1
2424
Jinja2==3.1.2
25-
MarkupSafe==2.1.3
26-
wrapt==1.12.1; python_version <= '3.10'
27-
wrapt==1.14.1; python_version >= '3.11'
2825

2926
# Locking pylint and required packages
3027
pylint==1.8.4; python_version < '3.4'

eng/regression_tools.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# requirements leveraged by ci tools
2-
setuptools==67.6.0; python_version >= '3.5'
2+
setuptools==70.2.0; python_version >= '3.5'
33
virtualenv==20.23.0
4-
wheel==0.37.0
4+
wheel==0.43.0
55
Jinja2==3.1.2
66
packaging==23.1
77
tox==4.5.0
@@ -10,15 +10,12 @@ doc-warden==0.7.2
1010
beautifulsoup4==4.9.1
1111
pkginfo==1.5.0.1
1212
pip==20.3.3
13-
wrapt==1.12.1; python_version <= '3.10'
14-
wrapt==1.14.1; python_version >= '3.11'
15-
MarkupSafe==2.1.3
1613
typing-extensions<=4.6.3
1714

1815
# locking packages defined as deps from azure-sdk-tools
1916
pytoml==0.1.21
2017
json-delta==2.0
21-
ConfigArgParse==1.2.3
18+
ConfigArgParse==1.7
2219
six==1.14.0
2320
pyyaml==5.4.1
2421
pytest==7.3.1

eng/test_tools.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@ pyproject-api<1.6
1111

1212
# locking packages defined as deps from azure-sdk-tools
1313
Jinja2==3.1.2
14-
MarkupSafe==2.1.3
1514
json-delta==2.0
1615
readme_renderer==42.0;
17-
pyopenssl==24.0.0
18-
python-dotenv==1.0.0; python_version > '3.7'
16+
python-dotenv==1.0.1
1917
pyyaml==6.0.1
2018
urllib3==2.0.7
21-
ConfigArgParse==1.2.3
2219
six==1.16.0

eng/tox/tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ deps =
4141

4242
[packaging]
4343
pkgs =
44-
wheel==0.40.0
44+
wheel==0.43.0
4545
packaging==23.1
4646
urllib3==1.26.15
4747
tomli==2.0.1

scripts/devops_tasks/dispatch_tox.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import argparse
1313
import os
14+
import sys
1415
import logging
1516
from tox_harness import prep_and_run_tox
1617
from ci_tools.functions import discover_targeted_packages
@@ -135,4 +136,5 @@
135136
logging.info("No packages collected. Exit 0.")
136137
exit(0)
137138

139+
logging.info(f"Executing prep_and_run_tox with the executable {sys.executable}.")
138140
prep_and_run_tox(targeted_packages, args)

sdk/core/azure-core/tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def start_testserver():
8787
if not is_port_available(port):
8888
return child_process
8989
time.sleep(1)
90-
raise ValueError("Didn't start!")
90+
raise ValueError(f"Didn't start!")
9191

9292

9393
def terminate_testserver(process):

sdk/keyvault/azure-keyvault-certificates/dev_requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
../../nspkg/azure-keyvault-nspkg
55
aiohttp>=3.0
66
parameterized>=0.7.3
7-
python-dateutil>=2.8.0
7+
python-dateutil>=2.8.0
8+
pyopenssl

0 commit comments

Comments
 (0)