Skip to content

Commit 375d71a

Browse files
committed
Remove [test] package from pika instrumentation
Fixes #2209
1 parent 96655ce commit 375d71a

File tree

4 files changed

+49
-15
lines changed

4 files changed

+49
-15
lines changed

instrumentation/opentelemetry-instrumentation-pika/pyproject.toml

+1-6
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ classifiers = [
2424
"Programming Language :: Python :: 3.11",
2525
]
2626
dependencies = [
27+
"opentelemetry-instrumentation == 0.45b0.dev",
2728
"opentelemetry-api ~= 1.5",
2829
"packaging >= 20.0",
2930
"wrapt >= 1.0.0, < 2.0.0",
@@ -33,12 +34,6 @@ dependencies = [
3334
instruments = [
3435
"pika >= 0.12.0",
3536
]
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-
]
4237

4338
[project.entry-points.opentelemetry_instrumentor]
4439
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

+12-9
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,10 @@ envlist =
258258
pypy3-test-propagator-ot-trace
259259

260260
; opentelemetry-instrumentation-sio-pika
261+
; The numbers at the end of the environment names
262+
; below mean these dependencies are being used:
263+
; 0: pika>=0.12.0,<1.0.0
264+
; 1: pika>=1.0.0
261265
py3{8,9,10,11}-test-instrumentation-sio-pika-{0,1}
262266
pypy3-test-instrumentation-sio-pika-{0,1}
263267

@@ -300,8 +304,6 @@ deps =
300304
coverage: pytest
301305
coverage: pytest-cov
302306
grpc: pytest-asyncio
303-
sio-pika-0: pika>=0.12.0,<1.0.0
304-
sio-pika-1: pika>=1.0.0
305307

306308
; FIXME: add coverage testing
307309
; FIXME: add mypy testing
@@ -317,10 +319,10 @@ commands_pre =
317319
py3{8,9,10,11}: python -m pip install -U pip setuptools wheel
318320
; Install common packages for all the tests. These are not needed in all the
319321
; cases but it saves a lot of boilerplate in this file.
320-
test: pip install opentelemetry-api[test]@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
321-
test: pip install opentelemetry-semantic-conventions[test]@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
322-
test: pip install opentelemetry-sdk[test]@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
323-
test: pip install opentelemetry-test-utils[test]@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
322+
test: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
323+
test: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
324+
test: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
325+
test: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
324326
test: pip install {toxinidir}/opentelemetry-instrumentation
325327

326328
opentelemetry-instrumentation: pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt
@@ -333,7 +335,8 @@ commands_pre =
333335
py3{10,11}-test-instrumentation-celery: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt
334336
pypy3-test-instrumentation-celery: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt
335337

336-
sio-pika-{0,1}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
338+
sio-pika-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-0.txt
339+
sio-pika-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt
337340

338341
aio-pika-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt
339342
aio-pika-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt
@@ -582,7 +585,6 @@ commands_pre =
582585
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt
583586
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt
584587
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt
585-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
586588
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
587589
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt
588590
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt
@@ -603,7 +605,8 @@ commands_pre =
603605
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/test-requirements-1.txt
604606
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt
605607
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt
606-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql[test]
608+
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt
609+
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql/test-requirements.txt
607610
# prerequisite: follow the instructions here https://github.com/PyMySQL/mysqlclient#install
608611
# for your OS to install the required dependencies
609612
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/test-requirements.txt

0 commit comments

Comments
 (0)