Skip to content

Commit 7b84aa6

Browse files
committed
Bump version to 2.3; fix linter errors
1 parent 65191ed commit 7b84aa6

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ exclude = .*,migrations
77

88
[mypy]
99
ignore_missing_imports = True
10+
check_untyped_defs = True
1011

1112
[tool:pytest]
1213
DJANGO_SETTINGS_MODULE = testproject.settings

setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@
2727
"Framework :: Django",
2828
"Framework :: Wagtail",
2929
"Framework :: Wagtail :: 3",
30+
"Framework :: Wagtail :: 4",
31+
"Framework :: Wagtail :: 5",
3032
],
3133
)

wagtailcache/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
release = ["2", "2", "1"]
1+
release = ["2", "3", "0"]
22
__version__ = "{0}.{1}.{2}".format(release[0], release[1], release[2])
33
__shortversion__ = "{0}.{1}".format(release[0], release[1])

wagtailcache/cache.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,14 @@
1313
from django.core.handlers.wsgi import WSGIRequest
1414
from django.http.response import HttpResponse
1515
from django.template.response import SimpleTemplateResponse
16-
from django.utils.cache import (cc_delim_re, get_cache_key, get_max_age,
17-
has_vary_header, learn_cache_key,
18-
patch_response_headers)
16+
from django.utils.cache import (
17+
cc_delim_re,
18+
get_cache_key,
19+
get_max_age,
20+
has_vary_header,
21+
learn_cache_key,
22+
patch_response_headers,
23+
)
1924
from django.utils.deprecation import MiddlewareMixin
2025
from wagtail import hooks
2126
from wagtailcache.settings import wagtailcache_settings
@@ -421,7 +426,7 @@ def serve_password_required_response(self, request, form, action_url):
421426
"""
422427
Add a cache-control header if the page requires a password.
423428
"""
424-
response = super().serve_password_required_response(
429+
response = super().serve_password_required_response( # type: ignore
425430
request, form, action_url
426431
)
427432
response["Cache-Control"] = CacheControl.PRIVATE.value
@@ -432,8 +437,8 @@ def serve(self, request, *args, **kwargs):
432437
Add a custom cache-control header, or set to private if the page is
433438
being served behind a view restriction.
434439
"""
435-
response = super().serve(request, *args, **kwargs)
436-
if self.get_view_restrictions():
440+
response = super().serve(request, *args, **kwargs) # type: ignore
441+
if self.get_view_restrictions(): # type: ignore
437442
response["Cache-Control"] = CacheControl.PRIVATE.value
438443
elif hasattr(self, "cache_control"):
439444
if callable(self.cache_control):

wagtailcache/settings.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88

99
class _DefaultSettings:
10-
1110
WAGTAIL_CACHE = True
1211
WAGTAIL_CACHE_BACKEND = "default"
1312
WAGTAIL_CACHE_HEADER = "X-Wagtail-Cache"

0 commit comments

Comments
 (0)