Remove [test] package from aio-pika instrumentation

Fixes open-telemetry#2186
ocelotl · Mar 12, 2024 · ba863ee · ba863ee
1 parent 565e78d
commit ba863ee
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 15 deletions.
diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml
@@ -33,12 +33,6 @@ dependencies = [
 instruments = [
  "aio_pika >= 7.2.0, < 10.0.0",
 ]
-test = [
- "opentelemetry-instrumentation-aio-pika[instruments]",
- "opentelemetry-test-utils == 0.45b0.dev",
- "pytest",
- "wrapt >= 1.0.0, < 2.0.0",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 aio-pika = "opentelemetry.instrumentation.aio_pika:AioPikaInstrumentor"

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt
@@ -0,0 +1,23 @@
+aio-pika==7.2.0
+aiormq==6.2.3
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+idna==3.6
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+multidict==6.0.5
+packaging==23.2
+pamqp==3.1.0
+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.9.0
+wrapt==1.16.0
+yarl==1.9.4
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-aio-pika
diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt
@@ -0,0 +1,23 @@
+aio-pika==8.3.0
+aiormq==6.6.4
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+idna==3.6
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+multidict==6.0.5
+packaging==23.2
+pamqp==3.2.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.9.0
+wrapt==1.16.0
+yarl==1.9.4
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-aio-pika
diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
@@ -0,0 +1,23 @@
+aio-pika==9.4.0
+aiormq==6.8.0
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+idna==3.6
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+multidict==6.0.5
+packaging==23.2
+pamqp==3.3.0
+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.9.0
+wrapt==1.16.0
+yarl==1.9.4
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-aio-pika
diff --git a/tox.ini b/tox.ini
@@ -223,8 +223,13 @@ envlist =
  pypy3-test-instrumentation-sio-pika-{0,1}
 
  ; opentelemetry-instrumentation-aio-pika
- py3{8,9,10,11}-test-instrumentation-aio-pika-{8,9}
- pypy3-test-instrumentation-aio-pika-{8,9}
+ ; The numbers at the end of the environment names
+ ; below mean these dependencies are being used:
+ ; 0: aio_pika~=7.2.0
+ ; 1: aio_pika>=8.0.0,<9.0.0
+ ; 2: aio_pika>=9.0.0,<10.0.0
+ py3{8,9,10,11}-test-instrumentation-aio-pika-{0,1,2}
+ pypy3-test-instrumentation-aio-pika-{0,1,2}
 
  ; opentelemetry-instrumentation-kafka-python
  py3{8,9,10,11}-test-instrumentation-kafka-python
@@ -284,9 +289,6 @@ deps =
  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
  pymemcache-135: pymemcache ==1.3.5
  pymemcache-200: pymemcache >2.0.0,<3.0.0
  pymemcache-300: pymemcache >3.0.0,<3.4.2
@@ -325,7 +327,9 @@ commands_pre =
 
  sio-pika-{0,1}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
 
- aio-pika-{8,9}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
+ aio-pika-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt
+ aio-pika-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt
+ aio-pika-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
 
  kafka-python: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python[test]
 
@@ -400,8 +404,6 @@ commands_pre =
 
  logging: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-logging[test]
 
- aio-pika-{8,9}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
-
  aiohttp-client: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client[test]
 
  aiohttp-server: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server[test]
@@ -549,7 +551,7 @@ commands_pre =
  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]
- python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
+ pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
  ; python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test]
  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-redis[test]
  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade[test]