From de86bd2f284b9d5aa9166fe3c96798a46eda8851 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Wed, 28 Feb 2024 20:02:25 -0600 Subject: [PATCH] Remove [test] package from opentelemetry-instrumentation Fixes #2235 --- opentelemetry-instrumentation/pyproject.toml | 3 --- .../test-requirements.txt | 16 ++++++++++++++++ tox.ini | 4 +++- 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 opentelemetry-instrumentation/test-requirements.txt diff --git a/opentelemetry-instrumentation/pyproject.toml b/opentelemetry-instrumentation/pyproject.toml index db389544c9..a20b005911 100644 --- a/opentelemetry-instrumentation/pyproject.toml +++ b/opentelemetry-instrumentation/pyproject.toml @@ -29,9 +29,6 @@ dependencies = [ "wrapt >= 1.0.0, < 2.0.0", ] -[project.optional-dependencies] -test = [] - [project.scripts] opentelemetry-bootstrap = "opentelemetry.instrumentation.bootstrap:run" opentelemetry-instrument = "opentelemetry.instrumentation.auto_instrumentation:run" diff --git a/opentelemetry-instrumentation/test-requirements.txt b/opentelemetry-instrumentation/test-requirements.txt new file mode 100644 index 0000000000..473a423bda --- /dev/null +++ b/opentelemetry-instrumentation/test-requirements.txt @@ -0,0 +1,16 @@ +asgiref==3.7.2 +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 +tomli==2.0.1 +typing_extensions==4.10.0 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-instrumentation diff --git a/tox.ini b/tox.ini index 6d74b45964..f6067963cd 100644 --- a/tox.ini +++ b/tox.ini @@ -319,6 +319,8 @@ commands_pre = test: pip install opentelemetry-test-utils[test]@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils test: pip install {toxinidir}/opentelemetry-instrumentation + opentelemetry-instrumentation: pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt + distro: pip install {toxinidir}/opentelemetry-distro celery: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test] @@ -533,7 +535,7 @@ commands_pre = python -m pip install {env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk python -m pip install {env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils python -m pip install -e {toxinidir}/util/opentelemetry-util-http[test] - python -m pip install -e {toxinidir}/opentelemetry-instrumentation[test] + pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]