From 3e305f6304b5c5fc063b0c59374c10e645231ffd Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 23 Feb 2024 20:14:23 -0600 Subject: [PATCH] Remove [test] package from redis instrumentation Fixes #2215 --- .../pyproject.toml | 5 ----- .../test-requirements.txt | 19 +++++++++++++++++++ tox.ini | 6 +++--- 3 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt diff --git a/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml b/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml index 8511671ed6..35ca1119fe 100644 --- a/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml @@ -34,11 +34,6 @@ dependencies = [ instruments = [ "redis >= 2.6", ] -test = [ - "opentelemetry-instrumentation-redis[instruments]", - "opentelemetry-sdk ~= 1.3", - "opentelemetry-test-utils == 0.45b0.dev", -] [project.entry-points.opentelemetry_instrumentor] redis = "opentelemetry.instrumentation.redis:RedisInstrumentor" diff --git a/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt new file mode 100644 index 0000000000..90617f72e6 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt @@ -0,0 +1,19 @@ +asgiref==3.7.2 +async-timeout==4.0.3 +attrs==23.2.0 +Deprecated==1.2.14 +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 +redis==5.0.1 +tomli==2.0.1 +typing_extensions==4.9.0 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-instrumentation +-e instrumentation/opentelemetry-instrumentation-redis diff --git a/tox.ini b/tox.ini index 6d74b45964..dc3a12f334 100644 --- a/tox.ini +++ b/tox.ini @@ -382,7 +382,7 @@ commands_pre = sqlite3: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3[test] - redis: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-redis[test] + redis: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt remoulade: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade[test] @@ -551,7 +551,7 @@ commands_pre = python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test] ; python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test] - python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-redis[test] + pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2[test] @@ -657,7 +657,7 @@ deps = python-dotenv==0.21.1 pytz==2024.1 PyYAML==5.3.1 - redis==4.6.0 + redis==5.0.1 remoulade==3.2.0 requests==2.25.0 six==1.16.0