Skip to content

Commit 2773f8b

Browse files
committed
Remove [test] package from pymemcache instrumentation
Fixes #2211
1 parent e30dd1a commit 2773f8b

File tree

7 files changed

+109
-13
lines changed

7 files changed

+109
-13
lines changed

instrumentation/opentelemetry-instrumentation-pymemcache/pyproject.toml

-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ dependencies = [
3434
instruments = [
3535
"pymemcache >= 1.3.5, < 5",
3636
]
37-
test = [
38-
"opentelemetry-instrumentation-pymemcache[instruments]",
39-
"opentelemetry-test-utils == 0.45b0.dev",
40-
]
4137

4238
[project.entry-points.opentelemetry_instrumentor]
4339
pymemcache = "opentelemetry.instrumentation.pymemcache:PymemcacheInstrumentor"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
pluggy==1.4.0
8+
py==1.11.0
9+
py-cpuinfo==9.0.0
10+
pymemcache==1.3.5
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
six==1.16.0
14+
tomli==2.0.1
15+
typing_extensions==4.10.0
16+
wrapt==1.16.0
17+
zipp==3.17.0
18+
-e opentelemetry-instrumentation
19+
-e instrumentation/opentelemetry-instrumentation-pymemcache
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
pluggy==1.4.0
8+
py==1.11.0
9+
py-cpuinfo==9.0.0
10+
pymemcache==2.2.2
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
six==1.16.0
14+
tomli==2.0.1
15+
typing_extensions==4.10.0
16+
wrapt==1.16.0
17+
zipp==3.17.0
18+
-e opentelemetry-instrumentation
19+
-e instrumentation/opentelemetry-instrumentation-pymemcache
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
pluggy==1.4.0
8+
py==1.11.0
9+
py-cpuinfo==9.0.0
10+
pymemcache==3.4.1
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
six==1.16.0
14+
tomli==2.0.1
15+
typing_extensions==4.10.0
16+
wrapt==1.16.0
17+
zipp==3.17.0
18+
-e opentelemetry-instrumentation
19+
-e instrumentation/opentelemetry-instrumentation-pymemcache
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
pluggy==1.4.0
8+
py==1.11.0
9+
py-cpuinfo==9.0.0
10+
pymemcache==3.4.2
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
six==1.16.0
14+
tomli==2.0.1
15+
typing_extensions==4.10.0
16+
wrapt==1.16.0
17+
zipp==3.17.0
18+
-e opentelemetry-instrumentation
19+
-e instrumentation/opentelemetry-instrumentation-pymemcache
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+
pluggy==1.4.0
8+
py==1.11.0
9+
py-cpuinfo==9.0.0
10+
pymemcache==4.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-pymemcache

tox.ini

+15-9
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,15 @@ envlist =
158158
pypy3-test-instrumentation-psycopg
159159

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

164171
; opentelemetry-instrumentation-pymongo
165172
py3{8,9,10,11}-test-instrumentation-pymongo
@@ -299,11 +306,6 @@ deps =
299306
sqlalchemy-14: sqlalchemy~=1.4
300307
sio-pika-0: pika>=0.12.0,<1.0.0
301308
sio-pika-1: pika>=1.0.0
302-
pymemcache-135: pymemcache ==1.3.5
303-
pymemcache-200: pymemcache >2.0.0,<3.0.0
304-
pymemcache-300: pymemcache >3.0.0,<3.4.2
305-
pymemcache-342: pymemcache ==3.4.2
306-
pymemcache-400: pymemcache ==4.0.0
307309

308310
; FIXME: add coverage testing
309311
; FIXME: add mypy testing
@@ -387,7 +389,11 @@ commands_pre =
387389

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

390-
pymemcache-{135,200,300,342,400}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
392+
pymemcache-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-0.txt
393+
pymemcache-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-1.txt
394+
pymemcache-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-2.txt
395+
pymemcache-3: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-3.txt
396+
pymemcache-4: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt
391397

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

@@ -582,7 +588,7 @@ commands_pre =
582588
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python[test]
583589
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
584590
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-logging[test]
585-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
591+
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt
586592
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg[test]
587593
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2[test]
588594
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt

0 commit comments

Comments
 (0)