Skip to content

Commit f6bd65e

Browse files
committed
Merge branch 'release/8.2.1'
2 parents 86fd526 + ad38033 commit f6bd65e

File tree

6 files changed

+32
-13
lines changed

6 files changed

+32
-13
lines changed

.github/dependabot.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ updates:
55
schedule:
66
interval: daily
77
time: "04:00"
8-
open-pull-requests-limit: 10
8+
open-pull-requests-limit: 1
9+
versioning-strategy: "increase-if-necessary"
910
target-branch: develop
10-
ignore:
11-
- dependency-name: wagtail
12-
versions:
13-
- "2.12"
14-
- 2.12.1
15-
- 2.12.2
16-
- 2.12.3

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
11-
wagtail-version: ["5.2", "6.2", "6.3"]
11+
wagtail-version: ["5.2", "6.3", "6.4"]
1212
django-version: ["4.2", "5.0", "5.1"]
1313
exclude:
1414
- python-version: "3.13"

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,17 @@
22

33
## [Unreleased]
44
### Added
5-
### Fixed
65
### Changed
6+
### Fixed
7+
### Removed
8+
9+
## [8.2.1] - 2025.02.09
10+
### Fixed
11+
- Add support for Wagtail 6.4 (@marteinn)
12+
- Hide WidgetWithScript deprecation warning on Wagtail < 6 (@jorenham)
13+
714
### Removed
15+
- Drop support for Wagtail 6.2 (@marteinn)
816

917
## [8.2.0] - 2025.02.01
1018
### Added

mypy.ini

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[mypy]
2+
check_untyped_defs = True
3+
follow_imports = silent
4+
ignore_missing_imports = True
5+
# no_implicit_optional = True
6+
# show_column_numbers = True
7+
# strict_optional = True
8+
# warn_unused_ignores = False
9+
# warn_return_any = True
10+
# plugins = mypy_django_plugin.main
11+
exclude = venv
12+
13+
[mypy-*.migrations.*]
14+
ignore_errors = True
15+
16+
[mypy.plugins.django-stubs]
17+
django_settings_module = core.settings.mypy}

wagtailgeowidget/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"""
88

99
__title__ = "wagtailgeowidget"
10-
__version__ = "8.2.0"
11-
__build__ = 803
10+
__version__ = "8.2.1"
11+
__build__ = 804
1212
__author__ = "Martin Sandström"
1313
__license__ = "MIT"
1414
__copyright__ = "Copyright 2015-Present Fröjd Interactive"

wagtailgeowidget/widgets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from django.utils.translation import gettext as _
1010
from wagtail import VERSION as WAGTAIL_VERSION
1111
from wagtail.telepath import register
12-
from wagtail.utils.widgets import WidgetWithScript
1312
from wagtail.widget_adapters import WidgetAdapter
1413

1514
try:
@@ -324,6 +323,7 @@ def render(self, name, value, attrs=None, renderer=None):
324323
)
325324

326325
else:
326+
from wagtail.utils.widgets import WidgetWithScript
327327

328328
class GoogleMapsField(WidgetWithScript, forms.HiddenInput):
329329
address_field = None

0 commit comments

Comments
 (0)