From d4be36b591a095502cd841d721a1a736f6d7bb31 Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Tue, 11 Jul 2023 23:48:53 +0100 Subject: [PATCH 1/6] govuk-frontend 4.7.0 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ea55d9..1714b9f 100644 --- 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.** From 1bd302751434794dce6a7ee5b7a74b209ab765b9 Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Wed, 12 Jul 2023 10:19:05 +0100 Subject: [PATCH 2/6] upgrade requirements --- tests/requirements.in | 4 ++-- tests/requirements.txt | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tests/requirements.in b/tests/requirements.in index 6524e0b..1e4a8f5 100644 --- 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 +flask==2.3.2 govuk-frontend-jinja==2.6.0 -pytest-cov==4.0.0 +pytest-cov==4.1.0 pyyaml==6.0 diff --git a/tests/requirements.txt b/tests/requirements.txt index acb36b1..4ec09c6 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -4,9 +4,11 @@ # # 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 @@ -14,7 +16,7 @@ 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 @@ -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 From 0864f201627f1925474a8a534ebeec2cc34cb8c7 Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Wed, 12 Jul 2023 11:22:25 +0100 Subject: [PATCH 3/6] prep 2.5.0 release --- CHANGELOG.md | 8 +++++++- setup.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c165e0..2bd8b34 100644 --- 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) - xx/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/setup.py b/setup.py index 34ba8fe..87342a4 100644 --- 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", From 7fb7e728f8e111982467303b925e81b61e80b2d2 Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Thu, 13 Jul 2023 14:57:20 +0100 Subject: [PATCH 4/6] formatting --- govuk_frontend_wtf/gov_form_base.py | 1 - govuk_frontend_wtf/wtforms_widgets.py | 1 - 2 files changed, 2 deletions(-) diff --git a/govuk_frontend_wtf/gov_form_base.py b/govuk_frontend_wtf/gov_form_base.py index 7cb57c6..2941a02 100644 --- 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 index dca9d8f..50cca1f 100644 --- 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"] From 185fd732c9e5f290ed9db1eab2a7655ac2e9cabd Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Thu, 13 Jul 2023 15:17:05 +0100 Subject: [PATCH 5/6] update govuk-frontend-jinja --- tests/requirements.in | 2 +- tests/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/requirements.in b/tests/requirements.in index 1e4a8f5..ca19365 100644 --- a/tests/requirements.in +++ b/tests/requirements.in @@ -2,6 +2,6 @@ deepmerge==1.1.0 email_validator==2.0.0.post2 flask-wtf==1.1.1 flask==2.3.2 -govuk-frontend-jinja==2.6.0 +govuk-frontend-jinja==2.7.0 pytest-cov==4.1.0 pyyaml==6.0 diff --git a/tests/requirements.txt b/tests/requirements.txt index 4ec09c6..cbc8821 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -22,7 +22,7 @@ flask==2.3.2 # 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 From 7274ee9c58efc89322209eeeb433fc58f71ab222 Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Thu, 13 Jul 2023 15:22:53 +0100 Subject: [PATCH 6/6] add release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bd8b34..5278813 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [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) - xx/07/2023 +## [2.5.0](https://github.com/LandRegistry/govuk-frontend-wtf/releases/tag/2.5.0) - 13/07/2023 ### Added