Skip to content

Commit 93e7db8

Browse files
authored
ext/django: django downgrade to 1.10 (#717)
Adding support for django 1.10+
1 parent b799e54 commit 93e7db8

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

ext/opentelemetry-ext-django/setup.cfg

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,19 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31+
Programming Language :: Python :: 3.4
32+
Programming Language :: Python :: 3.5
3133
Programming Language :: Python :: 3.6
3234
Programming Language :: Python :: 3.7
3335
Programming Language :: Python :: 3.8
3436

3537
[options]
36-
python_requires = >=3.6
38+
python_requires = >=3.4
3739
package_dir=
3840
=src
3941
packages=find_namespace:
4042
install_requires =
41-
django >= 2.2
43+
django >= 1.10
4244
opentelemetry-ext-wsgi == 0.8.dev0
4345
opentelemetry-auto-instrumentation == 0.8.dev0
4446
opentelemetry-api == 0.8.dev0

ext/opentelemetry-ext-django/src/opentelemetry/ext/django/middleware.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
from logging import getLogger
1616

17-
from django.utils.deprecation import MiddlewareMixin
18-
1917
from opentelemetry.context import attach, detach
2018
from opentelemetry.ext.django.version import __version__
2119
from opentelemetry.ext.wsgi import (
@@ -26,6 +24,11 @@
2624
from opentelemetry.propagators import extract
2725
from opentelemetry.trace import SpanKind, get_tracer
2826

27+
try:
28+
from django.utils.deprecation import MiddlewareMixin
29+
except ImportError:
30+
MiddlewareMixin = object
31+
2932
_logger = getLogger(__name__)
3033

3134

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ envlist =
2929
pypy3-test-ext-aiohttp-client
3030

3131
; opentelemetry-ext-django
32-
py3{6,7,8}-test-ext-django
32+
py3{4,5,6,7,8}-test-ext-django
3333
pypy3-test-ext-django
3434

3535
; opentelemetry-ext-dbapi

0 commit comments

Comments
 (0)