Skip to content

Commit 4ea9cbd

Browse files
authored
Update setuptools (#8821)
1 parent 0ed43fb commit 4ea9cbd

File tree

3 files changed

+22
-15
lines changed

3 files changed

+22
-15
lines changed

requirements-dev-lock.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,23 +75,23 @@ coverage[toml]==7.2.7 \
7575
# via
7676
# -r requirements-dev.txt
7777
# pytest-cov
78-
exceptiongroup==1.1.3 \
79-
--hash=sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9 \
80-
--hash=sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3
78+
exceptiongroup==1.2.2 \
79+
--hash=sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b \
80+
--hash=sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc
8181
# via pytest
82-
iniconfig==1.1.1 \
83-
--hash=sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3 \
84-
--hash=sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32
82+
iniconfig==2.0.0 \
83+
--hash=sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3 \
84+
--hash=sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374
8585
# via pytest
86-
packaging==23.2 \
87-
--hash=sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5 \
88-
--hash=sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7
86+
packaging==24.1 \
87+
--hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \
88+
--hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
8989
# via
9090
# -r requirements-dev.txt
9191
# pytest
92-
pluggy==1.4.0 \
93-
--hash=sha256:7db9f7b503d67d1c5b95f59773ebb58a8c1c288129a88665838012cfb07b8981 \
94-
--hash=sha256:8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be
92+
pluggy==1.5.0 \
93+
--hash=sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 \
94+
--hash=sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669
9595
# via pytest
9696
pytest==8.1.1 \
9797
--hash=sha256:2a8386cfc11fa9d2c50ee7b2a57e7d898ef90470a7a34c4b949ff59662bb78b7 \

requirements-dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
wheel==0.43.0
22
coverage==7.2.7
3-
setuptools==67.8.0;python_version>="3.12"
3+
setuptools==71.1.0;python_version>="3.12"
44

55
# Pytest specific deps
66
pytest==8.1.1
@@ -9,4 +9,4 @@ atomicwrites>=1.0 # Windows requirement
99
colorama>0.3.0 # Windows requirement
1010

1111
# Dependency test specific deps
12-
packaging==23.2
12+
packaging==24.1

scripts/ci/install-dev-deps

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ def run(command):
2727
if __name__ == "__main__":
2828
with cd(REPO_ROOT):
2929
if sys.version_info[:2] >= (3, 12):
30-
run("pip install setuptools==67.8.0")
30+
# Python 3.12+ no longer includes setuptools by default.
31+
32+
# Setuptools 71+ now prefers already installed versions
33+
# of packaging _and_ broke the API for packaging<22.0.
34+
# We'll pin to match what's in requirements-dev.txt.
35+
run(
36+
"pip install setuptools==71.1.0 packaging==24.1"
37+
)
3138

3239
run("pip install -r requirements-dev-lock.txt")

0 commit comments

Comments
 (0)