Skip to content

Commit

Permalink
Remove [test] package from pika instrumentation (#2306)
Browse files Browse the repository at this point in the history
Fixes #2209
  • Loading branch information
ocelotl authored Mar 22, 2024
1 parent 96655ce commit ada2784
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.11",
]
dependencies = [
"opentelemetry-instrumentation == 0.45b0.dev",
"opentelemetry-api ~= 1.5",
"packaging >= 20.0",
"wrapt >= 1.0.0, < 2.0.0",
Expand All @@ -33,12 +34,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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
21 changes: 12 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,10 @@ 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}

Expand Down Expand Up @@ -300,8 +304,6 @@ deps =
coverage: pytest
coverage: pytest-cov
grpc: pytest-asyncio
sio-pika-0: pika>=0.12.0,<1.0.0
sio-pika-1: pika>=1.0.0

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

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

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-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
Expand Down Expand Up @@ -582,7 +585,6 @@ commands_pre =
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt
Expand All @@ -603,7 +605,8 @@ commands_pre =
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/test-requirements-1.txt
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql[test]
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql/test-requirements.txt
# prerequisite: follow the instructions here https://github.com/PyMySQL/mysqlclient#install
# for your OS to install the required dependencies
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/test-requirements.txt
Expand Down

0 comments on commit ada2784

Please sign in to comment.