From 81b861861e4224ac7d337c07bd77b194425b3cd9 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Mon, 9 Feb 2026 14:41:41 +0100 Subject: [PATCH 1/7] Stop testing against Twisted 15 Since it requires the now removed from setuptools pkg_resources and last release is more than 10 years old. --- .ci/.matrix_exclude.yml | 8 -------- .ci/.matrix_framework_full.yml | 1 - tests/requirements/reqs-twisted-15.txt | 2 -- 3 files changed, 11 deletions(-) delete mode 100644 tests/requirements/reqs-twisted-15.txt diff --git a/.ci/.matrix_exclude.yml b/.ci/.matrix_exclude.yml index c7089061f..171d9ab36 100644 --- a/.ci/.matrix_exclude.yml +++ b/.ci/.matrix_exclude.yml @@ -353,32 +353,24 @@ exclude: FRAMEWORK: twisted-17 - VERSION: python-3.11 FRAMEWORK: twisted-16 - - VERSION: python-3.11 - FRAMEWORK: twisted-15 - VERSION: python-3.12 FRAMEWORK: twisted-18 - VERSION: python-3.12 FRAMEWORK: twisted-17 - VERSION: python-3.12 FRAMEWORK: twisted-16 - - VERSION: python-3.12 - FRAMEWORK: twisted-15 - VERSION: python-3.13 FRAMEWORK: twisted-18 - VERSION: python-3.13 FRAMEWORK: twisted-17 - VERSION: python-3.13 FRAMEWORK: twisted-16 - - VERSION: python-3.13 - FRAMEWORK: twisted-15 - VERSION: python-3.14 FRAMEWORK: twisted-18 - VERSION: python-3.14 FRAMEWORK: twisted-17 - VERSION: python-3.14 FRAMEWORK: twisted-16 - - VERSION: python-3.14 - FRAMEWORK: twisted-15 # pylibmc - VERSION: python-3.11 FRAMEWORK: pylibmc-1.4 diff --git a/.ci/.matrix_framework_full.yml b/.ci/.matrix_framework_full.yml index 6b3a6ea08..54acd61a3 100644 --- a/.ci/.matrix_framework_full.yml +++ b/.ci/.matrix_framework_full.yml @@ -36,7 +36,6 @@ FRAMEWORK: - twisted-18 - twisted-17 - twisted-16 - - twisted-15 - requests-newest - boto3-1.5 - boto3-1.6 diff --git a/tests/requirements/reqs-twisted-15.txt b/tests/requirements/reqs-twisted-15.txt deleted file mode 100644 index 084a05a3b..000000000 --- a/tests/requirements/reqs-twisted-15.txt +++ /dev/null @@ -1,2 +0,0 @@ -Twisted>=15,<16 --r reqs-base.txt From e1168a12f9f8444d80fd8322da0f4fa3b19b0250 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Mon, 9 Feb 2026 14:43:15 +0100 Subject: [PATCH 2/7] cassandra: stick with older setuptools 81.0.0 Since 82.0.0 removed pkg_resources that is used in current cassandra-driver. --- tests/requirements/reqs-cassandra-3.4.txt | 1 + tests/requirements/reqs-cassandra-newest.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/requirements/reqs-cassandra-3.4.txt b/tests/requirements/reqs-cassandra-3.4.txt index db098c483..2b405daae 100644 --- a/tests/requirements/reqs-cassandra-3.4.txt +++ b/tests/requirements/reqs-cassandra-3.4.txt @@ -1,2 +1,3 @@ cassandra-driver>=3.4.0,<3.5.0 +setuptools<82.0.0 -r reqs-base.txt diff --git a/tests/requirements/reqs-cassandra-newest.txt b/tests/requirements/reqs-cassandra-newest.txt index e66c6177b..229c32bfe 100644 --- a/tests/requirements/reqs-cassandra-newest.txt +++ b/tests/requirements/reqs-cassandra-newest.txt @@ -1,2 +1,3 @@ cassandra-driver>=3.14.0 +setuptools<82.0.0 -r reqs-base.txt From 8dc5fec14a8d00308e75628a8621ced3c7d45bb3 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Mon, 9 Feb 2026 14:45:50 +0100 Subject: [PATCH 3/7] tornado: stick with older setuptools 81.0.0 Since 82.0.0 removed pkg_resources that is used in pytest-tornado. --- tests/requirements/reqs-tornado-newest.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/requirements/reqs-tornado-newest.txt b/tests/requirements/reqs-tornado-newest.txt index 800b85aee..6a5447d7d 100644 --- a/tests/requirements/reqs-tornado-newest.txt +++ b/tests/requirements/reqs-tornado-newest.txt @@ -1,3 +1,4 @@ tornado>=6.0 pytest-tornado +setuptools<82.0.0 -r reqs-base.txt From 0a51b05eb620d6638b9a6eb6f81c1c272fd65d5a Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Mon, 9 Feb 2026 15:40:12 +0100 Subject: [PATCH 4/7] 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. --- tests/scripts/run_tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 7fcc85010..134dc043f 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -3,7 +3,8 @@ set -e export PATH=${HOME}/.local/bin:${PATH} -python -m pip install --user -U pip setuptools --cache-dir "${PIP_CACHE}" +# setuptools 82 dropped pkg_resources but that is required by some old versions of packages we are testing +python -m pip install --user -U pip 'setuptools<82' --cache-dir "${PIP_CACHE}" python -m pip install --user -r "tests/requirements/reqs-${FRAMEWORK}.txt" --cache-dir "${PIP_CACHE}" 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])))") From e56a986ddd1de717244db8e5ea64d193e0a6031e Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Mon, 9 Feb 2026 16:09:07 +0100 Subject: [PATCH 5/7] Bump tested cassandra-driver baseline to 3.24 That is the last cassandra-driver release of 2020 --- .ci/.matrix_exclude.yml | 12 +++++------- .ci/.matrix_framework_full.yml | 2 +- docs/reference/supported-technologies.md | 2 +- ...eqs-cassandra-3.4.txt => reqs-cassandra-3.24.txt} | 2 +- .../envs/{cassandra-3.4.sh => cassandra-3.24.sh} | 0 5 files changed, 8 insertions(+), 10 deletions(-) rename tests/requirements/{reqs-cassandra-3.4.txt => reqs-cassandra-3.24.txt} (53%) rename tests/scripts/envs/{cassandra-3.4.sh => cassandra-3.24.sh} (100%) diff --git a/.ci/.matrix_exclude.yml b/.ci/.matrix_exclude.yml index 171d9ab36..c5168803b 100644 --- a/.ci/.matrix_exclude.yml +++ b/.ci/.matrix_exclude.yml @@ -95,7 +95,7 @@ exclude: - VERSION: python-3.10 FRAMEWORK: aiohttp-4.0 - VERSION: python-3.10 - FRAMEWORK: cassandra-3.4 + FRAMEWORK: cassandra-3.24 - VERSION: python-3.10 FRAMEWORK: pymongo-3.5 - VERSION: python-3.11 @@ -111,7 +111,7 @@ exclude: - VERSION: python-3.11 FRAMEWORK: aiohttp-4.0 - VERSION: python-3.11 - FRAMEWORK: cassandra-3.4 + FRAMEWORK: cassandra-3.24 - VERSION: python-3.11 FRAMEWORK: pymongo-3.5 - VERSION: python-3.12 @@ -127,7 +127,7 @@ exclude: - VERSION: python-3.12 FRAMEWORK: aiohttp-4.0 - VERSION: python-3.12 - FRAMEWORK: cassandra-3.4 + FRAMEWORK: cassandra-3.24 - VERSION: python-3.12 FRAMEWORK: pymongo-3.5 - VERSION: python-3.13 @@ -153,7 +153,7 @@ exclude: - VERSION: python-3.13 FRAMEWORK: aiohttp-4.0 - VERSION: python-3.13 - FRAMEWORK: cassandra-3.4 + FRAMEWORK: cassandra-3.24 - VERSION: python-3.14 FRAMEWORK: django-1.11 - VERSION: python-3.14 @@ -181,7 +181,7 @@ exclude: - VERSION: python-3.14 FRAMEWORK: aiohttp-4.0 - VERSION: python-3.14 - FRAMEWORK: cassandra-3.4 + FRAMEWORK: cassandra-3.24 - VERSION: python-3.14 FRAMEWORK: pymongo-3.5 # pymongo @@ -408,8 +408,6 @@ exclude: # TODO py3.12 - VERSION: python-3.12 FRAMEWORK: sanic-20.12 # no wheels available yet - - VERSION: python-3.13 - FRAMEWORK: cassandra-newest # c extension issue - VERSION: python-3.14 FRAMEWORK: cassandra-newest # c extension issue # httpx diff --git a/.ci/.matrix_framework_full.yml b/.ci/.matrix_framework_full.yml index 54acd61a3..10c8cee73 100644 --- a/.ci/.matrix_framework_full.yml +++ b/.ci/.matrix_framework_full.yml @@ -56,7 +56,7 @@ FRAMEWORK: - memcached-newest - pylibmc-1.4 - pylibmc-newest - - cassandra-3.4 + - cassandra-3.24 - cassandra-newest - psutil-newest - psutil-5.0 diff --git a/docs/reference/supported-technologies.md b/docs/reference/supported-technologies.md index 47ee5c12b..28efb9438 100644 --- a/docs/reference/supported-technologies.md +++ b/docs/reference/supported-technologies.md @@ -397,7 +397,7 @@ Collected trace data: #### Cassandra [automatic-instrumentation-db-cassandra] -Library: `cassandra-driver` (`>=3.4,<4.0`) +Library: `cassandra-driver` (`>=3.24,<4.0`) Instrumented methods: diff --git a/tests/requirements/reqs-cassandra-3.4.txt b/tests/requirements/reqs-cassandra-3.24.txt similarity index 53% rename from tests/requirements/reqs-cassandra-3.4.txt rename to tests/requirements/reqs-cassandra-3.24.txt index 2b405daae..5726719a1 100644 --- a/tests/requirements/reqs-cassandra-3.4.txt +++ b/tests/requirements/reqs-cassandra-3.24.txt @@ -1,3 +1,3 @@ -cassandra-driver>=3.4.0,<3.5.0 +cassandra-driver==3.24.0 setuptools<82.0.0 -r reqs-base.txt diff --git a/tests/scripts/envs/cassandra-3.4.sh b/tests/scripts/envs/cassandra-3.24.sh similarity index 100% rename from tests/scripts/envs/cassandra-3.4.sh rename to tests/scripts/envs/cassandra-3.24.sh From b0d1c99a38cccbdae76679f381dd391e034aa9d2 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Mon, 9 Feb 2026 17:01:05 +0100 Subject: [PATCH 6/7] Skip cassandra 3.24 on Python 3.9 --- .ci/.matrix_exclude.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.ci/.matrix_exclude.yml b/.ci/.matrix_exclude.yml index c5168803b..6d8878ab8 100644 --- a/.ci/.matrix_exclude.yml +++ b/.ci/.matrix_exclude.yml @@ -59,6 +59,9 @@ exclude: FRAMEWORK: flask-3.0 - VERSION: python-3.14 FRAMEWORK: flask-1.0 + # Python 3.9 + - VERSION: python-3.9 + FRAMEWORK: cassandra-3.24 # Python 3.10 removed a bunch of classes from collections, now in collections.abc - VERSION: python-3.10 FRAMEWORK: django-1.11 From f9491b0d87a9853601af6b24919d0a6c846d89af Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Tue, 10 Feb 2026 10:09:22 +0100 Subject: [PATCH 7/7] Apply suggestion from @xrmx --- tests/requirements/reqs-cassandra-newest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements/reqs-cassandra-newest.txt b/tests/requirements/reqs-cassandra-newest.txt index 229c32bfe..bdaf637a9 100644 --- a/tests/requirements/reqs-cassandra-newest.txt +++ b/tests/requirements/reqs-cassandra-newest.txt @@ -1,3 +1,3 @@ -cassandra-driver>=3.14.0 +cassandra-driver<4 setuptools<82.0.0 -r reqs-base.txt