FIX

open-telemetry · Mar 12, 2024 · 3fa9cad · 3fa9cad
1 parent 4530f16
commit 3fa9cad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 26 deletions.
diff --git a/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt b/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt
@@ -1,7 +1,7 @@
 asgiref==3.7.2
 attrs==23.2.0
 Deprecated==1.2.14
-Django==3.2.24
+Django==4.2.10
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==23.2
@@ -10,7 +10,6 @@ py==1.11.0
 py-cpuinfo==9.0.0
 pytest==7.1.3
 pytest-benchmark==4.0.0
-pytz==2024.1
 sqlparse==0.4.4
 tomli==2.0.1
 typing_extensions==4.10.0
@@ -19,4 +18,5 @@ zipp==3.17.0
 -e opentelemetry-instrumentation
 -e util/opentelemetry-util-http
 -e instrumentation/opentelemetry-instrumentation-wsgi
+-e instrumentation/opentelemetry-instrumentation-asgi
 -e instrumentation/opentelemetry-instrumentation-django
diff --git a/instrumentation/opentelemetry-instrumentation-django/test-requirements-4.txt b/instrumentation/opentelemetry-instrumentation-django/test-requirements-4.txt
diff --git a/tox.ini b/tox.ini
@@ -55,8 +55,8 @@ envlist =
     py3{8,9}-test-instrumentation-django-0
     py3{8,9}-test-instrumentation-django-1
     py3{8,9}-test-instrumentation-django-2
+    py3{10,11}-test-instrumentation-django-1
     py3{10,11}-test-instrumentation-django-3
-    py3{10,11}-test-instrumentation-django-4
     pypy3-test-instrumentation-django-{0,1}
 
     ; opentelemetry-instrumentation-dbapi
@@ -362,8 +362,8 @@ commands_pre =
   py3{8,9}-test-instrumentation-django-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt
   py3{8,9}-test-instrumentation-django-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt
   py3{8,9}-test-instrumentation-django-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-2.txt
+  py3{10,11}-test-instrumentation-django-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt
   py3{10,11}-test-instrumentation-django-3: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt
-  py3{10,11}-test-instrumentation-django-4: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-4.txt
   pypy3-test-instrumentation-django-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt
   pypy3-test-instrumentation-django-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt
 
@@ -544,7 +544,7 @@ commands_pre =
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs[test]
-  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-4.txt
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]