From b2d81380a43da49fd67ec2f065a2f3d4aa69304d Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Sat, 24 Feb 2024 13:36:54 -0600 Subject: [PATCH] Remove [test] package from cassandra instrumentation Fixes #2194 --- .../pyproject.toml | 4 ---- .../test-requirements.txt | 23 +++++++++++++++++++ tox.ini | 4 ++-- 3 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml b/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml index 9088332425..c320f70aa9 100644 --- a/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml @@ -35,10 +35,6 @@ instruments = [ "cassandra-driver ~= 3.25", "scylla-driver ~= 3.25", ] -test = [ - "opentelemetry-instrumentation-cassandra[instruments]", - "opentelemetry-test-utils == 0.45b0.dev", -] [project.entry-points.opentelemetry_instrumentor] cassandra = "opentelemetry.instrumentation.cassandra:CassandraInstrumentor" diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt new file mode 100644 index 0000000000..f55190171d --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt @@ -0,0 +1,23 @@ +asgiref==3.7.2 +attrs==23.2.0 +cassandra-driver==3.29.0 +click==8.1.7 +Deprecated==1.2.14 +geomet==0.2.1.post1 +importlib-metadata==6.11.0 +iniconfig==2.0.0 +packaging==23.2 +pluggy==1.4.0 +py==1.11.0 +py-cpuinfo==9.0.0 +pytest==7.1.3 +pytest-benchmark==4.0.0 +PyYAML==6.0.1 +scylla-driver==3.26.6 +six==1.16.0 +tomli==2.0.1 +typing_extensions==4.9.0 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-instrumentation +-e instrumentation/opentelemetry-instrumentation-cassandra diff --git a/tox.ini b/tox.ini index 7b7b2a0710..d56aead3c0 100644 --- a/tox.ini +++ b/tox.ini @@ -356,7 +356,7 @@ commands_pre = botocore: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore[test] - cassandra: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra[test] + cassandra: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt dbapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi[test] @@ -546,7 +546,7 @@ commands_pre = python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test] - python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra[test] + pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]