From 799d25924cc19512df9f68025b5510d45e8df533 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Mon, 18 Mar 2024 12:25:10 -0500 Subject: [PATCH] Remove [test] package from opentelemetry-exporter-zipkin-json (#3774) Fixes #3720 --- .../pyproject.toml | 3 --- .../test-requirements.txt | 22 +++++++++++++++++++ tox.ini | 7 ++---- 3 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 exporter/opentelemetry-exporter-zipkin/test-requirements.txt diff --git a/exporter/opentelemetry-exporter-zipkin/pyproject.toml b/exporter/opentelemetry-exporter-zipkin/pyproject.toml index 5710158de77..2d22ea4f24f 100644 --- a/exporter/opentelemetry-exporter-zipkin/pyproject.toml +++ b/exporter/opentelemetry-exporter-zipkin/pyproject.toml @@ -29,9 +29,6 @@ dependencies = [ "opentelemetry-exporter-zipkin-proto-http == 1.24.0.dev", ] -[project.optional-dependencies] -test = [] - [project.entry-points.opentelemetry_traces_exporter] zipkin = "opentelemetry.exporter.zipkin.proto.http:ZipkinExporter" diff --git a/exporter/opentelemetry-exporter-zipkin/test-requirements.txt b/exporter/opentelemetry-exporter-zipkin/test-requirements.txt new file mode 100644 index 00000000000..b859e401d5c --- /dev/null +++ b/exporter/opentelemetry-exporter-zipkin/test-requirements.txt @@ -0,0 +1,22 @@ +asgiref==3.7.2 +attrs==23.2.0 +Deprecated==1.2.14 +flaky==3.7.0 +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-api +-e exporter/opentelemetry-exporter-zipkin-json +-e exporter/opentelemetry-exporter-zipkin-proto-http +-e opentelemetry-sdk +-e opentelemetry-semantic-conventions +-e exporter/opentelemetry-exporter-zipkin diff --git a/tox.ini b/tox.ini index 3f4c9434c0f..1ef1566d734 100644 --- a/tox.ini +++ b/tox.ini @@ -141,9 +141,7 @@ commands_pre = exporter-prometheus: pip install -r {toxinidir}/exporter/opentelemetry-exporter-prometheus/test-requirements.txt - exporter-zipkin-combined: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin-json - exporter-zipkin-combined: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http - exporter-zipkin-combined: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin + exporter-zipkin-combined: pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin/test-requirements.txt exporter-zipkin-proto-http: pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt @@ -214,7 +212,6 @@ commands_pre = pip install -r {toxinidir}/opentelemetry-api/test-requirements.txt pip install -r {toxinidir}/opentelemetry-sdk/test-requirements.txt pip install -r {toxinidir}/opentelemetry-semantic-conventions/test-requirements.txt - python -m pip install -e {toxinidir}/opentelemetry-proto[test] pip install -r {toxinidir}/opentelemetry-proto/test-requirements.txt pip install -r {toxinidir}/shim/opentelemetry-opentracing-shim/test-requirements.txt pip install -r {toxinidir}/shim/opentelemetry-opencensus-shim/test-requirements.txt @@ -227,9 +224,9 @@ commands_pre = pip install -r {toxinidir}/exporter/opentelemetry-exporter-prometheus/test-requirements.txt pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt - python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-zipkin[test] pip install -r {toxinidir}/propagator/opentelemetry-propagator-b3/test-requirements.txt pip install -r {toxinidir}/propagator/opentelemetry-propagator-jaeger/test-requirements.txt + pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin/test-requirements.txt # Pin protobuf version due to lint failing on v3.20.0 # https://github.com/protocolbuffers/protobuf/issues/9730 python -m pip install protobuf==3.19.4