Skip to content

Commit 6753c30

Browse files
committed
Remove [test] package from aio-pika instrumentation
Fixes #2186
1 parent 1e0b11f commit 6753c30

File tree

5 files changed

+80
-15
lines changed

5 files changed

+80
-15
lines changed

instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml

-6
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ dependencies = [
3333
instruments = [
3434
"aio_pika >= 7.2.0, < 10.0.0",
3535
]
36-
test = [
37-
"opentelemetry-instrumentation-aio-pika[instruments]",
38-
"opentelemetry-test-utils == 0.45b0.dev",
39-
"pytest",
40-
"wrapt >= 1.0.0, < 2.0.0",
41-
]
4236

4337
[project.entry-points.opentelemetry_instrumentor]
4438
aio-pika = "opentelemetry.instrumentation.aio_pika:AioPikaInstrumentor"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
aio-pika==7.2.0
2+
aiormq==6.2.3
3+
asgiref==3.7.2
4+
attrs==23.2.0
5+
Deprecated==1.2.14
6+
idna==3.6
7+
importlib-metadata==6.11.0
8+
iniconfig==2.0.0
9+
multidict==6.0.5
10+
packaging==23.2
11+
pamqp==3.1.0
12+
pluggy==1.4.0
13+
py==1.11.0
14+
py-cpuinfo==9.0.0
15+
pytest==7.1.3
16+
pytest-benchmark==4.0.0
17+
tomli==2.0.1
18+
typing_extensions==4.9.0
19+
wrapt==1.16.0
20+
yarl==1.9.4
21+
zipp==3.17.0
22+
-e opentelemetry-instrumentation
23+
-e instrumentation/opentelemetry-instrumentation-aio-pika
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
aio-pika==8.3.0
2+
aiormq==6.6.4
3+
asgiref==3.7.2
4+
attrs==23.2.0
5+
Deprecated==1.2.14
6+
idna==3.6
7+
importlib-metadata==6.11.0
8+
iniconfig==2.0.0
9+
multidict==6.0.5
10+
packaging==23.2
11+
pamqp==3.2.1
12+
pluggy==1.4.0
13+
py==1.11.0
14+
py-cpuinfo==9.0.0
15+
pytest==7.1.3
16+
pytest-benchmark==4.0.0
17+
tomli==2.0.1
18+
typing_extensions==4.9.0
19+
wrapt==1.16.0
20+
yarl==1.9.4
21+
zipp==3.17.0
22+
-e opentelemetry-instrumentation
23+
-e instrumentation/opentelemetry-instrumentation-aio-pika
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
aio-pika==9.4.0
2+
aiormq==6.8.0
3+
asgiref==3.7.2
4+
attrs==23.2.0
5+
Deprecated==1.2.14
6+
idna==3.6
7+
importlib-metadata==6.11.0
8+
iniconfig==2.0.0
9+
multidict==6.0.5
10+
packaging==23.2
11+
pamqp==3.3.0
12+
pluggy==1.4.0
13+
py==1.11.0
14+
py-cpuinfo==9.0.0
15+
pytest==7.1.3
16+
pytest-benchmark==4.0.0
17+
tomli==2.0.1
18+
typing_extensions==4.9.0
19+
wrapt==1.16.0
20+
yarl==1.9.4
21+
zipp==3.17.0
22+
-e opentelemetry-instrumentation
23+
-e instrumentation/opentelemetry-instrumentation-aio-pika

tox.ini

+11-9
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,13 @@ envlist =
223223
pypy3-test-instrumentation-sio-pika-{0,1}
224224

225225
; opentelemetry-instrumentation-aio-pika
226-
py3{8,9,10,11}-test-instrumentation-aio-pika-{8,9}
227-
pypy3-test-instrumentation-aio-pika-{8,9}
226+
; The numbers at the end of the environment names
227+
; below mean these dependencies are being used:
228+
; 0: aio_pika~=7.2.0
229+
; 1: aio_pika>=8.0.0,<9.0.0
230+
; 2: aio_pika>=9.0.0,<10.0.0
231+
py3{8,9,10,11}-test-instrumentation-aio-pika-{0,1,2}
232+
pypy3-test-instrumentation-aio-pika-{0,1,2}
228233

229234
; opentelemetry-instrumentation-kafka-python
230235
py3{8,9,10,11}-test-instrumentation-kafka-python
@@ -284,9 +289,6 @@ deps =
284289
sqlalchemy-14: sqlalchemy~=1.4
285290
sio-pika-0: pika>=0.12.0,<1.0.0
286291
sio-pika-1: pika>=1.0.0
287-
aio-pika-7: aio_pika~=7.2.0
288-
aio-pika-8: aio_pika>=8.0.0,<9.0.0
289-
aio-pika-9: aio_pika>=9.0.0,<10.0.0
290292
pymemcache-135: pymemcache ==1.3.5
291293
pymemcache-200: pymemcache >2.0.0,<3.0.0
292294
pymemcache-300: pymemcache >3.0.0,<3.4.2
@@ -325,7 +327,9 @@ commands_pre =
325327

326328
sio-pika-{0,1}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
327329

328-
aio-pika-{8,9}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
330+
aio-pika-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt
331+
aio-pika-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt
332+
aio-pika-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
329333

330334
kafka-python: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python[test]
331335

@@ -400,8 +404,6 @@ commands_pre =
400404

401405
logging: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-logging[test]
402406

403-
aio-pika-{8,9}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
404-
405407
aiohttp-client: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client[test]
406408

407409
aiohttp-server: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server[test]
@@ -549,7 +551,7 @@ commands_pre =
549551
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra[test]
550552
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test]
551553
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
552-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
554+
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
553555
; python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test]
554556
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-redis[test]
555557
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade[test]

0 commit comments

Comments
 (0)