Remove [test] package from sdk-extension-aws

Fixes #2234
open-telemetry · Mar 22, 2024 · 82f1c1b · 82f1c1b
1 parent bc73428
commit 82f1c1b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/.github/workflows/instrumentations_1.yml b/.github/workflows/instrumentations_1.yml
@@ -31,7 +31,7 @@ jobs:
           - "richconsole"
           - "psycopg"
           - "prometheus-remote-write"
-          - "sdkextension-aws"
+          - "sdk-extension-aws"
           - "propagator-aws-xray"
           - "propagator-ot-trace"
           - "resource-detector-container"

diff --git a/docs/index.rst b/docs/index.rst
@@ -22,7 +22,7 @@ installed separately via pip:
 
     pip install opentelemetry-exporter-{exporter}
     pip install opentelemetry-instrumentation-{instrumentation}
-    pip install opentelemetry-sdk-extension-{sdkextension}
+    pip install opentelemetry-sdk-extension-{sdk-extension}
 
 A complete list of packages can be found at the 
 `Contrib repo instrumentation <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation>`_

diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/pyproject.toml b/sdk-extension/opentelemetry-sdk-extension-aws/pyproject.toml
@@ -27,9 +27,6 @@ dependencies = [
   "opentelemetry-sdk ~= 1.12",
 ]
 
-[project.optional-dependencies]
-test = []
-
 [project.entry-points.opentelemetry_id_generator]
 xray = "opentelemetry.sdk.extension.aws.trace.aws_xray_id_generator:AwsXRayIdGenerator"
 

diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements.txt b/sdk-extension/opentelemetry-sdk-extension-aws/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 sdk-extension/opentelemetry-sdk-extension-aws
diff --git a/tox.ini b/tox.ini
@@ -11,8 +11,8 @@ envlist =
     pypy3-test-resource-detector-container
 
     ; opentelemetry-sdk-extension-aws
-    py3{8,9,10,11}-test-sdkextension-aws
-    pypy3-test-sdkextension-aws
+    py3{8,9,10,11}-test-sdk-extension-aws
+    pypy3-test-sdk-extension-aws
 
     ; opentelemetry-distro
     py3{8,9,10,11}-test-distro
@@ -454,7 +454,7 @@ commands_pre =
   httpx-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-0.txt
   httpx-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt
 
-  sdkextension-aws: pip install {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws[test]
+  sdk-extension-aws: pip install -r {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements.txt
 
   resource-detector-container: pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt
 
@@ -518,7 +518,7 @@ commands =
   test-instrumentation-httpx: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/tests {posargs}
   test-instrumentation-asyncio: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/tests {posargs}
   test-util-http: pytest {toxinidir}/util/opentelemetry-util-http/tests {posargs}
-  test-sdkextension-aws: pytest {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/tests {posargs}
+  test-sdk-extension-aws: pytest {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/tests {posargs}
   test-resource-detector-container: pytest {toxinidir}/resource/opentelemetry-resource-detector-container/tests {posargs}
   test-propagator-aws: pytest {toxinidir}/propagator/opentelemetry-propagator-aws-xray/tests {posargs}
   test-propagator-ot-trace: pytest {toxinidir}/propagator/opentelemetry-propagator-ot-trace/tests {posargs}
@@ -617,10 +617,10 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt
   pip install -r {toxinidir}/exporter/opentelemetry-exporter-richconsole/test-requirements.txt
   # requires snappy headers to be available on the system
-  python -m pip install -e {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws[test]
   pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt
   pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt
   pip install -r {toxinidir}/propagator/opentelemetry-propagator-ot-trace/test-requirements.txt
+  pip install -r {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements.txt
   python -m pip install -e {toxinidir}/opentelemetry-distro[test]
 
 commands =