Skip to content

Commit f2c536e

Browse files
authoredJan 17, 2024
Fix tox factor matching (#2129)
* Fix tox factor matching Fixes #2128 * Add missing fixes for several test envs * Fix django
1 parent c9d709a commit f2c536e

File tree

3 files changed

+100
-106
lines changed

3 files changed

+100
-106
lines changed
 

‎.github/workflows/instrumentations_0.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
- "logging"
5858
- "mysql"
5959
- "mysqlclient"
60-
- "pika"
60+
- "sio-pika"
6161
- "psycopg2"
6262
- "pymemcache"
6363
- "pymongo"

‎.github/workflows/instrumentations_1.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
python-version: [py37, py38, py39, py310, py311, pypy3]
2727
package:
2828
- "urllib"
29-
- "urllib3"
29+
- "urllib3v"
3030
- "wsgi"
3131
- "distro"
3232
- "richconsole"

‎tox.ini

+98-104
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ envlist =
2222
py3{7,8,9,10,11}-test-opentelemetry-instrumentation
2323
pypy3-test-opentelemetry-instrumentation
2424

25-
py3{7,8,9,10,11}-test-instrumentation-aio-pika
26-
pypy3-test-instrumentation-aio-pika
27-
2825
; opentelemetry-instrumentation-aiohttp-client
2926
py3{7,8,9,10,11}-test-instrumentation-aiohttp-client
3027
pypy3-test-instrumentation-aiohttp-client
@@ -54,11 +51,11 @@ envlist =
5451
; Only officially supported Python versions are tested for each Django
5552
; major release. Updated list can be found at:
5653
; https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django
57-
py3{7}-test-instrumentation-django1
58-
py3{7,8,9}-test-instrumentation-django2
59-
py3{7,8,9,10,11}-test-instrumentation-django3
60-
py3{8,9,10,11}-test-instrumentation-django4
61-
pypy3-test-instrumentation-django{1,2,3}
54+
py3{7}-test-instrumentation-django-1
55+
py3{7,8,9}-test-instrumentation-django-2
56+
py3{7,8,9,10,11}-test-instrumentation-django-3
57+
py3{8,9,10,11}-test-instrumentation-django-4
58+
pypy3-test-instrumentation-django-{1,2,3}
6259

6360
; opentelemetry-instrumentation-dbapi
6461
py3{7,8,9,10,11}-test-instrumentation-dbapi
@@ -70,41 +67,39 @@ envlist =
7067
; pypy3-test-instrumentation-boto
7168

7269
; opentelemetry-instrumentation-elasticsearch
73-
py3{7,8,9,10,11}-test-instrumentation-elasticsearch{2,6}
74-
pypy3-test-instrumentation-elasticsearch{2,6}
75-
76-
; opentelemetry-instrumentation-elasticsearch5
77-
py3{7,8,9}-test-instrumentation-elasticsearch5
78-
pypy3-test-instrumentation-elasticsearch5
70+
py3{7,8,9,10,11}-test-instrumentation-elasticsearch-{2,6}
71+
pypy3-test-instrumentation-elasticsearch-{2,6}
72+
py3{7,8,9}-test-instrumentation-elasticsearch-5
73+
pypy3-test-instrumentation-elasticsearch-5
7974

8075
; opentelemetry-instrumentation-falcon
8176
; py310 does not work with falcon 1
82-
py3{7,8,9}-test-instrumentation-falcon1
83-
py3{7,8,9,10,11}-test-instrumentation-falcon{2,3}
84-
pypy3-test-instrumentation-falcon{1,2,3}
77+
py3{7,8,9}-test-instrumentation-falcon-1
78+
py3{7,8,9,10,11}-test-instrumentation-falcon-{2,3}
79+
pypy3-test-instrumentation-falcon-{1,2,3}
8580

8681
; opentelemetry-instrumentation-fastapi
8782
py3{7,8,9,10,11}-test-instrumentation-fastapi
8883
pypy3-test-instrumentation-fastapi
8984

9085
; opentelemetry-instrumentation-flask
91-
py3{7,8,9,10,11}-test-instrumentation-flask{213,220}
92-
py3{8,9,10,11}-test-instrumentation-flask{300}
93-
pypy3-test-instrumentation-flask{213,220}
86+
py3{7,8,9,10,11}-test-instrumentation-flask-{213,220}
87+
py3{8,9,10,11}-test-instrumentation-flask-{300}
88+
pypy3-test-instrumentation-flask-{213,220}
9489

9590
; opentelemetry-instrumentation-urllib
9691
py3{7,8,9,10,11}-test-instrumentation-urllib
9792
pypy3-test-instrumentation-urllib
9893

9994
; opentelemetry-instrumentation-urllib3
100-
py3{7,8,9,10,11}-test-instrumentation-urllib3v{1,2}
101-
;pypy3-test-instrumentation-urllib3v{1,2}
95+
py3{7,8,9,10,11}-test-instrumentation-urllib3v-{1,2}
96+
;pypy3-test-instrumentation-urllib3v-{1,2}
10297

10398
; opentelemetry-instrumentation-requests
10499
py3{7,8,9,10,11}-test-instrumentation-requests
105100
;pypy3-test-instrumentation-requests
106101

107-
; opentelemetry-instrumentation-starlette.
102+
; opentelemetry-instrumentation-starlette
108103
py3{7,8,9,10,11}-test-instrumentation-starlette
109104
pypy3-test-instrumentation-starlette
110105

@@ -135,8 +130,8 @@ envlist =
135130
; ext-psycopg2 intentionally excluded from pypy3
136131

137132
; opentelemetry-instrumentation-pymemcache
138-
py3{7,8,9,10,11}-test-instrumentation-pymemcache{135,200,300,342,400}
139-
pypy3-test-instrumentation-pymemcache{135,200,300,342,400}
133+
py3{7,8,9,10,11}-test-instrumentation-pymemcache-{135,200,300,342,400}
134+
pypy3-test-instrumentation-pymemcache-{135,200,300,342,400}
140135

141136
; opentelemetry-instrumentation-pymongo
142137
py3{7,8,9,10,11}-test-instrumentation-pymongo
@@ -170,9 +165,9 @@ envlist =
170165
py3{7,8,9,10,11}-test-instrumentation-grpc
171166

172167
; opentelemetry-instrumentation-sqlalchemy
173-
py3{7}-test-instrumentation-sqlalchemy{11}
174-
py3{7,8,9,10,11}-test-instrumentation-sqlalchemy{14}
175-
pypy3-test-instrumentation-sqlalchemy{11,14}
168+
py3{7}-test-instrumentation-sqlalchemy-{11}
169+
py3{7,8,9,10,11}-test-instrumentation-sqlalchemy-{14}
170+
pypy3-test-instrumentation-sqlalchemy-{11,14}
176171

177172
; opentelemetry-instrumentation-redis
178173
py3{7,8,9,10,11}-test-instrumentation-redis
@@ -206,8 +201,8 @@ envlist =
206201
pypy3-test-instrumentation-tortoiseorm
207202

208203
; opentelemetry-instrumentation-httpx
209-
py3{7,8,9,10,11}-test-instrumentation-httpx{18,21}
210-
pypy3-test-instrumentation-httpx{18,21}
204+
py3{7,8,9,10,11}-test-instrumentation-httpx-{18,21}
205+
pypy3-test-instrumentation-httpx-{18,21}
211206

212207
; opentelemetry-util-http
213208
py3{7,8,9,10,11}-test-util-http
@@ -221,13 +216,13 @@ envlist =
221216
py3{7,8,9,10,11}-test-propagator-ot-trace
222217
pypy3-test-propagator-ot-trace
223218

224-
; opentelemetry-instrumentation-pika
225-
py3{7,8,9,10,11}-test-instrumentation-pika{0,1}
226-
pypy3-test-instrumentation-pika{0,1}
219+
; opentelemetry-instrumentation-sio-pika
220+
py3{7,8,9,10,11}-test-instrumentation-sio-pika-{0,1}
221+
pypy3-test-instrumentation-sio-pika-{0,1}
227222

228223
; opentelemetry-instrumentation-aio-pika
229-
py3{7,8,9,10,11}-test-instrumentation-aio-pika{7,8,9}
230-
pypy3-test-instrumentation-aio-pika{7,8,9}
224+
py3{7,8,9,10,11}-test-instrumentation-aio-pika-{7,8,9}
225+
pypy3-test-instrumentation-aio-pika-{7,8,9}
231226

232227
; opentelemetry-instrumentation-kafka-python
233228
py3{7,8,9,10,11}-test-instrumentation-kafka-python
@@ -255,50 +250,50 @@ deps =
255250
test: pytest-benchmark
256251
coverage: pytest
257252
coverage: pytest-cov
258-
django1: django~=1.0
259-
django2: django~=2.0
260-
django3: django~=3.0
261-
django4: django>=4.0b1,<5.0
262-
elasticsearch2: elasticsearch-dsl>=2.0,<3.0
263-
elasticsearch2: elasticsearch>=2.0,<3.0
264-
elasticsearch5: elasticsearch-dsl>=5.0,<6.0
265-
elasticsearch5: elasticsearch>=5.0,<6.0
266-
elasticsearch6: elasticsearch-dsl>=6.0,<7.0
267-
elasticsearch6: elasticsearch>=6.0,<7.0
253+
django-1: django~=1.0
254+
django-2: django~=2.0
255+
django-3: django~=3.0
256+
django-4: django>=4.0b1,<5.0
257+
elasticsearch-2: elasticsearch-dsl>=2.0,<3.0
258+
elasticsearch-2: elasticsearch>=2.0,<3.0
259+
elasticsearch-5: elasticsearch-dsl>=5.0,<6.0
260+
elasticsearch-5: elasticsearch>=5.0,<6.0
261+
elasticsearch-6: elasticsearch-dsl>=6.0,<7.0
262+
elasticsearch-6: elasticsearch>=6.0,<7.0
268263
; FIXME: Elasticsearch >=7 causes CI workflow tests to hang, see open-telemetry/opentelemetry-python-contrib#620
269-
; elasticsearch7: elasticsearch-dsl>=7.0,<8.0
270-
; elasticsearch7: elasticsearch>=7.0,<8.0
271-
; elasticsearch8: elasticsearch-dsl>=8.0,<9.0
272-
; elasticsearch8: elasticsearch>=8.0,<9.0
273-
falcon1: falcon ==1.4.1
274-
falcon2: falcon >=2.0.0,<3.0.0
275-
falcon3: falcon >=3.0.0,<4.0.0
276-
flask213: Flask ==2.1.3
277-
flask213: Werkzeug <3.0.0
278-
flask220: Flask ==2.2.0
279-
flask220: Werkzeug <3.0.0
280-
flask300: Flask >=3.0.0
281-
flask300: Werkzeug >=3.0.0
264+
; elasticsearch-7: elasticsearch-dsl>=7.0,<8.0
265+
; elasticsearch-7: elasticsearch>=7.0,<8.0
266+
; elasticsearch-8: elasticsearch-dsl>=8.0,<9.0
267+
; elasticsearch-8: elasticsearch>=8.0,<9.0
268+
falcon-1: falcon ==1.4.1
269+
falcon-2: falcon >=2.0.0,<3.0.0
270+
falcon-3: falcon >=3.0.0,<4.0.0
271+
flask-213: Flask ==2.1.3
272+
flask-213: Werkzeug <3.0.0
273+
flask-220: Flask ==2.2.0
274+
flask-220: Werkzeug <3.0.0
275+
flask-300: Flask >=3.0.0
276+
flask-300: Werkzeug >=3.0.0
282277
grpc: pytest-asyncio
283-
sqlalchemy11: sqlalchemy>=1.1,<1.2
284-
sqlalchemy14: aiosqlite
285-
sqlalchemy14: sqlalchemy~=1.4
286-
pika0: pika>=0.12.0,<1.0.0
287-
pika1: pika>=1.0.0
288-
aio-pika7: aio_pika~=7.2.0
289-
aio-pika8: aio_pika>=8.0.0,<9.0.0
290-
aio-pika9: aio_pika>=9.0.0,<10.0.0
291-
pymemcache135: pymemcache ==1.3.5
292-
pymemcache200: pymemcache >2.0.0,<3.0.0
293-
pymemcache300: pymemcache >3.0.0,<3.4.2
294-
pymemcache342: pymemcache ==3.4.2
295-
pymemcache400: pymemcache ==4.0.0
296-
httpx18: httpx>=0.18.0,<0.19.0
297-
httpx18: respx~=0.17.0
298-
httpx21: httpx>=0.19.0
299-
httpx21: respx~=0.20.1
300-
urllib3v1: urllib3 >=1.0.0,<2.0.0
301-
urllib3v2: urllib3 >=2.0.0,<3.0.0
278+
sqlalchemy-11: sqlalchemy>=1.1,<1.2
279+
sqlalchemy-14: aiosqlite
280+
sqlalchemy-14: sqlalchemy~=1.4
281+
sio-pika-0: pika>=0.12.0,<1.0.0
282+
sio-pika-1: pika>=1.0.0
283+
aio-pika-7: aio_pika~=7.2.0
284+
aio-pika-8: aio_pika>=8.0.0,<9.0.0
285+
aio-pika-9: aio_pika>=9.0.0,<10.0.0
286+
pymemcache-135: pymemcache ==1.3.5
287+
pymemcache-200: pymemcache >2.0.0,<3.0.0
288+
pymemcache-300: pymemcache >3.0.0,<3.4.2
289+
pymemcache-342: pymemcache ==3.4.2
290+
pymemcache-400: pymemcache ==4.0.0
291+
httpx-18: httpx>=0.18.0,<0.19.0
292+
httpx-18: respx~=0.17.0
293+
httpx-21: httpx>=0.19.0
294+
httpx-21: respx~=0.20.1
295+
urllib3v-1: urllib3 >=1.0.0,<2.0.0
296+
urllib3v-2: urllib3 >=2.0.0,<3.0.0
302297

303298
; FIXME: add coverage testing
304299
; FIXME: add mypy testing
@@ -312,7 +307,6 @@ setenv =
312307
changedir =
313308
test-distro: opentelemetry-distro/tests
314309
test-opentelemetry-instrumentation: opentelemetry-instrumentation/tests
315-
test-instrumentation-aio-pika: instrumentation/opentelemetry-instrumentation-aio-pika/tests
316310
test-instrumentation-aiohttp-client: instrumentation/opentelemetry-instrumentation-aiohttp-client/tests
317311
test-instrumentation-aiohttp-server: instrumentation/opentelemetry-instrumentation-aiohttp-server/tests
318312
test-instrumentation-aiopg: instrumentation/opentelemetry-instrumentation-aiopg/tests
@@ -325,39 +319,39 @@ changedir =
325319
test-instrumentation-cassandra: instrumentation/opentelemetry-instrumentation-cassandra/tests
326320
test-instrumentation-celery: instrumentation/opentelemetry-instrumentation-celery/tests
327321
test-instrumentation-dbapi: instrumentation/opentelemetry-instrumentation-dbapi/tests
328-
test-instrumentation-django{1,2,3,4}: instrumentation/opentelemetry-instrumentation-django/tests
329-
test-instrumentation-elasticsearch{2,5,6}: instrumentation/opentelemetry-instrumentation-elasticsearch/tests
330-
test-instrumentation-falcon{1,2,3}: instrumentation/opentelemetry-instrumentation-falcon/tests
322+
test-instrumentation-django-{1,2,3,4}: instrumentation/opentelemetry-instrumentation-django/tests
323+
test-instrumentation-elasticsearch-{2,5,6}: instrumentation/opentelemetry-instrumentation-elasticsearch/tests
324+
test-instrumentation-falcon-{1,2,3}: instrumentation/opentelemetry-instrumentation-falcon/tests
331325
test-instrumentation-fastapi: instrumentation/opentelemetry-instrumentation-fastapi/tests
332-
test-instrumentation-flask{213,220,300}: instrumentation/opentelemetry-instrumentation-flask/tests
326+
test-instrumentation-flask-{213,220,300}: instrumentation/opentelemetry-instrumentation-flask/tests
333327
test-instrumentation-urllib: instrumentation/opentelemetry-instrumentation-urllib/tests
334-
test-instrumentation-urllib3v{1,2}: instrumentation/opentelemetry-instrumentation-urllib3/tests
328+
test-instrumentation-urllib3v-{1,2}: instrumentation/opentelemetry-instrumentation-urllib3/tests
335329
test-instrumentation-grpc: instrumentation/opentelemetry-instrumentation-grpc/tests
336330
test-instrumentation-jinja2: instrumentation/opentelemetry-instrumentation-jinja2/tests
337331
test-instrumentation-kafka-python: instrumentation/opentelemetry-instrumentation-kafka-python/tests
338332
test-instrumentation-confluent-kafka: instrumentation/opentelemetry-instrumentation-confluent-kafka/tests
339333
test-instrumentation-logging: instrumentation/opentelemetry-instrumentation-logging/tests
340334
test-instrumentation-mysql: instrumentation/opentelemetry-instrumentation-mysql/tests
341335
test-instrumentation-mysqlclient: instrumentation/opentelemetry-instrumentation-mysqlclient/tests
342-
test-instrumentation-pika{0,1}: instrumentation/opentelemetry-instrumentation-pika/tests
343-
test-instrumentation-aio-pika{7,8,9}: instrumentation/opentelemetry-instrumentation-aio-pika/tests
336+
test-instrumentation-sio-pika-{0,1}: instrumentation/opentelemetry-instrumentation-pika/tests
337+
test-instrumentation-aio-pika-{7,8,9}: instrumentation/opentelemetry-instrumentation-aio-pika/tests
344338
test-instrumentation-psycopg2: instrumentation/opentelemetry-instrumentation-psycopg2/tests
345-
test-instrumentation-pymemcache{135,200,300,342,400}: instrumentation/opentelemetry-instrumentation-pymemcache/tests
339+
test-instrumentation-pymemcache-{135,200,300,342,400}: instrumentation/opentelemetry-instrumentation-pymemcache/tests
346340
test-instrumentation-pymongo: instrumentation/opentelemetry-instrumentation-pymongo/tests
347341
test-instrumentation-pymysql: instrumentation/opentelemetry-instrumentation-pymysql/tests
348342
test-instrumentation-pyramid: instrumentation/opentelemetry-instrumentation-pyramid/tests
349343
test-instrumentation-redis: instrumentation/opentelemetry-instrumentation-redis/tests
350344
test-instrumentation-remoulade: instrumentation/opentelemetry-instrumentation-remoulade/tests
351345
test-instrumentation-requests: instrumentation/opentelemetry-instrumentation-requests/tests
352346
test-instrumentation-sklearn: instrumentation/opentelemetry-instrumentation-sklearn/tests
353-
test-instrumentation-sqlalchemy{11,14}: instrumentation/opentelemetry-instrumentation-sqlalchemy/tests
347+
test-instrumentation-sqlalchemy-{11,14}: instrumentation/opentelemetry-instrumentation-sqlalchemy/tests
354348
test-instrumentation-sqlite3: instrumentation/opentelemetry-instrumentation-sqlite3/tests
355349
test-instrumentation-starlette: instrumentation/opentelemetry-instrumentation-starlette/tests
356350
test-instrumentation-system-metrics: instrumentation/opentelemetry-instrumentation-system-metrics/tests
357351
test-instrumentation-tornado: instrumentation/opentelemetry-instrumentation-tornado/tests
358352
test-instrumentation-tortoiseorm: instrumentation/opentelemetry-instrumentation-tortoiseorm/tests
359353
test-instrumentation-wsgi: instrumentation/opentelemetry-instrumentation-wsgi/tests
360-
test-instrumentation-httpx{18,21}: instrumentation/opentelemetry-instrumentation-httpx/tests
354+
test-instrumentation-httpx-{18,21}: instrumentation/opentelemetry-instrumentation-httpx/tests
361355
test-util-http: util/opentelemetry-util-http/tests
362356
test-sdkextension-aws: sdk-extension/opentelemetry-sdk-extension-aws/tests
363357
test-resource-detector-container: resource/opentelemetry-resource-detector-container/tests
@@ -381,19 +375,19 @@ commands_pre =
381375

382376
celery: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test]
383377

384-
pika{0,1}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
378+
sio-pika-{0,1}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
385379

386-
aio-pika{7,8,9}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
380+
aio-pika-{7,8,9}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
387381

388382
kafka-python: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python[test]
389383

390384
confluent-kafka: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
391385

392386
grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
393387

394-
falcon{1,2,3},flask{213,220,300},django{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,asgi,httpx{18,21},requests,urllib,urllib3v{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http[test]
395-
wsgi,falcon{1,2,3},flask{213,220,300},django{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
396-
asgi,django{3,4},starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
388+
falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,asgi,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http
389+
wsgi,falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
390+
asgi,django-{3,4},starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
397391

398392
asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
399393

@@ -404,29 +398,29 @@ commands_pre =
404398

405399
boto3sqs: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs[test]
406400

407-
falcon{1,2,3}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]
401+
falcon-{1,2,3}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]
408402

409-
flask{213,220,300}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test]
403+
flask-{213,220,300}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test]
410404

411405
urllib: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib[test]
412406

413-
urllib3v{1,2}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3[test]
407+
urllib3v-{1,2}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3[test]
414408

415409
botocore: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore[test]
416410

417411
cassandra: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra[test]
418412

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

421-
django{1,2,3,4}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-django[test]
415+
django-{1,2,3,4}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-django[test]
422416

423417
fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi[test]
424418

425419
mysql: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql[test]
426420

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

429-
pymemcache{135,200,300,342,400}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
423+
pymemcache-{135,200,300,342,400}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
430424

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

@@ -456,7 +450,7 @@ commands_pre =
456450

457451
logging: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-logging[test]
458452

459-
aio-pika: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
453+
aio-pika-{7,8,9}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
460454

461455
aiohttp-client: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client[test]
462456

@@ -470,17 +464,17 @@ commands_pre =
470464

471465
sklearn: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test]
472466

473-
sqlalchemy{11,14}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
467+
sqlalchemy-{11,14}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
474468

475-
elasticsearch{2,5,6}: pip install {toxinidir}/opentelemetry-instrumentation[test] {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch[test]
469+
elasticsearch-{2,5,6}: pip install {toxinidir}/opentelemetry-instrumentation[test] {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch[test]
476470

477-
httpx{18,21}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx[test]
471+
httpx-{18,21}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx[test]
478472

479473
sdkextension-aws: pip install {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws[test]
480474

481475
resource-detector-container: pip install {toxinidir}/resource/opentelemetry-resource-detector-container[test]
482476

483-
http: pip install {toxinidir}/util/opentelemetry-util-http[test]
477+
http: pip install {toxinidir}/util/opentelemetry-util-http
484478
; In order to get a health coverage report,
485479
propagator-ot-trace: pip install {toxinidir}/propagator/opentelemetry-propagator-ot-trace[test]
486480

@@ -531,7 +525,7 @@ commands_pre =
531525
python -m pip install "{env:CORE_REPO}#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions"
532526
python -m pip install "{env:CORE_REPO}#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
533527
python -m pip install "{env:CORE_REPO}#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils"
534-
python -m pip install -e {toxinidir}/util/opentelemetry-util-http[test]
528+
python -m pip install -e {toxinidir}/util/opentelemetry-util-http
535529
python -m pip install -e {toxinidir}/opentelemetry-instrumentation[test]
536530
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
537531
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi[test]

0 commit comments

Comments
 (0)
Please sign in to comment.