Merge pull request #15 from LandRegistry/govuk-frontend-45

GOV.UK Frontend 4.5.0

CHANGEOG.md

@@ -4,7 +4,17 @@ 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.4.0...main)
+## [Unreleased](https://github.com/LandRegistry/govuk-frontend-jinja-demo/compare/2.5.0...main)
+
+## [2.5.0](https://github.com/LandRegistry/govuk-frontend-jinja-demo/releases/tag/2.5.0) - 14/02/2023
+
+### Added
+
+- [GOV.UK Frontend v4.5.0](https://github.com/alphagov/govuk-frontend/releases/tag/v4.5.0) support
+
+### Deprecated
+
+- This will be the last release of this app, after which development will continue on [GOV.UK Frontend Flask](https://github.com/LandRegistry/govuk-frontend-flask) instead.
 
 ## [2.4.0](https://github.com/LandRegistry/govuk-frontend-jinja-demo/releases/tag/2.4.0) - 14/12/2022
 

README.md

@@ -2,7 +2,7 @@
 
 Demo Flask app using [GOV.UK Frontend Jinja](https://github.com/LandRegistry/govuk-frontend-jinja) macros.
 
-> **IMPORTANT**: This app is only meant to demonstate all of the `govuk-frontend-jinja` component macros. It is not meant to be used as the basis for a full Flask app. If you are looking to build a fully featured Flask app that integrates with [GOV.UK Frontend Jinja](https://github.com/LandRegistry/govuk-frontend-jinja) and [GOV.UK Frontend WTForms](https://github.com/LandRegistry/govuk-frontend-wtf) please use the [GOV.UK Frontend Flask](https://github.com/LandRegistry/govuk-frontend-flask) template to [generate your app](https://github.com/LandRegistry/govuk-frontend-flask/generate) instead.
+> **IMPORTANT**: This app is deprecated. It is only meant to demonstate all of the `govuk-frontend-jinja` component macros. It is not meant to be used as the basis for a full Flask app. If you are looking to build a fully featured Flask app that integrates with [GOV.UK Frontend Jinja](https://github.com/LandRegistry/govuk-frontend-jinja) and [GOV.UK Frontend WTForms](https://github.com/LandRegistry/govuk-frontend-wtf) please use the [GOV.UK Frontend Flask](https://github.com/LandRegistry/govuk-frontend-flask) template to [generate your app](https://github.com/LandRegistry/govuk-frontend-flask/generate) instead.
 
 ## Getting started
 

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.4.1.min.css') }}" /><!--<![endif]-->
-  <!--[if IE 8]><link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='govuk-frontend-ie8-4.4.1.min.css') }}" /><![endif]-->
+  <!--[if gt IE 8]><!--><link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='govuk-frontend-4.5.0.min.css') }}" /><!--<![endif]-->
+  <!--[if IE 8]><link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='govuk-frontend-ie8-4.5.0.min.css') }}" /><![endif]-->
 {% endblock %}
 
 {% block header %}
@@ -28,12 +28,12 @@
         'columns': 1,
         'items': [
             {
-              'href': 'https://github.com/alphagov/govuk-frontend/releases/tag/v4.4.1',
-              'text': 'GOV.UK Frontend v4.4.1'
+              'href': 'https://github.com/alphagov/govuk-frontend/releases/tag/v4.5.0',
+              'text': 'GOV.UK Frontend v4.5.0'
             },
             {
-              'href': 'https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/2.4.0',
-              'text': 'GOV.UK Frontend Jinja v2.4.0'
+              'href': 'https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/2.5.0',
+              'text': 'GOV.UK Frontend Jinja v2.5.0'
             }
           ]
       },
@@ -68,7 +68,7 @@
 
 {% block bodyEnd %}
   <!--[if gt IE 8]><!-->
-  <script src="{{ url_for('static', filename='govuk-frontend-4.4.1.min.js') }}"> </script>
+  <script src="{{ url_for('static', filename='govuk-frontend-4.5.0.min.js') }}"> </script>
   <script>window.GOVUKFrontend.initAll()</script>
   <!--<![endif]-->
 {% endblock %}

build.sh

@@ -1,15 +1,15 @@
-curl -L https://github.com/alphagov/govuk-frontend/releases/download/v4.4.1/release-v4.4.1.zip > govuk_frontend.zip
+curl -L https://github.com/alphagov/govuk-frontend/releases/download/v4.5.0/release-v4.5.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.4.1.zip > govuk_frontend_source.zip
+curl -L https://github.com/alphagov/govuk-frontend/archive/v4.5.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.4.1/package/govuk/components/** govuk_components
+mv govuk_frontend_source/govuk-frontend-4.5.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.13
 flask-talisman==1.0.0
 flask==2.2.2
-govuk-frontend-jinja==2.4.0
+govuk-frontend-jinja==2.5.0
 gunicorn==20.1.0
-python-dotenv==0.21.0
+python-dotenv==0.21.1

requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile requirements.in
@@ -16,7 +16,7 @@ flask-compress==1.13
     # via -r requirements.in
 flask-talisman==1.0.0
     # via -r requirements.in
-govuk-frontend-jinja==2.4.0
+govuk-frontend-jinja==2.5.0
     # via -r requirements.in
 gunicorn==20.1.0
     # via -r requirements.in
@@ -26,11 +26,11 @@ jinja2==3.1.2
     # via
     #   flask
     #   govuk-frontend-jinja
-markupsafe==2.1.1
+markupsafe==2.1.2
     # via
     #   jinja2
     #   werkzeug
-python-dotenv==0.21.0
+python-dotenv==0.21.1
     # via -r requirements.in
 werkzeug==2.2.2
     # via flask

requirements_dev.in

@@ -1,9 +1,8 @@
 bandit==1.7.4
 black==22.12.0
-flake8-bugbear==22.12.6
-hacking==5.0.0
-isort==5.11.2
-pep8-naming==0.13.2
-pip-tools==6.12.0
+flake8-bugbear==23.2.13
+isort==5.12.0
+pep8-naming==0.13.3
+pip-tools==6.12.2
 pur==7.0.0
 safety==2.3.5

requirements_dev.txt

@@ -1,20 +1,20 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile requirements_dev.in
 #
-attrs==22.1.0
+attrs==22.2.0
     # via flake8-bugbear
 bandit==1.7.4
     # via -r requirements_dev.in
 black==22.12.0
     # via -r requirements_dev.in
-build==0.9.0
+build==0.10.0
     # via pip-tools
 certifi==2022.12.7
     # via requests
-charset-normalizer==2.1.1
+charset-normalizer==3.0.1
     # via requests
 click==8.1.3
     # via
@@ -24,74 +24,64 @@ click==8.1.3
     #   safety
 dparse==0.6.2
     # via safety
-flake8==4.0.1
+flake8==6.0.0
     # via
     #   flake8-bugbear
-    #   hacking
     #   pep8-naming
-flake8-bugbear==22.12.6
+flake8-bugbear==23.2.13
     # via -r requirements_dev.in
 gitdb==4.0.10
     # via gitpython
-gitpython==3.1.29
+gitpython==3.1.30
     # via bandit
-hacking==5.0.0
-    # via -r requirements_dev.in
 idna==3.4
     # via requests
-isort==5.11.2
+isort==5.12.0
     # via -r requirements_dev.in
-mccabe==0.6.1
+mccabe==0.7.0
     # via flake8
-mypy-extensions==0.4.3
+mypy-extensions==1.0.0
     # via black
 packaging==21.3
     # via
     #   build
     #   dparse
     #   safety
-pathspec==0.10.3
+pathspec==0.11.0
     # via black
-pbr==5.11.0
+pbr==5.11.1
     # via stevedore
-pep517==0.13.0
-    # via build
-pep8-naming==0.13.2
+pep8-naming==0.13.3
     # via -r requirements_dev.in
-pip-tools==6.12.0
+pip-tools==6.12.2
     # via -r requirements_dev.in
-platformdirs==2.6.0
+platformdirs==3.0.0
     # via black
 pur==7.0.0
     # via -r requirements_dev.in
-pycodestyle==2.8.0
+pycodestyle==2.10.0
     # via flake8
-pyflakes==2.4.0
+pyflakes==3.0.1
     # via flake8
 pyparsing==3.0.9
     # via packaging
+pyproject-hooks==1.0.0
+    # via build
 pyyaml==6.0
     # via bandit
-requests==2.28.1
+requests==2.28.2
     # via safety
 ruamel-yaml==0.17.21
     # via safety
-ruamel-yaml-clib==0.2.7
-    # via ruamel-yaml
 safety==2.3.5
     # via -r requirements_dev.in
 smmap==5.0.0
     # via gitdb
-stevedore==4.1.1
+stevedore==5.0.0
     # via bandit
 toml==0.10.2
     # via dparse
-tomli==2.0.1
-    # via
-    #   black
-    #   build
-    #   pep517
-urllib3==1.26.13
+urllib3==1.26.14
     # via requests
 wheel==0.38.4
     # via pip-tools

runtime.txt

@@ -1 +1 @@
-python-3.10.8
+python-3.10.10

setup.cfg

@@ -1,6 +1,6 @@
 [flake8]
 exclude=venv
-ignore=E203,H301,H306,W503
+ignore=E203,W503
 max-complexity=10
 max-line-length=120