Skip to content

Commit

Permalink
Add support for django 4.0 (#62)
Browse files Browse the repository at this point in the history
  • Loading branch information
kernicPanel committed Jan 7, 2022
1 parent 7257535 commit 5e30d69
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
6 changes: 4 additions & 2 deletions src/dockerflow/django/middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@ class DockerflowMiddleware(MiddlewareMixin):
(re.compile(r"/__lbheartbeat__/?$"), views.lbheartbeat),
]

def __init__(self, *args, **kwargs):
super(DockerflowMiddleware, self).__init__(*args, **kwargs)
def __init__(self, get_response=None, *args, **kwargs):
super(DockerflowMiddleware, self).__init__(
get_response=get_response, *args, **kwargs
)
self.summary_logger = logging.getLogger("request.summary")

def process_request(self, request):
Expand Down
4 changes: 2 additions & 2 deletions src/dockerflow/django/signals.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ def heartbeat_failed_handler(sender, level, **kwargs):
"""
from django.dispatch import Signal

heartbeat_passed = Signal(providing_args=["level"])
heartbeat_failed = Signal(providing_args=["level"])
heartbeat_passed = Signal()
heartbeat_failed = Signal()
1 change: 1 addition & 0 deletions tests/constraints/django-4.0.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Django>=4.0,<4.1
5 changes: 3 additions & 2 deletions tests/django/test_django.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from django.core.exceptions import ImproperlyConfigured
from django.db import connection
from django.db.utils import OperationalError, ProgrammingError
from django.http import HttpResponse
from django.test.utils import CaptureQueriesContext

from dockerflow import health
Expand All @@ -35,7 +36,7 @@ def reset_checks():

@pytest.fixture
def dockerflow_middleware():
return DockerflowMiddleware()
return DockerflowMiddleware(get_response=HttpResponse())


@pytest.mark.parametrize("request_path", ["/__version__", "/__version__/"])
Expand Down Expand Up @@ -155,7 +156,7 @@ def process_request(self, request):
def process_response(self, request, response):
return response

hostile_middleware = HostileMiddleware()
hostile_middleware = HostileMiddleware(get_response=HttpResponse())
response = dockerflow_middleware.process_request(dockerflow_request)
response = hostile_middleware.process_request(dockerflow_request)
response = hostile_middleware.process_response(dockerflow_request, response)
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ envlist =
py38-lint
py38-docs
py{36,37,38,39}-dj{22,30,31}
py{38,39}-dj{40}
py{36,37,38,39}-fl{011,012,10}
py{36,37,38,39}-s{19,20}

Expand All @@ -23,20 +24,21 @@ setenv =
PYTHONPATH = {toxinidir}
deps =
-rtests/requirements/default.txt
dj{22,30,31}: -rtests/requirements/django.txt
dj{22,30,31,40}: -rtests/requirements/django.txt
fl{011,012,10}: -rtests/requirements/flask.txt
s{19,20}: -rtests/requirements/sanic.txt
dj22: -ctests/constraints/django-2.2.txt
dj30: -ctests/constraints/django-3.0.txt
dj31: -ctests/constraints/django-3.1.txt
dj40: -ctests/constraints/django-4.0.txt
fl011: -ctests/constraints/flask-0.11.txt
fl012: -ctests/constraints/flask-0.12.txt
fl10: -ctests/constraints/flask-1.0.txt
s19: -ctests/constraints/sanic-19.txt
s20: -ctests/constraints/sanic-20.txt
commands =
python --version
dj{22,30,31}: pytest tests/core/ tests/django --nomigrations {posargs:}
dj{22,30,31,40}: pytest tests/core/ tests/django --nomigrations {posargs:}
fl{011,012,10}: pytest tests/core/ tests/flask/ {posargs:}
s{19,20}: pytest tests/core/ tests/sanic/ {posargs:}

Expand Down

0 comments on commit 5e30d69

Please sign in to comment.