Skip to content

Commit aa91017

Browse files
committed
Remove [test] package for django instrumentation
Fixes open-telemetry#2198
1 parent 565e78d commit aa91017

File tree

5 files changed

+79
-16
lines changed

5 files changed

+79
-16
lines changed

Diff for: instrumentation/opentelemetry-instrumentation-django/pyproject.toml

-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ asgi = [
3838
instruments = [
3939
"django >= 1.10",
4040
]
41-
test = [
42-
"opentelemetry-instrumentation-django[instruments]",
43-
"opentelemetry-test-utils == 0.45b0.dev",
44-
]
4541

4642
[project.entry-points.opentelemetry_instrumentor]
4743
django = "opentelemetry.instrumentation.django:DjangoInstrumentor"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
Django==2.2.28
5+
importlib-metadata==6.11.0
6+
iniconfig==2.0.0
7+
packaging==23.2
8+
pluggy==1.4.0
9+
py==1.11.0
10+
py-cpuinfo==9.0.0
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
pytz==2024.1
14+
sqlparse==0.4.4
15+
tomli==2.0.1
16+
typing_extensions==4.10.0
17+
wrapt==1.16.0
18+
zipp==3.17.0
19+
-e ../../../opentelemetry-instrumentation
20+
-e ../../../util/opentelemetry-util-http
21+
-e ../../../instrumentation/opentelemetry-instrumentation-wsgi
22+
-e ../../../instrumentation/opentelemetry-instrumentation-django
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
Django==3.2.24
5+
importlib-metadata==6.11.0
6+
iniconfig==2.0.0
7+
packaging==23.2
8+
pluggy==1.4.0
9+
py==1.11.0
10+
py-cpuinfo==9.0.0
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
pytz==2024.1
14+
sqlparse==0.4.4
15+
tomli==2.0.1
16+
typing_extensions==4.10.0
17+
wrapt==1.16.0
18+
zipp==3.17.0
19+
-e ../../../opentelemetry-instrumentation
20+
-e ../../../util/opentelemetry-util-http
21+
-e ../../../instrumentation/opentelemetry-instrumentation-wsgi
22+
-e ../../../instrumentation/opentelemetry-instrumentation-asgi
23+
-e ../../../instrumentation/opentelemetry-instrumentation-django
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
backports.zoneinfo==0.2.1
4+
Deprecated==1.2.14
5+
Django==4.2.10
6+
importlib-metadata==6.11.0
7+
iniconfig==2.0.0
8+
packaging==23.2
9+
pluggy==1.4.0
10+
py==1.11.0
11+
py-cpuinfo==9.0.0
12+
pytest==7.1.3
13+
pytest-benchmark==4.0.0
14+
sqlparse==0.4.4
15+
tomli==2.0.1
16+
typing_extensions==4.10.0
17+
wrapt==1.16.0
18+
zipp==3.17.0
19+
-e ../../../opentelemetry-instrumentation
20+
-e ../../../util/opentelemetry-util-http
21+
-e ../../../instrumentation/opentelemetry-instrumentation-wsgi
22+
-e ../../../instrumentation/opentelemetry-instrumentation-asgi
23+
-e ../../../instrumentation/opentelemetry-instrumentation-django

Diff for: tox.ini

+11-12
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ envlist =
5252
; Only officially supported Python versions are tested for each Django
5353
; major release. Updated list can be found at:
5454
; https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django
55-
py3{8,9}-test-instrumentation-django-2
56-
py3{8,9,10,11}-test-instrumentation-django-3
57-
py3{8,9,10,11}-test-instrumentation-django-4
58-
pypy3-test-instrumentation-django-{2,3}
55+
py3{8,9}-test-instrumentation-django-0
56+
py3{8,9,10,11}-test-instrumentation-django-1
57+
py3{8,9,10,11}-test-instrumentation-django-2
58+
pypy3-test-instrumentation-django-{0,1}
5959

6060
; opentelemetry-instrumentation-dbapi
6161
py3{8,9,10,11}-test-instrumentation-dbapi
@@ -255,9 +255,6 @@ deps =
255255
test: pytest-benchmark
256256
coverage: pytest
257257
coverage: pytest-cov
258-
django-2: django~=2.0
259-
django-3: django~=3.0
260-
django-4: django>=4.0b1,<5.0
261258
elasticsearch-2: elasticsearch-dsl>=2.0,<3.0
262259
elasticsearch-2: elasticsearch>=2.0,<3.0
263260
elasticsearch-5: elasticsearch-dsl>=5.0,<6.0
@@ -333,9 +330,9 @@ commands_pre =
333330

334331
grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
335332

336-
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
337-
wsgi,falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
338-
asgi,django-{3,4},starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
333+
falcon-{1,2,3},flask-{213,220,300},pyramid,tornado,starlette,fastapi,aiohttp,asgi,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http
334+
wsgi,falcon-{1,2,3},flask-{213,220,300},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
335+
asgi,starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
339336

340337
asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
341338

@@ -360,7 +357,9 @@ commands_pre =
360357

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

363-
django-{1,2,3,4}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-django[test]
360+
django-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt
361+
django-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt
362+
django-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-2.txt
364363

365364
fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi[test]
366365

@@ -539,7 +538,7 @@ commands_pre =
539538
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
540539
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore[test]
541540
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs[test]
542-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-django[test]
541+
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-django
543542
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette[test]
544543
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
545544
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]

0 commit comments

Comments
 (0)