Merge pull request #76 from LandRegistry/govuk-frontend-47

GOV.UK Frontend 4.7.0
LandRegistry · Jul 13, 2023 · 950bf14 · 950bf14
2 parents d767604 + 7274ee9
commit 950bf14
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/LandRegistry/govuk-frontend-wtf/compare/2.4.0..main)
+## [Unreleased](https://github.com/LandRegistry/govuk-frontend-wtf/compare/2.5.0..main)
+
+## [2.5.0](https://github.com/LandRegistry/govuk-frontend-wtf/releases/tag/2.5.0) - 13/07/2023
+
+### Added
+
+- [GOV.UK Frontend v4.7.0](https://github.com/alphagov/govuk-frontend/releases/tag/v4.7.0) support
 
 ## [2.4.0](https://github.com/LandRegistry/govuk-frontend-wtf/releases/tag/2.4.0) - 25/04/2023
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # GOV.UK Frontend WTForms Widgets
 
 [![PyPI version](https://badge.fury.io/py/govuk-frontend-wtf.svg)](https://pypi.org/project/govuk-frontend-wtf/)
-![govuk-frontend 4.6.0](https://img.shields.io/badge/govuk--frontend%20version-4.6.0-005EA5?logo=gov.uk&style=flat)
+![govuk-frontend 4.7.0](https://img.shields.io/badge/govuk--frontend%20version-4.7.0-005EA5?logo=gov.uk&style=flat)
 [![Python package](https://github.com/LandRegistry/govuk-frontend-wtf/actions/workflows/python-package.yml/badge.svg)](https://github.com/LandRegistry/govuk-frontend-wtf/actions/workflows/python-package.yml)
 
 **GOV.UK Frontend WTForms is a [community tool](https://design-system.service.gov.uk/community/resources-and-tools/) of the [GOV.UK Design System](https://design-system.service.gov.uk/). The Design System team is not responsible for it and cannot support you with using it. Contact the [maintainers](#contributors) directly if you need [help](#support) or you want to request a feature.**

diff --git a/govuk_frontend_wtf/gov_form_base.py b/govuk_frontend_wtf/gov_form_base.py
@@ -111,7 +111,6 @@ def map_gov_params(self, field, **kwargs):
 
         # Merge in any extra params passed in from the template layer
         if "params" in kwargs:
-
             # Merge items individually as otherwise the merge will append new ones
             if "items" in kwargs["params"]:
                 for index, item in enumerate(kwargs["params"]["items"]):

diff --git a/govuk_frontend_wtf/wtforms_widgets.py b/govuk_frontend_wtf/wtforms_widgets.py
@@ -323,7 +323,6 @@ def __call__(self, field, **kwargs):
         return super().__call__(field, **kwargs)
 
     def map_gov_params(self, field, **kwargs):
-
         params = super().map_gov_params(field, **kwargs)
 
         params["items"] = kwargs["items"]

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 
 setuptools.setup(
     name="govuk-frontend-wtf",
-    version="2.4.0",
+    version="2.5.0",
     author="Matt Shaw",
     author_email="matthew.shaw@landregistry.gov.uk",
     description="GOV.UK Frontend WTForms Widgets",

diff --git a/tests/requirements.in b/tests/requirements.in
@@ -1,7 +1,7 @@
 deepmerge==1.1.0
 email_validator==2.0.0.post2
 flask-wtf==1.1.1
-flask==2.2.3
-govuk-frontend-jinja==2.6.0
-pytest-cov==4.0.0
+flask==2.3.2
+govuk-frontend-jinja==2.7.0
+pytest-cov==4.1.0
 pyyaml==6.0
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -4,23 +4,25 @@
 #
 #    pip-compile requirements.in
 #
-click==8.1.3
+blinker==1.6.2
     # via flask
-coverage[toml]==7.2.3
+click==8.1.4
+    # via flask
+coverage[toml]==7.2.7
     # via pytest-cov
 deepmerge==1.1.0
     # via -r requirements.in
 dnspython==2.3.0
     # via email-validator
 email-validator==2.0.0.post2
     # via -r requirements.in
-flask==2.2.3
+flask==2.3.2
     # via
     #   -r requirements.in
     #   flask-wtf
 flask-wtf==1.1.1
     # via -r requirements.in
-govuk-frontend-jinja==2.6.0
+govuk-frontend-jinja==2.7.0
     # via -r requirements.in
 idna==3.4
     # via email-validator
@@ -34,22 +36,22 @@ jinja2==3.1.2
     # via
     #   flask
     #   govuk-frontend-jinja
-markupsafe==2.1.2
+markupsafe==2.1.3
     # via
     #   jinja2
     #   werkzeug
     #   wtforms
 packaging==23.1
     # via pytest
-pluggy==1.0.0
+pluggy==1.2.0
     # via pytest
-pytest==7.3.1
+pytest==7.4.0
     # via pytest-cov
-pytest-cov==4.0.0
+pytest-cov==4.1.0
     # via -r requirements.in
 pyyaml==6.0
     # via -r requirements.in
-werkzeug==2.2.3
+werkzeug==2.3.6
     # via flask
 wtforms==3.0.1
     # via flask-wtf