Skip to content

Commit cfe02dc

Browse files
committed
Remove [test] package from pymemcache instrumentation
Fixes #2211
1 parent 8daa8ad commit cfe02dc

File tree

7 files changed

+103
-14
lines changed

7 files changed

+103
-14
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

+9-10
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ 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+
py3{8,9,10,11}-test-instrumentation-pymemcache-{0,1,2,3,4}
140+
pypy3-test-instrumentation-pymemcache-{0,1,2,3,4}
141141

142142
; opentelemetry-instrumentation-pymongo
143143
py3{8,9,10,11}-test-instrumentation-pymongo
@@ -287,11 +287,6 @@ deps =
287287
aio-pika-7: aio_pika~=7.2.0
288288
aio-pika-8: aio_pika>=8.0.0,<9.0.0
289289
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
295290
httpx-18: httpx>=0.18.0,<0.19.0
296291
httpx-18: respx~=0.17.0
297292
httpx-21: httpx>=0.19.0
@@ -341,7 +336,7 @@ changedir =
341336
test-instrumentation-aio-pika-{8,9}: instrumentation/opentelemetry-instrumentation-aio-pika/tests
342337
test-instrumentation-psycopg: instrumentation/opentelemetry-instrumentation-psycopg/tests
343338
test-instrumentation-psycopg2: instrumentation/opentelemetry-instrumentation-psycopg2/tests
344-
test-instrumentation-pymemcache-{135,200,300,342,400}: instrumentation/opentelemetry-instrumentation-pymemcache/tests
339+
test-instrumentation-pymemcache-{0,1,2,3,4}: instrumentation/opentelemetry-instrumentation-pymemcache/tests
345340
test-instrumentation-pymongo: instrumentation/opentelemetry-instrumentation-pymongo/tests
346341
test-instrumentation-pymysql: instrumentation/opentelemetry-instrumentation-pymysql/tests
347342
test-instrumentation-pyramid: instrumentation/opentelemetry-instrumentation-pyramid/tests
@@ -426,7 +421,11 @@ commands_pre =
426421

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

429-
pymemcache-{135,200,300,342,400}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
424+
pymemcache-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-0.txt
425+
pymemcache-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-1.txt
426+
pymemcache-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-2.txt
427+
pymemcache-3: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-3.txt
428+
pymemcache-4: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt
430429

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

@@ -561,7 +560,7 @@ commands_pre =
561560
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python[test]
562561
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
563562
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-logging[test]
564-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
563+
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache
565564
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg[test]
566565
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2[test]
567566
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client[test]

0 commit comments

Comments
 (0)