Skip to content

Commit bf34b1f

Browse files
authored
Bump CI Requirements (Azure#40109)
* Bump all pinned CI requirements except for cibuildwheel and pip to the newest possible versions of themselves. * The following packages have been bumped to their max version supporting python3.8. We will have to drop support to bump these any further: * setuptools==75.3.2 * pyproject-api==1.8 * importlib-metadata==8.5.0 * pytest-cov==5.0.0 * readme_renderer==43.0 * urllib3==2.2.3 * pytest-asyncio==0.24.0
1 parent 46b49a9 commit bf34b1f

File tree

7 files changed

+43
-46
lines changed

7 files changed

+43
-46
lines changed

.github/workflows/azure-sdk-tools.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,20 @@ on:
77
paths:
88
- "tools/azure-sdk-tools/**"
99

10-
1110
jobs:
1211
build-and-test:
1312
runs-on: ubuntu-latest
1413
steps:
15-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
1614
- uses: actions/checkout@v2
1715

18-
# todo before checkin: multiplex to include running tests on py38 -> 312
1916
- name: Set up Python 3.11
2017
uses: actions/setup-python@v4
2118
with:
2219
python-version: 3.11
2320

2421
- name: Install azure-sdk-tools
2522
run: |
26-
python -m pip install -e tools/azure-sdk-tools[build,ghtools]
23+
python -m pip install -e tools/azure-sdk-tools[build,ghtools,conda]
2724
python -m pip freeze
2825
shell: bash
2926

eng/ci_tools.txt

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
11
# requirements leveraged by ci tools
2-
setuptools==74.1.3
3-
virtualenv==20.25.1
4-
wheel==0.43.0
5-
packaging==23.1
6-
tox==4.5.0
7-
pathlib2==2.3.5
2+
# setuptools 75.3.2 is the last version of setuptools that supports python 3.8.
3+
# it can be bumped further only when py3.8 is completely eliminated from CI
4+
setuptools==75.3.2
5+
virtualenv==20.29.3
6+
wheel==0.45.1
7+
packaging==24.2
8+
tox==4.24.2
9+
pathlib2==2.3.7.post1
810
doc-warden==0.7.2
9-
beautifulsoup4==4.9.1
10-
pkginfo==1.9.6
11+
beautifulsoup4==4.13.3
12+
pkginfo==1.12.1.2
1113
pip==24.0
12-
typing-extensions<=4.6.3
13-
pyproject-api<1.6
14+
typing-extensions==4.12.2
15+
pyproject-api==1.8.0
1416
cibuildwheel==2.16.5
15-
importlib-metadata==8.0.0
17+
importlib-metadata==8.5.0
1618

1719
# requirements leveraged for testing
18-
pytest==7.3.1
19-
pytest-cov==4.0.0
20-
coverage==7.2.5
20+
pytest==8.3.5
21+
pytest-cov==5.0.0
22+
coverage==7.6.1
2123

2224
# locking packages defined as deps from azure-sdk-tools
23-
Jinja2==3.1.2
24-
json-delta==2.0
25-
readme_renderer==42.0;
25+
Jinja2==3.1.6
26+
json-delta==2.0.2
27+
readme_renderer==43.0
2628
python-dotenv==1.0.1
27-
pyyaml==6.0.1
28-
urllib3==2.0.7
29-
six==1.16.0
29+
pyyaml==6.0.2
30+
urllib3==2.2.3
31+
six==1.17.0
3032

3133
# local dev packages
3234
./tools/azure-sdk-tools[build]

eng/conda_test_requirements.txt

Lines changed: 2 additions & 2 deletions
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==74.1.3
12-
pytest-asyncio==0.12.0
11+
setuptools==75.3.2
12+
pytest-asyncio==0.25.3
1313
-e sdk/core/azure-core/tests/testserver_tests/coretestserver
1414
azure-mgmt-storage

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ steps:
153153
}
154154
Write-Host (Get-Command python).Source
155155
156-
python -m pip install coverage==7.2.5
157156
python scripts/devops_tasks/create_coverage.py
158157
displayName: Report Coverage
159158
condition: and(succeeded(), ${{ parameters.RunCoverage }})

eng/test_tools.txt

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
# requirements leveraged by ci for testing
2-
pytest==7.3.1
3-
pytest-asyncio==0.21.0
4-
pytest-cov==4.0.0
2+
pytest==8.3.5
3+
pytest-asyncio==0.24.0
4+
pytest-cov==5.0.0
55
pytest-custom-exit-code==0.3.0
66
pytest-xdist==3.2.1
7-
coverage==7.2.5
7+
coverage==7.6.1
88
bandit==1.6.2
9-
protobuf==3.17.3; python_version == '2.7'
10-
pyproject-api<1.6
9+
pyproject-api==1.8.0
1110

1211
# locking packages defined as deps from azure-sdk-tools
13-
Jinja2==3.1.2
14-
json-delta==2.0
15-
readme_renderer==42.0;
12+
Jinja2==3.1.6
13+
json-delta==2.0.2
14+
readme_renderer==43.0
1615
python-dotenv==1.0.1
17-
pyyaml==6.0.1
18-
urllib3==2.0.7
19-
six==1.16.0
16+
pyyaml==6.0.2
17+
urllib3==2.2.3
18+
six==1.17.0

eng/tox/tox.ini

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ deps =
4141

4242
[packaging]
4343
pkgs =
44-
wheel==0.43.0
45-
packaging==23.1
46-
urllib3==1.26.15
47-
tomli==2.0.1
44+
wheel==0.45.1
45+
packaging==24.2
46+
urllib3==2.2.3
47+
tomli==2.2.1
4848

4949
[pytest]
5050
ignore_args=--ignore=.tox --ignore=build --ignore=.eggs --ignore=samples
@@ -63,9 +63,9 @@ setenv =
6363
SPHINX_APIDOC_OPTIONS=members,undoc-members,inherited-members
6464
PIP_EXTRA_INDEX_URL=https://pypi.python.org/simple
6565
PROXY_URL=http://localhost:5000
66-
VIRTUALENV_WHEEL=0.37.0
66+
VIRTUALENV_WHEEL=0.45.1
6767
VIRTUALENV_PIP=24.0
68-
VIRTUALENV_SETUPTOOLS=67.6.0
68+
VIRTUALENV_SETUPTOOLS=75.3.2
6969
deps = {[base]deps}
7070
install_command = python -m pip install {opts} {packages} --cache-dir {tox_root}/../.tox_pip_cache_{envname}
7171
commands =

tools/azure-sdk-tools/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
},
5656
extras_require={
5757
":python_version>='3.5'": ["pytest-asyncio>=0.9.0"],
58-
":python_version<'3.11'": ["tomli==2.0.1"],
58+
":python_version<'3.11'": ["tomli"],
5959
"build": ["six", "setuptools", "pyparsing", "certifi", "cibuildwheel", "pkginfo", "build"],
6060
"conda": ["beautifulsoup4"],
6161
"systemperf": ["aiohttp>=3.0", "requests>=2.0", "tornado==6.0.3", "httpx>=0.21", "azure-core"],

0 commit comments

Comments
 (0)