Skip to content

Commit 1b00a0a

Browse files
ci: Only pin setuptools in relevant tests (#6467)
1 parent 5cdbd39 commit 1b00a0a

4 files changed

Lines changed: 12 additions & 1 deletion

File tree

requirements-testing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ responses
1313
pysocks
1414
socksio
1515
httpcore[http2]
16-
setuptools<81
16+
setuptools
1717
Brotli
1818
docker

scripts/populate_tox/config.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,8 @@
354354
"package": "pyramid",
355355
"deps": {
356356
"*": ["werkzeug<2.1.0"],
357+
# Pinned by library in https://github.com/Pylons/pyramid/commit/e239cb693b06e8d01c02dacd2a7b93e5d0a4d5ae
358+
"<2.1": ["setuptools<82"],
357359
},
358360
},
359361
"quart": {
@@ -373,6 +375,10 @@
373375
},
374376
"ray": {
375377
"package": "ray",
378+
"deps": {
379+
# Required for pkg_resources import prior to https://github.com/ray-project/ray/commit/7e9043c38d76412c310fcf6e3fff79cb55d481da
380+
"<2.10": ["setuptools<82"],
381+
},
376382
"python": {
377383
">0.0,<2.52.0": ">=3.9",
378384
">=2.52.0": ">=3.10",

scripts/populate_tox/tox.jinja

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ deps =
9898
{py3.6,py3.7}-gevent: pytest<7.0.0
9999
{py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest
100100
gevent: pytest-asyncio
101+
gevent: setuptools<82
101102
{py3.10,py3.11}-gevent: zope.event<5.0.0
102103
{py3.10,py3.11}-gevent: zope.interface<8.0
103104

tox.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,7 @@ deps =
419419
{py3.6,py3.7}-gevent: pytest<7.0.0
420420
{py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest
421421
gevent: pytest-asyncio
422+
gevent: setuptools<82
422423
{py3.10,py3.11}-gevent: zope.event<5.0.0
423424
{py3.10,py3.11}-gevent: zope.interface<8.0
424425

@@ -762,6 +763,7 @@ deps =
762763
ray-v2.7.2: ray==2.7.2
763764
ray-v2.55.1: ray==2.55.1
764765
ray-latest: ray==2.55.1
766+
ray-v2.7.2: setuptools<82
765767

766768
rq-v0.6.0: rq==0.6.0
767769
rq-v0.13.0: rq==0.13.0
@@ -902,6 +904,8 @@ deps =
902904
pyramid-v2.1: pyramid==2.1
903905
pyramid-latest: pyramid==2.1
904906
pyramid: werkzeug<2.1.0
907+
pyramid-v1.8.6: setuptools<82
908+
pyramid-v1.10.8: setuptools<82
905909

906910
quart-v0.16.3: quart==0.16.3
907911
quart-v0.20.0: quart==0.20.0

0 commit comments

Comments
 (0)