From 540d401db01d61ca105b26ec2b9e13ea9114bb23 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 23 Feb 2024 20:48:03 -0600 Subject: [PATCH] Remove [test] package from tortoiseorm instrumentation Fixes #2224 --- .../pyproject.toml | 4 --- .../test-requirements.txt | 25 +++++++++++++++++++ tox.ini | 4 +-- 3 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt diff --git a/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml b/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml index 9d32028bdd..89a906610b 100644 --- a/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml @@ -34,10 +34,6 @@ instruments = [ "tortoise-orm >= 0.17.0", "pydantic >= 1.10.2" ] -test = [ - "opentelemetry-instrumentation-tortoiseorm[instruments]", - "opentelemetry-test-utils == 0.45b0.dev", -] [project.entry-points.opentelemetry_instrumentor] tortoiseorm = "opentelemetry.instrumentation.tortoiseorm:TortoiseORMInstrumentor" diff --git a/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt new file mode 100644 index 0000000000..0fafc56253 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt @@ -0,0 +1,25 @@ +aiosqlite==0.17.0 +annotated-types==0.6.0 +asgiref==3.7.2 +attrs==23.2.0 +Deprecated==1.2.14 +importlib-metadata==6.11.0 +iniconfig==2.0.0 +iso8601==1.1.0 +packaging==23.2 +pluggy==1.4.0 +py==1.11.0 +py-cpuinfo==9.0.0 +pydantic==2.6.2 +pydantic_core==2.16.3 +pypika-tortoise==0.1.6 +pytest==7.1.3 +pytest-benchmark==4.0.0 +pytz==2024.1 +tomli==2.0.1 +tortoise-orm==0.20.0 +typing_extensions==4.9.0 +wrapt==1.16.0 +zipp==3.17.0 +-e opentelemetry-instrumentation +-e instrumentation/opentelemetry-instrumentation-tortoiseorm diff --git a/tox.ini b/tox.ini index 7b7b2a0710..d11d4ebaf5 100644 --- a/tox.ini +++ b/tox.ini @@ -394,7 +394,7 @@ commands_pre = tornado: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado[test] - tortoiseorm: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm[test] + tortoiseorm: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt jinja2: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2[test] @@ -577,7 +577,7 @@ commands_pre = python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado[test] - python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm[test] + pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx[test] python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda[test]