Skip to content

Commit 79639f3

Browse files
xrmxxrmx
authored
Fix CI after setuptools 82.0.0 (#2550)
* Stop testing against Twisted 15 Since it requires the now removed from setuptools pkg_resources and last release is more than 10 years old. * cassandra: stick with older setuptools 81.0.0 Since 82.0.0 removed pkg_resources that is used in current cassandra-driver. * tornado: stick with older setuptools 81.0.0 Since 82.0.0 removed pkg_resources that is used in pytest-tornado. * tests: don't install a setuptools newer than 81.x Some of the ancient package versions we are testing are depending on pkg_resources that got dropped in setuptools 82. * Bump tested cassandra-driver baseline to 3.24 That is the last cassandra-driver release of 2020 * Skip cassandra 3.24 on Python 3.9 * Apply suggestion from @xrmx
1 parent c75886c commit 79639f3

10 files changed

Lines changed: 18 additions & 24 deletions

‎.ci/.matrix_exclude.yml‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ exclude:
5959
FRAMEWORK: flask-3.0
6060
- VERSION: python-3.14
6161
FRAMEWORK: flask-1.0
62+
# Python 3.9
63+
- VERSION: python-3.9
64+
FRAMEWORK: cassandra-3.24
6265
# Python 3.10 removed a bunch of classes from collections, now in collections.abc
6366
- VERSION: python-3.10
6467
FRAMEWORK: django-1.11
@@ -95,7 +98,7 @@ exclude:
9598
- VERSION: python-3.10
9699
FRAMEWORK: aiohttp-4.0
97100
- VERSION: python-3.10
98-
FRAMEWORK: cassandra-3.4
101+
FRAMEWORK: cassandra-3.24
99102
- VERSION: python-3.10
100103
FRAMEWORK: pymongo-3.5
101104
- VERSION: python-3.11
@@ -111,7 +114,7 @@ exclude:
111114
- VERSION: python-3.11
112115
FRAMEWORK: aiohttp-4.0
113116
- VERSION: python-3.11
114-
FRAMEWORK: cassandra-3.4
117+
FRAMEWORK: cassandra-3.24
115118
- VERSION: python-3.11
116119
FRAMEWORK: pymongo-3.5
117120
- VERSION: python-3.12
@@ -127,7 +130,7 @@ exclude:
127130
- VERSION: python-3.12
128131
FRAMEWORK: aiohttp-4.0
129132
- VERSION: python-3.12
130-
FRAMEWORK: cassandra-3.4
133+
FRAMEWORK: cassandra-3.24
131134
- VERSION: python-3.12
132135
FRAMEWORK: pymongo-3.5
133136
- VERSION: python-3.13
@@ -153,7 +156,7 @@ exclude:
153156
- VERSION: python-3.13
154157
FRAMEWORK: aiohttp-4.0
155158
- VERSION: python-3.13
156-
FRAMEWORK: cassandra-3.4
159+
FRAMEWORK: cassandra-3.24
157160
- VERSION: python-3.14
158161
FRAMEWORK: django-1.11
159162
- VERSION: python-3.14
@@ -181,7 +184,7 @@ exclude:
181184
- VERSION: python-3.14
182185
FRAMEWORK: aiohttp-4.0
183186
- VERSION: python-3.14
184-
FRAMEWORK: cassandra-3.4
187+
FRAMEWORK: cassandra-3.24
185188
- VERSION: python-3.14
186189
FRAMEWORK: pymongo-3.5
187190
# pymongo
@@ -353,32 +356,24 @@ exclude:
353356
FRAMEWORK: twisted-17
354357
- VERSION: python-3.11
355358
FRAMEWORK: twisted-16
356-
- VERSION: python-3.11
357-
FRAMEWORK: twisted-15
358359
- VERSION: python-3.12
359360
FRAMEWORK: twisted-18
360361
- VERSION: python-3.12
361362
FRAMEWORK: twisted-17
362363
- VERSION: python-3.12
363364
FRAMEWORK: twisted-16
364-
- VERSION: python-3.12
365-
FRAMEWORK: twisted-15
366365
- VERSION: python-3.13
367366
FRAMEWORK: twisted-18
368367
- VERSION: python-3.13
369368
FRAMEWORK: twisted-17
370369
- VERSION: python-3.13
371370
FRAMEWORK: twisted-16
372-
- VERSION: python-3.13
373-
FRAMEWORK: twisted-15
374371
- VERSION: python-3.14
375372
FRAMEWORK: twisted-18
376373
- VERSION: python-3.14
377374
FRAMEWORK: twisted-17
378375
- VERSION: python-3.14
379376
FRAMEWORK: twisted-16
380-
- VERSION: python-3.14
381-
FRAMEWORK: twisted-15
382377
# pylibmc
383378
- VERSION: python-3.11
384379
FRAMEWORK: pylibmc-1.4
@@ -416,8 +411,6 @@ exclude:
416411
# TODO py3.12
417412
- VERSION: python-3.12
418413
FRAMEWORK: sanic-20.12 # no wheels available yet
419-
- VERSION: python-3.13
420-
FRAMEWORK: cassandra-newest # c extension issue
421414
- VERSION: python-3.14
422415
FRAMEWORK: cassandra-newest # c extension issue
423416
# httpx

‎.ci/.matrix_framework_full.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ FRAMEWORK:
3636
- twisted-18
3737
- twisted-17
3838
- twisted-16
39-
- twisted-15
4039
- requests-newest
4140
- boto3-1.5
4241
- boto3-1.6
@@ -57,7 +56,7 @@ FRAMEWORK:
5756
- memcached-newest
5857
- pylibmc-1.4
5958
- pylibmc-newest
60-
- cassandra-3.4
59+
- cassandra-3.24
6160
- cassandra-newest
6261
- psutil-newest
6362
- psutil-5.0

‎docs/reference/supported-technologies.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ Collected trace data:
397397

398398
#### Cassandra [automatic-instrumentation-db-cassandra]
399399

400-
Library: `cassandra-driver` (`>=3.4,<4.0`)
400+
Library: `cassandra-driver` (`>=3.24,<4.0`)
401401

402402
Instrumented methods:
403403

‎tests/requirements/reqs-cassandra-3.24.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
cassandra-driver==3.24.0
2+
setuptools<82.0.0
3+
-r reqs-base.txt

‎tests/requirements/reqs-cassandra-3.4.txt‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎tests/requirements/reqs-cassandra-newest.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
cassandra-driver>=3.14.0
1+
cassandra-driver<4
2+
setuptools<82.0.0
23
-r reqs-base.txt

‎tests/requirements/reqs-tornado-newest.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
tornado>=6.0
22
pytest-tornado
3+
setuptools<82.0.0
34
-r reqs-base.txt

‎tests/requirements/reqs-twisted-15.txt‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

tests/scripts/envs/cassandra-3.4.sh renamed to tests/scripts/envs/cassandra-3.24.sh

File renamed without changes.

‎tests/scripts/run_tests.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
set -e
44

55
export PATH=${HOME}/.local/bin:${PATH}
6-
python -m pip install --user -U pip setuptools --cache-dir "${PIP_CACHE}"
6+
# setuptools 82 dropped pkg_resources but that is required by some old versions of packages we are testing
7+
python -m pip install --user -U pip 'setuptools<82' --cache-dir "${PIP_CACHE}"
78
python -m pip install --user -r "tests/requirements/reqs-${FRAMEWORK}.txt" --cache-dir "${PIP_CACHE}"
89

910
export PYTHON_VERSION=$(python -c "import platform; pv=platform.python_version_tuple(); print('pypy' + ('' if pv[0] == 2 else str(pv[0])) if platform.python_implementation() == 'PyPy' else '.'.join(map(str, platform.python_version_tuple()[:2])))")

0 commit comments

Comments
 (0)