Merge pull request #92 from LandRegistry/govuk-frontend-58

GOV.UK Frontend 5.8.0

.github/workflows/codeql.yml

@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       actions: read
       contents: read

.github/workflows/dependency-review.yml

@@ -25,7 +25,7 @@ permissions:
 
 jobs:
   dependency-review:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: "Checkout repository"
         uses: actions/checkout@v4

.github/workflows/python-package.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -45,4 +45,4 @@ jobs:
         run: |
           (cd tests/utils && nohup python -m flask run --port 3000 &)
           wait-for-it localhost:3000
-          ./govuk-frontend-diff http://localhost:3000 --govuk-frontend-version=v5.7.1 --exclude page-template --ci
+          ./govuk-frontend-diff http://localhost:3000 --govuk-frontend-version=v5.8.0 --exclude page-template --ci

.github/workflows/python-publish.yml

@@ -17,7 +17,7 @@ permissions:
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4

CHANGELOG.md

@@ -4,7 +4,15 @@ 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/compare/3.4.0...main)
+## [Unreleased](https://github.com/LandRegistry/govuk-frontend-jinja/compare/3.4.1...main)
+
+## [3.4.1](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/3.4.1) - 13/01/2025
+
+No functional changes.
+
+### Added
+
+- [GOV.UK Frontend v5.8.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.8.0) support
 
 ## [3.4.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/3.4.0) - 15/10/2024
 

README.md

@@ -1,7 +1,7 @@
 # GOV.UK Frontend Jinja Macros
 
 [![PyPI version](https://badge.fury.io/py/govuk-frontend-jinja.svg)](https://pypi.org/project/govuk-frontend-jinja/)
-![govuk-frontend 5.7.1](https://img.shields.io/badge/govuk--frontend%20version-5.7.1-005EA5?logo=gov.uk&style=flat)
+![govuk-frontend 5.8.0](https://img.shields.io/badge/govuk--frontend%20version-5.8.0-005EA5?logo=gov.uk&style=flat)
 [![Python package](https://github.com/LandRegistry/govuk-frontend-jinja/actions/workflows/python-package.yml/badge.svg)](https://github.com/LandRegistry/govuk-frontend-jinja/actions/workflows/python-package.yml)
 
 **GOV.UK Frontend Jinja 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.**
@@ -16,6 +16,7 @@ The following table shows the version of GOV.UK Frontend Jinja that you should u
 
 | GOV.UK Frontend Jinja Version                                                    | Target GOV.UK Frontend Version                                            |
 | -------------------------------------------------------------------------------- | ------------------------------------------------------------------------- |
+| [3.4.1](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/3.4.1) | [5.8.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.8.0)   |
 | [3.4.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/3.4.0) | [5.7.1](https://github.com/alphagov/govuk-frontend/releases/tag/v5.7.1)   |
 | [3.3.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/3.3.0) | [5.6.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.6.0)   |
 | [3.2.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/3.2.0) | [5.5.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.5.0)   |
@@ -64,8 +65,8 @@ app.jinja_loader = ChoiceLoader(
 To use a component in your project templates you must import and call the component macro and pass the relevant options, for example:
 
 ```html
-{%- from 'govuk_frontend_jinja/components/button/macro.html' import govukButton -%}
-{{ govukButton({ 'text': "Save and continue" }) }}
+{%- from 'govuk_frontend_jinja/components/button/macro.html' import govukButton
+-%} {{ govukButton({ 'text': "Save and continue" }) }}
 ```
 
 The options available to each component macro can be found in the original [GOV.UK Design System Components](https://design-system.service.gov.uk/components/) documentation. Since this project is a like-for-like port, the only difference between the Nunjucks examples and their Jinja equivalents is having to quote key names, e.g. `'text'` instead of `text`.

requirements-test-3.10.txt

@@ -4,19 +4,19 @@
 #
 #    pip-compile --output-file=requirements-test-3.10.txt requirements-test.in
 #
-blinker==1.8.2
+blinker==1.9.0
     # via flask
-click==8.1.7
+click==8.1.8
     # via flask
 flake8==7.1.1
     # via -r requirements-test.in
-flask==3.0.3
+flask==3.1.0
     # via -r requirements-test.in
 itsdangerous==2.2.0
     # via flask
-jinja2==3.1.4
+jinja2==3.1.5
     # via flask
-markupsafe==3.0.1
+markupsafe==3.0.2
     # via
     #   jinja2
     #   werkzeug
@@ -26,5 +26,5 @@ pycodestyle==2.12.1
     # via flake8
 pyflakes==3.2.0
     # via flake8
-werkzeug==3.0.4
+werkzeug==3.1.3
     # via flask

requirements-test-3.11.txt

@@ -4,19 +4,19 @@
 #
 #    pip-compile --output-file=requirements-test-3.11.txt requirements-test.in
 #
-blinker==1.8.2
+blinker==1.9.0
     # via flask
-click==8.1.7
+click==8.1.8
     # via flask
 flake8==7.1.1
     # via -r requirements-test.in
-flask==3.0.3
+flask==3.1.0
     # via -r requirements-test.in
 itsdangerous==2.2.0
     # via flask
-jinja2==3.1.4
+jinja2==3.1.5
     # via flask
-markupsafe==3.0.1
+markupsafe==3.0.2
     # via
     #   jinja2
     #   werkzeug
@@ -26,5 +26,5 @@ pycodestyle==2.12.1
     # via flake8
 pyflakes==3.2.0
     # via flake8
-werkzeug==3.0.4
+werkzeug==3.1.3
     # via flask

requirements-test-3.12.txt

@@ -4,19 +4,19 @@
 #
 #    pip-compile --output-file=requirements-test-3.12.txt requirements-test.in
 #
-blinker==1.8.2
+blinker==1.9.0
     # via flask
-click==8.1.7
+click==8.1.8
     # via flask
 flake8==7.1.1
     # via -r requirements-test.in
-flask==3.0.3
+flask==3.1.0
     # via -r requirements-test.in
 itsdangerous==2.2.0
     # via flask
-jinja2==3.1.4
+jinja2==3.1.5
     # via flask
-markupsafe==3.0.1
+markupsafe==3.0.2
     # via
     #   jinja2
     #   werkzeug
@@ -26,5 +26,5 @@ pycodestyle==2.12.1
     # via flake8
 pyflakes==3.2.0
     # via flake8
-werkzeug==3.0.4
+werkzeug==3.1.3
     # via flask

requirements-test-3.13.txt

@@ -4,19 +4,19 @@
 #
 #    pip-compile --output-file=requirements-test-3.13.txt requirements-test.in
 #
-blinker==1.8.2
+blinker==1.9.0
     # via flask
-click==8.1.7
+click==8.1.8
     # via flask
 flake8==7.1.1
     # via -r requirements-test.in
-flask==3.0.3
+flask==3.1.0
     # via -r requirements-test.in
 itsdangerous==2.2.0
     # via flask
-jinja2==3.1.4
+jinja2==3.1.5
     # via flask
-markupsafe==3.0.1
+markupsafe==3.0.2
     # via
     #   jinja2
     #   werkzeug
@@ -26,5 +26,5 @@ pycodestyle==2.12.1
     # via flake8
 pyflakes==3.2.0
     # via flake8
-werkzeug==3.0.4
+werkzeug==3.1.3
     # via flask

requirements-test-3.9.txt

@@ -4,21 +4,21 @@
 #
 #    pip-compile --output-file=requirements-test-3.9.txt requirements-test.in
 #
-blinker==1.8.2
+blinker==1.9.0
     # via flask
-click==8.1.7
+click==8.1.8
     # via flask
 flake8==7.1.1
     # via -r requirements-test.in
-flask==3.0.3
+flask==3.1.0
     # via -r requirements-test.in
 importlib-metadata==8.5.0
     # via flask
 itsdangerous==2.2.0
     # via flask
-jinja2==3.1.4
+jinja2==3.1.5
     # via flask
-markupsafe==3.0.1
+markupsafe==3.0.2
     # via
     #   jinja2
     #   werkzeug
@@ -28,7 +28,7 @@ pycodestyle==2.12.1
     # via flake8
 pyflakes==3.2.0
     # via flake8
-werkzeug==3.0.4
+werkzeug==3.1.3
     # via flask
-zipp==3.20.2
+zipp==3.21.0
     # via importlib-metadata

setup.py

@@ -13,7 +13,7 @@
 
 setuptools.setup(
     name="govuk-frontend-jinja",
-    version="3.4.0",
+    version="3.4.1",
     author="Matt Shaw",
     author_email="matthew.shaw@landregistry.gov.uk",
     description="GOV.UK Frontend Jinja Macros",

tests/utils/test-entrypoint.sh

@@ -5,4 +5,4 @@ set -e
 flake8 .
 (cd tests/utils && nohup python -m flask run --port 3000 &)
 wait-for-it localhost:3000
-./govuk-frontend-diff http://localhost:3000 --govuk-frontend-version=v5.7.1 --exclude page-template --ci
+./govuk-frontend-diff http://localhost:3000 --govuk-frontend-version=v5.8.0 --exclude page-template --ci