Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove [test] package from aio-pika instrumentation #2244

Merged
merged 2 commits into from
Mar 15, 2024
Merged

Remove [test] package from aio-pika instrumentation #2244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6753c30
Remove [test] package from aio-pika instrumentation
ocelotl Feb 16, 2024
f626eb5
Merge branch 'main' into issue_2186
ocelotl Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
23 changes: 23 additions & 0 deletions instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
23 changes: 23 additions & 0 deletions instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
23 changes: 23 additions & 0 deletions instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
20 changes: 11 additions & 9 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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]

Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
Loading