From 591150f53c118160e1e543ecf7ecf8157ebdf46e Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Tue, 27 Feb 2024 16:36:38 -0600 Subject: [PATCH] Remove [test] package from sklearn instrumentation Fixes #2218 --- .../pyproject.toml | 4 ---- .../test-requirements.txt | 22 +++++++++++++++++++ tox.ini | 4 ++-- 3 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt diff --git a/instrumentation/opentelemetry-instrumentation-sklearn/pyproject.toml b/instrumentation/opentelemetry-instrumentation-sklearn/pyproject.toml index 28fa247159..3d98977347 100644 --- a/instrumentation/opentelemetry-instrumentation-sklearn/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-sklearn/pyproject.toml @@ -32,10 +32,6 @@ dependencies = [ instruments = [ "scikit-learn ~= 0.24.0", ] -test = [ - "opentelemetry-instrumentation-sklearn[instruments]", - "opentelemetry-test-utils == 0.45b0.dev", -] [project.entry-points.opentelemetry_instrumentor] sklearn = "opentelemetry.instrumentation.sklearn:SklearnInstrumentor" diff --git a/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt new file mode 100644 index 0000000000..8407365469 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt @@ -0,0 +1,22 @@ +asgiref==3.7.2 +attrs==23.2.0 +Deprecated==1.2.14 +importlib-metadata==6.11.0 +iniconfig==2.0.0 +joblib==1.3.2 +numpy==1.24.4 +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 +scikit-learn==0.24.2 +scipy==1.10.1 +threadpoolctl==3.3.0 +tomli==2.0.1 +typing_extensions==4.10.0 +wrapt==1.16.0 +zipp==3.17.0 +-e ../../../opentelemetry-instrumentation +-e ../../../instrumentation/opentelemetry-instrumentation-sklearn diff --git a/tox.ini b/tox.ini index 820ac93816..8cfa2cc2e5 100644 --- a/tox.ini +++ b/tox.ini @@ -470,7 +470,7 @@ commands_pre = prometheus: pip install {toxinidir}/exporter/opentelemetry-exporter-prometheus-remote-write[test] - sklearn: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test] + sklearn: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt sqlalchemy-{11,14}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test] @@ -553,7 +553,7 @@ commands_pre = 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] - ; python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test] + python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-redis[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi[test]