Merge pull request #10 from LandRegistry/govuk-frontend-410

GOV.UK Frontend 4.1.0

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) - 18/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
 

app/templates/base.html

@@ -8,8 +8,8 @@
   <meta name="description" content="GOV.UK Frontend Jinja Demo">
   <meta name="keywords" content="GOV.UK, govuk, gov, government, uk, frontend, ui, user interface, jinja, python, flask, port, template, templating, macro, component, design system, html, demo, example">
   <meta name="author" content="HM Land Registry">
-  <!--[if gt IE 8]><!--><link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='govuk-frontend-4.0.1.min.css') }}" /><!--<![endif]-->
-  <!--[if IE 8]><link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='govuk-frontend-ie8-4.0.1.min.css') }}" /><![endif]-->
+  <!--[if gt IE 8]><!--><link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='govuk-frontend-4.1.0.min.css') }}" /><!--<![endif]-->
+  <!--[if IE 8]><link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='govuk-frontend-ie8-4.1.0.min.css') }}" /><![endif]-->
 {% 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 %}
   <!--[if gt IE 8]><!-->
-  <script src="{{ url_for('static', filename='govuk-frontend-4.0.1.min.js') }}"> </script>
+  <script src="{{ url_for('static', filename='govuk-frontend-4.1.0.min.js') }}"> </script>
   <script>window.GOVUKFrontend.initAll()</script>
   <!--<![endif]-->
 {% endblock %}

app/templates/index.html

@@ -9,7 +9,7 @@
       <h1 class="govuk-heading-xl">GOV.UK Frontend Jinja</h1>
       <p class="govuk-body-l">This is a simple <a href="https://www.python.org/" class="govuk-link">Python</a> application using the <a href="https://flask.palletsprojects.com/en/1.1.x/" class="govuk-link">Flask</a> framework that demonstrates the <a href="https://jinja.palletsprojects.com/en/2.11.x/" class="govuk-link">Jinja</a> port of <a href="https://frontend.design-system.service.gov.uk/" class="govuk-link">GOV.UK Frontend</a>.</p>
       <p class="govuk-body"><a href="https://github.com/LandRegistry/govuk-frontend-jinja" class="govuk-link">GOV.UK Frontend Jinja</a> provides a complete set of reusable component Jinja macros, directly ported from the GOV.UK Frontend Nunjucks macros.</p>
-      <p class="govuk-body">An automated test suite makes use of the GOV.UK Frontend <a href="https://frontend.design-system.service.gov.uk/testing-your-html/#test-if-your-html-matches-gov-uk-frontend" class="govuk-link">test fixtures</a> 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 <a href="https://github.com/LandRegistry/govuk-frontend-jinja/actions" class="govuk-link">build status</a>.</p>
+      <p class="govuk-body">An automated test suite makes use of the GOV.UK Frontend <a href="https://frontend.design-system.service.gov.uk/testing-your-html/#test-if-your-html-matches-gov-uk-frontend" class="govuk-link">test fixtures</a> 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 <a href="https://github.com/LandRegistry/govuk-frontend-jinja/actions" class="govuk-link">build status</a>.</p>
       <p class="govuk-body">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.</p>
       {{ govukInsetText({'html': 'If you also need to generate forms in your Python project, check out <a href="https://govuk-frontend-wtforms.herokuapp.com/" class="govuk-link">GOV.UK Frontend WTForms</a> which makes use of these Jinja macros.'} )}}
 

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

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

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

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

runtime.txt

@@ -1 +1 @@
-python-3.9.11
+python-3.10.4