diff --git a/.ci/.matrix_exclude.yml b/.ci/.matrix_exclude.yml index c7089061f..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 @@ -95,7 +98,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 +114,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 +130,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 +156,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 +184,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 @@ -353,32 +356,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 @@ -416,8 +411,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 6b3a6ea08..10c8cee73 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 @@ -57,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.24.txt b/tests/requirements/reqs-cassandra-3.24.txt new file mode 100644 index 000000000..5726719a1 --- /dev/null +++ b/tests/requirements/reqs-cassandra-3.24.txt @@ -0,0 +1,3 @@ +cassandra-driver==3.24.0 +setuptools<82.0.0 +-r reqs-base.txt diff --git a/tests/requirements/reqs-cassandra-3.4.txt b/tests/requirements/reqs-cassandra-3.4.txt deleted file mode 100644 index db098c483..000000000 --- a/tests/requirements/reqs-cassandra-3.4.txt +++ /dev/null @@ -1,2 +0,0 @@ -cassandra-driver>=3.4.0,<3.5.0 --r reqs-base.txt diff --git a/tests/requirements/reqs-cassandra-newest.txt b/tests/requirements/reqs-cassandra-newest.txt index e66c6177b..bdaf637a9 100644 --- a/tests/requirements/reqs-cassandra-newest.txt +++ b/tests/requirements/reqs-cassandra-newest.txt @@ -1,2 +1,3 @@ -cassandra-driver>=3.14.0 +cassandra-driver<4 +setuptools<82.0.0 -r reqs-base.txt 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 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 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 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])))")