Skip to content

Commit

Permalink
Remove [test] package from pymemcache instrumentation (#2310)
Browse files Browse the repository at this point in the history
Fixes #2211
  • Loading branch information
ocelotl authored Mar 15, 2024
1 parent e30dd1a commit 0b5e3b4
Show file tree
Hide file tree
Showing 7 changed files with 109 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ dependencies = [
instruments = [
"pymemcache >= 1.3.5, < 5",
]
test = [
"opentelemetry-instrumentation-pymemcache[instruments]",
"opentelemetry-test-utils == 0.45b0.dev",
]

[project.entry-points.opentelemetry_instrumentor]
pymemcache = "opentelemetry.instrumentation.pymemcache:PymemcacheInstrumentor"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
asgiref==3.7.2
attrs==23.2.0
Deprecated==1.2.14
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
py==1.11.0
py-cpuinfo==9.0.0
pymemcache==1.3.5
pytest==7.1.3
pytest-benchmark==4.0.0
six==1.16.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-pymemcache
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
asgiref==3.7.2
attrs==23.2.0
Deprecated==1.2.14
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
py==1.11.0
py-cpuinfo==9.0.0
pymemcache==2.2.2
pytest==7.1.3
pytest-benchmark==4.0.0
six==1.16.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-pymemcache
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
asgiref==3.7.2
attrs==23.2.0
Deprecated==1.2.14
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
py==1.11.0
py-cpuinfo==9.0.0
pymemcache==3.4.1
pytest==7.1.3
pytest-benchmark==4.0.0
six==1.16.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-pymemcache
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
asgiref==3.7.2
attrs==23.2.0
Deprecated==1.2.14
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
py==1.11.0
py-cpuinfo==9.0.0
pymemcache==3.4.2
pytest==7.1.3
pytest-benchmark==4.0.0
six==1.16.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-pymemcache
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
pluggy==1.4.0
py==1.11.0
py-cpuinfo==9.0.0
pymemcache==4.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-pymemcache
24 changes: 15 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,15 @@ envlist =
pypy3-test-instrumentation-psycopg

; opentelemetry-instrumentation-pymemcache
py3{8,9,10,11}-test-instrumentation-pymemcache-{135,200,300,342,400}
pypy3-test-instrumentation-pymemcache-{135,200,300,342,400}
; The numbers at the end of the environment names
; below mean these dependencies are being used:
; 0: pymemcache ==1.3.5
; 1: pymemcache >2.0.0,<3.0.0
; 2: pymemcache >3.0.0,<3.4.2
; 3: pymemcache ==3.4.2
; 4: pymemcache ==4.0.0
py3{8,9,10,11}-test-instrumentation-pymemcache-{0,1,2,3,4}
pypy3-test-instrumentation-pymemcache-{0,1,2,3,4}

; opentelemetry-instrumentation-pymongo
py3{8,9,10,11}-test-instrumentation-pymongo
Expand Down Expand Up @@ -299,11 +306,6 @@ deps =
sqlalchemy-14: sqlalchemy~=1.4
sio-pika-0: pika>=0.12.0,<1.0.0
sio-pika-1: pika>=1.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
pymemcache-342: pymemcache ==3.4.2
pymemcache-400: pymemcache ==4.0.0

; FIXME: add coverage testing
; FIXME: add mypy testing
Expand Down Expand Up @@ -387,7 +389,11 @@ commands_pre =

mysqlclient: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient[test]

pymemcache-{135,200,300,342,400}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
pymemcache-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-0.txt
pymemcache-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-1.txt
pymemcache-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-2.txt
pymemcache-3: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-3.txt
pymemcache-4: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt

pymongo: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo[test]

Expand Down Expand Up @@ -582,7 +588,7 @@ commands_pre =
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python[test]
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-logging[test]
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg[test]
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2[test]
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt
Expand Down

0 comments on commit 0b5e3b4

Please sign in to comment.