Remove [test] package from pika instrumentation

Fixes #2209
open-telemetry · Mar 6, 2024 · 9ebe787 · 9ebe787
1 parent 46a8c59
commit 9ebe787
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 10 deletions.
diff --git a/instrumentation/opentelemetry-instrumentation-pika/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pika/pyproject.toml
@@ -33,12 +33,6 @@ dependencies = [
 instruments = [
   "pika >= 0.12.0",
 ]
-test = [
-  "opentelemetry-instrumentation-pika[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-  "pytest",
-  "wrapt >= 1.0.0, < 2.0.0",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 pika = "opentelemetry.instrumentation.pika:PikaInstrumentor"

diff --git a/instrumentation/opentelemetry-instrumentation-pika/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-pika/test-requirements-0.txt
@@ -0,0 +1,18 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pika==0.13.1
+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
+-e instrumentation/opentelemetry-instrumentation-pika
diff --git a/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt
@@ -0,0 +1,18 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pika==1.3.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
+-e instrumentation/opentelemetry-instrumentation-pika
diff --git a/tox.ini b/tox.ini
@@ -219,6 +219,11 @@ envlist =
     pypy3-test-propagator-ot-trace
 
     ; opentelemetry-instrumentation-sio-pika
+
+    ; The numbers at the end of the environment names
+    ; below mean these dependencies are being used:
+    ; 0: pika>=0.12.0,<1.0.0
+    ; 1: pika>=1.0.0
     py3{8,9,10,11}-test-instrumentation-sio-pika-{0,1}
     pypy3-test-instrumentation-sio-pika-{0,1}
 
@@ -282,8 +287,6 @@ deps =
   sqlalchemy-11: sqlalchemy>=1.1,<1.2
   sqlalchemy-14: aiosqlite
   sqlalchemy-14: sqlalchemy~=1.4
-  sio-pika-0: pika>=0.12.0,<1.0.0
-  sio-pika-1: pika>=1.0.0
   aio-pika-7: aio_pika~=7.2.0
   aio-pika-8: aio_pika>=8.0.0,<9.0.0
   aio-pika-9: aio_pika>=9.0.0,<10.0.0
@@ -323,7 +326,8 @@ commands_pre =
 
   celery: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test]
 
-  sio-pika-{0,1}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
+  sio-pika-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-0.txt
+  sio-pika-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt
 
   aio-pika-{8,9}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
 
@@ -548,7 +552,7 @@ commands_pre =
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test]
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt
   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-redis[test]