Skip to content

Commit 30ef978

Browse files
committed
Remove [test] package from pika instrumentation
Fixes #2209
1 parent 46a8c59 commit 30ef978

File tree

4 files changed

+43
-10
lines changed

4 files changed

+43
-10
lines changed

instrumentation/opentelemetry-instrumentation-pika/pyproject.toml

-6
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ dependencies = [
3333
instruments = [
3434
"pika >= 0.12.0",
3535
]
36-
test = [
37-
"opentelemetry-instrumentation-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
pika = "opentelemetry.instrumentation.pika:PikaInstrumentor"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
importlib-metadata==6.11.0
5+
iniconfig==2.0.0
6+
packaging==23.2
7+
pika==0.13.1
8+
pluggy==1.4.0
9+
py==1.11.0
10+
py-cpuinfo==9.0.0
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
tomli==2.0.1
14+
typing_extensions==4.10.0
15+
wrapt==1.16.0
16+
zipp==3.17.0
17+
-e opentelemetry-instrumentation
18+
-e instrumentation/opentelemetry-instrumentation-pika
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
importlib-metadata==6.11.0
5+
iniconfig==2.0.0
6+
packaging==23.2
7+
pika==1.3.2
8+
pluggy==1.4.0
9+
py==1.11.0
10+
py-cpuinfo==9.0.0
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
tomli==2.0.1
14+
typing_extensions==4.10.0
15+
wrapt==1.16.0
16+
zipp==3.17.0
17+
-e opentelemetry-instrumentation
18+
-e instrumentation/opentelemetry-instrumentation-pika

tox.ini

+7-4
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,10 @@ envlist =
219219
pypy3-test-propagator-ot-trace
220220

221221
; opentelemetry-instrumentation-sio-pika
222+
; The numbers at the end of the environment names
223+
; below mean these dependencies are being used:
224+
; 0: pika>=0.12.0,<1.0.0
225+
; 1: pika>=1.0.0
222226
py3{8,9,10,11}-test-instrumentation-sio-pika-{0,1}
223227
pypy3-test-instrumentation-sio-pika-{0,1}
224228

@@ -282,8 +286,6 @@ deps =
282286
sqlalchemy-11: sqlalchemy>=1.1,<1.2
283287
sqlalchemy-14: aiosqlite
284288
sqlalchemy-14: sqlalchemy~=1.4
285-
sio-pika-0: pika>=0.12.0,<1.0.0
286-
sio-pika-1: pika>=1.0.0
287289
aio-pika-7: aio_pika~=7.2.0
288290
aio-pika-8: aio_pika>=8.0.0,<9.0.0
289291
aio-pika-9: aio_pika>=9.0.0,<10.0.0
@@ -323,7 +325,8 @@ commands_pre =
323325

324326
celery: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test]
325327

326-
sio-pika-{0,1}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
328+
sio-pika-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-0.txt
329+
sio-pika-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt
327330

328331
aio-pika-{8,9}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
329332

@@ -548,7 +551,7 @@ commands_pre =
548551
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
549552
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra[test]
550553
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test]
551-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
554+
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt
552555
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
553556
; python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test]
554557
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-redis[test]

0 commit comments

Comments
 (0)