From f8c53317431be04a8b917473609760d5e42dcfbe Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Wed, 18 May 2022 02:56:44 +0100 Subject: [PATCH 1/7] govuk-frontend 4.1.0 --- app/templates/base.html | 14 +++++++------- build.sh | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/templates/base.html b/app/templates/base.html index 06d7fed..c33735a 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -8,8 +8,8 @@ - - + + {% endblock %} {% block header %} @@ -28,12 +28,12 @@ 'columns': 1, 'items': [ { - 'href': 'https://github.com/alphagov/govuk-frontend/releases/tag/v4.0.1', - 'text': 'GOV.UK Frontend v4.0.1' + 'href': 'https://github.com/alphagov/govuk-frontend/releases/tag/v4.1.0', + 'text': 'GOV.UK Frontend v4.1.0' }, { - 'href': 'https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/2.1.0', - 'text': 'GOV.UK Frontend Jinja v2.1.0' + 'href': 'https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/2.2.0', + 'text': 'GOV.UK Frontend Jinja v2.2.0' } ] }, @@ -68,7 +68,7 @@ {% block bodyEnd %} - + {% endblock %} \ No newline at end of file diff --git a/build.sh b/build.sh index 74ce31e..fb7be8d 100755 --- a/build.sh +++ b/build.sh @@ -1,15 +1,15 @@ -curl -L https://github.com/alphagov/govuk-frontend/releases/download/v4.0.1/release-v4.0.1.zip > govuk_frontend.zip +curl -L https://github.com/alphagov/govuk-frontend/releases/download/v4.1.0/release-v4.1.0.zip > govuk_frontend.zip rm -rf app/static unzip -o govuk_frontend.zip -d app/static mv app/static/assets/* app/static rm -rf app/static/assets rm -rf govuk_frontend.zip -curl -L https://github.com/alphagov/govuk-frontend/archive/v4.0.1.zip > govuk_frontend_source.zip +curl -L https://github.com/alphagov/govuk-frontend/archive/v4.1.0.zip > govuk_frontend_source.zip unzip -o govuk_frontend_source.zip -d govuk_frontend_source rm -rf govuk_components mkdir govuk_components -mv govuk_frontend_source/govuk-frontend-4.0.1/package/govuk/components/** govuk_components +mv govuk_frontend_source/govuk-frontend-4.1.0/package/govuk/components/** govuk_components find govuk_components -type f ! -name 'fixtures.json' -delete rm -rf govuk_frontend_source rm -rf govuk_frontend_source.zip \ No newline at end of file From 0e4d7358b8f25d7efdd85584ceb80a3a87263d6d Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Wed, 18 May 2022 03:26:50 +0100 Subject: [PATCH 2/7] version 2.2.0 --- CHANGEOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGEOG.md b/CHANGEOG.md index 901e73a..e6eca4d 100644 --- a/CHANGEOG.md +++ b/CHANGEOG.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-jinja-demo/compare/2.1.0...main) +## [Unreleased](https://github.com/LandRegistry/govuk-frontend-jinja-demo/compare/2.2.0...main) + +## [2.2.0](https://github.com/LandRegistry/govuk-frontend-jinja-demo/releases/tag/2.2.0) - xx/05/2022 + +### Added + +- [GOV.UK Frontend v4.1.0](https://github.com/alphagov/govuk-frontend/releases/tag/v4.1.0) support ## [2.1.0](https://github.com/LandRegistry/govuk-frontend-jinja-demo/releases/tag/2.1.0) - 10/05/2022 From 50e1028e27da22fe6bf7b805ae8a3bfb55f1483d Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Wed, 18 May 2022 08:54:42 +0100 Subject: [PATCH 3/7] govuk-frontend-jinja 2.2.0 --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index bfb6f6f..99e4a32 100644 --- a/requirements.in +++ b/requirements.in @@ -1,6 +1,6 @@ flask-compress==1.12 flask-talisman==1.0.0 flask==2.1.2 -govuk-frontend-jinja==2.1.0 +govuk-frontend-jinja==2.2.0 gunicorn==20.1.0 python-dotenv==0.20.0 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index efe84f8..91964bd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,7 @@ flask-compress==1.12 # via -r requirements.in flask-talisman==1.0.0 # via -r requirements.in -govuk-frontend-jinja==2.1.0 +govuk-frontend-jinja==2.2.0 # via -r requirements.in gunicorn==20.1.0 # via -r requirements.in From 85af8bb21fb6e1c506d6cc6f5a5e414126b8c616 Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Wed, 18 May 2022 08:55:16 +0100 Subject: [PATCH 4/7] python 3.10 runtime --- runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime.txt b/runtime.txt index a5164c6..3338e5c 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-3.9.11 \ No newline at end of file +python-3.10.4 \ No newline at end of file From 3965ad396ba34e93a8eac564d49a0370a78f4149 Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Wed, 18 May 2022 09:03:58 +0100 Subject: [PATCH 5/7] upgrade requirements --- requirements_dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index e781239..749a9df 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -10,7 +10,7 @@ bandit==1.7.4 # via -r requirements_dev.in black==22.3.0 # via -r requirements_dev.in -certifi==2021.10.8 +certifi==2022.5.18 # via requests charset-normalizer==2.0.12 # via requests From 4b970e2a68c9ee764950de0dd6f8bd04352396cf Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Wed, 18 May 2022 09:04:06 +0100 Subject: [PATCH 6/7] release date --- CHANGEOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGEOG.md b/CHANGEOG.md index e6eca4d..d04fc0d 100644 --- a/CHANGEOG.md +++ b/CHANGEOG.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-jinja-demo/compare/2.2.0...main) -## [2.2.0](https://github.com/LandRegistry/govuk-frontend-jinja-demo/releases/tag/2.2.0) - xx/05/2022 +## [2.2.0](https://github.com/LandRegistry/govuk-frontend-jinja-demo/releases/tag/2.2.0) - 18/05/2022 ### Added From 55b9bd38481306b6fb64c9548de56efd1765bd45 Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Wed, 18 May 2022 09:12:39 +0100 Subject: [PATCH 7/7] update number of tests --- app/templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/index.html b/app/templates/index.html index 17797a4..9d9fa59 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -9,7 +9,7 @@

GOV.UK Frontend Jinja

This is a simple Python application using the Flask framework that demonstrates the Jinja port of GOV.UK Frontend.

GOV.UK Frontend Jinja provides a complete set of reusable component Jinja macros, directly ported from the GOV.UK Frontend Nunjucks macros.

-

An automated test suite makes use of the GOV.UK Frontend test fixtures to ensure 100% compliant HTML is output. This currently covers a total of 524 test scenarios against every component, which you can see in the build status.

+

An automated test suite makes use of the GOV.UK Frontend test fixtures to ensure 100% compliant HTML is output. This currently covers a total of 526 test scenarios against every component, which you can see in the build status.

Every visual test fixture is rendered in the pages linked below, along with the Jinja macro options and HTML used to create them. These can be used as examples, or for visual regression testing.

{{ govukInsetText({'html': 'If you also need to generate forms in your Python project, check out GOV.UK Frontend WTForms which makes use of these Jinja macros.'} )}}