Skip to content

Commit ed4ed5c

Browse files
committed
Remove [test] package from pymemcache instrumentation
Fixes #2211
1 parent 46a8c59 commit ed4ed5c

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
@@ -136,8 +136,15 @@ envlist =
136136
pypy3-test-instrumentation-psycopg
137137

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

142149
; opentelemetry-instrumentation-pymongo
143150
py3{8,9,10,11}-test-instrumentation-pymongo
@@ -287,11 +294,6 @@ deps =
287294
aio-pika-7: aio_pika~=7.2.0
288295
aio-pika-8: aio_pika>=8.0.0,<9.0.0
289296
aio-pika-9: aio_pika>=9.0.0,<10.0.0
290-
pymemcache-135: pymemcache ==1.3.5
291-
pymemcache-200: pymemcache >2.0.0,<3.0.0
292-
pymemcache-300: pymemcache >3.0.0,<3.4.2
293-
pymemcache-342: pymemcache ==3.4.2
294-
pymemcache-400: pymemcache ==4.0.0
295297
httpx-18: httpx>=0.18.0,<0.19.0
296298
httpx-18: respx~=0.17.0
297299
httpx-21: httpx>=0.19.0
@@ -368,7 +370,11 @@ commands_pre =
368370

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

371-
pymemcache-{135,200,300,342,400}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
373+
pymemcache-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-0.txt
374+
pymemcache-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-1.txt
375+
pymemcache-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-2.txt
376+
pymemcache-3: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-3.txt
377+
pymemcache-4: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt
372378

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

@@ -558,7 +564,7 @@ commands_pre =
558564
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python[test]
559565
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
560566
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-logging[test]
561-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
567+
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt
562568
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg[test]
563569
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2[test]
564570
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client[test]

0 commit comments

Comments
 (0)