From 71174433e4e9f6788eb3e9e1854f7c709bdc617b Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Mon, 13 Jan 2025 10:57:08 +0000 Subject: [PATCH 1/5] setup --- .github/workflows/python-package.yml | 2 +- CHANGELOG.md | 8 +++++++- README.md | 7 ++++--- tests/utils/test-entrypoint.sh | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 588287d..fbebd2d 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index a51c0e2..aae55fa 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-jinja/compare/3.4.0...main) +## [Unreleased](https://github.com/LandRegistry/govuk-frontend-jinja/compare/3.5.0...main) + +## [3.5.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/3.5.0) - xx/01/2025 + +### 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 diff --git a/README.md b/README.md index 585a725..92da49d 100644 --- a/README.md +++ b/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.5.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/3.5.0) | [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`. diff --git a/tests/utils/test-entrypoint.sh b/tests/utils/test-entrypoint.sh index c0a27e8..ee9c91c 100755 --- a/tests/utils/test-entrypoint.sh +++ b/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 From e73c70f5b46bc0113e630f8bd79b2306fada871a Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Mon, 13 Jan 2025 11:00:13 +0000 Subject: [PATCH 2/5] bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bd8eaa3..9a1522d 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ setuptools.setup( name="govuk-frontend-jinja", - version="3.4.0", + version="3.5.0", author="Matt Shaw", author_email="matthew.shaw@landregistry.gov.uk", description="GOV.UK Frontend Jinja Macros", From bcba817d68f78d5e9e7d3d6205688312ebf9099d Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Mon, 13 Jan 2025 11:20:58 +0000 Subject: [PATCH 3/5] upgrade dependencies --- requirements-test-3.10.txt | 12 ++++++------ requirements-test-3.11.txt | 12 ++++++------ requirements-test-3.12.txt | 12 ++++++------ requirements-test-3.13.txt | 12 ++++++------ requirements-test-3.9.txt | 14 +++++++------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/requirements-test-3.10.txt b/requirements-test-3.10.txt index 014c02a..4f6d980 100644 --- a/requirements-test-3.10.txt +++ b/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 diff --git a/requirements-test-3.11.txt b/requirements-test-3.11.txt index ef85982..532aace 100644 --- a/requirements-test-3.11.txt +++ b/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 diff --git a/requirements-test-3.12.txt b/requirements-test-3.12.txt index 103d42b..9a4fbf6 100644 --- a/requirements-test-3.12.txt +++ b/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 diff --git a/requirements-test-3.13.txt b/requirements-test-3.13.txt index 159eda8..fe5763a 100644 --- a/requirements-test-3.13.txt +++ b/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 diff --git a/requirements-test-3.9.txt b/requirements-test-3.9.txt index 6ffcf17..9b72c85 100644 --- a/requirements-test-3.9.txt +++ b/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 From 0a4e2b1764e49b90ef3cec77063cf7b0abd81ac6 Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Mon, 13 Jan 2025 11:32:46 +0000 Subject: [PATCH 4/5] change to patch release --- CHANGELOG.md | 6 ++++-- README.md | 2 +- setup.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aae55fa..161019b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,11 @@ 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.5.0...main) +## [Unreleased](https://github.com/LandRegistry/govuk-frontend-jinja/compare/3.4.1...main) -## [3.5.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/3.5.0) - xx/01/2025 +## [3.4.1](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/3.4.1) - 13/01/2025 + +No functional changes. ### Added diff --git a/README.md b/README.md index 92da49d..0eeec5a 100644 --- a/README.md +++ b/README.md @@ -16,7 +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.5.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/3.5.0) | [5.8.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.8.0) | +| [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) | diff --git a/setup.py b/setup.py index 9a1522d..a0acccf 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ setuptools.setup( name="govuk-frontend-jinja", - version="3.5.0", + version="3.4.1", author="Matt Shaw", author_email="matthew.shaw@landregistry.gov.uk", description="GOV.UK Frontend Jinja Macros", From 3ba0cf9ec8371afbcdb7bb8ef16758c31587ec1b Mon Sep 17 00:00:00 2001 From: Matt Shaw Date: Mon, 13 Jan 2025 11:43:17 +0000 Subject: [PATCH 5/5] use ubuntu 24.04 --- .github/workflows/codeql.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/python-package.yml | 2 +- .github/workflows/python-publish.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 5a77b87..6b967d0 100644 --- a/.github/workflows/codeql.yml +++ b/.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 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index e71af6d..56f2ca1 100644 --- a/.github/workflows/dependency-review.yml +++ b/.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 diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index fbebd2d..25e816b 100644 --- a/.github/workflows/python-package.yml +++ b/.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: diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 8b75506..f942e88 100644 --- a/.github/workflows/python-publish.yml +++ b/.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