Add ruff as the tool for linting and formatting files

Author: tim-s-ccs

.flake8

@@ -38,4 +38,4 @@ jobs:
       run: invoke requirements-dev
 
     - name: Run tests
-      run: invoke test
+      run: invoke test-new

.github/workflows/test.yml

@@ -14,7 +14,12 @@ repos:
   hooks:
     - id: validate-pyproject
 
-- repo: https://github.com/PyCQA/flake8
-  rev: 7.0.0
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  # Ruff version.
+  rev: v0.14.13
   hooks:
-    - id: flake8
+    # Run the linter.
+    - id: ruff-check
+      args: [ --fix ]
+    # Run the formatter.
+    - id: ruff-format

.pre-commit-config.yaml

@@ -8,8 +8,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Added
 
-- [GOV.UK Frontend v5.13.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.12.0) support
+- [GOV.UK Frontend v5.13.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.14.0) support
 - Add support for Python 3.14 (πthon)
+- [GOV.UK Frontend v5.14.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.14.0) support
 
 ## [1.7.0](https://github.com/Crown-Commercial-Service/ccs-govuk-frontend-jinja/releases/tag/1.7.0) - 30/06/2025
 

CHANGELOG.md

@@ -1 +1 @@
-__version__ = "1.7.0"
+__version__ = '1.7.0'

govuk_frontend_jinja/__init__.py

@@ -104,7 +104,7 @@
   'formGroup': {
     'classes': 'govuk-character-count' ~ (' ' ~ params.formGroup.classes if params.formGroup and params.formGroup.classes),
     'attributes': attributesHtml,
-    'beforeInput': params.formGroup.beforeInput if params.fromGroup,
+    'beforeInput': params.formGroup.beforeInput if params.formGroup,
     'afterInput': {
       'html': countMessageHtml
     }

govuk_frontend_jinja/templates/components/character-count/macro.html

@@ -61,6 +61,7 @@ <h2 class="govuk-visually-hidden">{{ params.meta.visuallyHiddenTitle | default("
         </div>
         {% endif %}
         {% endif %}
+        {% if params.contentLicence is not none %}
         {# The SVG needs `focusable="false"` so that Internet Explorer does not
           treat it as an interactive element - without this it will be
           'focusable' when using the keyboard to navigate. -#}
@@ -90,6 +91,7 @@ <h2 class="govuk-visually-hidden">{{ params.meta.visuallyHiddenTitle | default("
           >Open Government Licence v3.0</a>, except where otherwise stated
         {% endif %}
         </span>
+        {% endif %}
       </div>
       <div class="govuk-footer__meta-item">
         <a

govuk_frontend_jinja/templates/components/footer/macro.html

@@ -69,7 +69,9 @@
   {%- if 'items' in params %}
   <ul class="govuk-pagination__list">
   {% for item in params['items'] %}
-    {{ _pageItem(item) | indent(2) }}
+    {% if item is not none and (item | length) > 0 %}
+      {{ _pageItem(item) | indent(2) }}
+    {% endif %}
   {% endfor %}
   </ul>
   {% endif %}

govuk_frontend_jinja/templates/components/pagination/macro.html

@@ -38,7 +38,7 @@
       {% if navigationItems | length or params.slots and (params.slots.navigationStart or params.slots.navigationEnd) %}
         <nav aria-label="{{ params.navigationLabel | default(menuButtonText, true) }}" class="govuk-service-navigation__wrapper {%- if params.navigationClasses %} {{ params.navigationClasses }}{% endif %}">
           {% if collapseNavigationOnMobile %}
-          <button type="button" class="govuk-service-navigation__toggle govuk-js-service-navigation-toggle" aria-controls="{{ navigationId }}" {%- if params.menuButtonLabel and params.menuButtonLabel != menuButtonText %} aria-label="{{ params.menuButtonLabel }}"{% endif %} hidden>
+          <button type="button" class="govuk-service-navigation__toggle govuk-js-service-navigation-toggle" aria-controls="{{ navigationId }}" {%- if params.menuButtonLabel and params.menuButtonLabel != menuButtonText %} aria-label="{{ params.menuButtonLabel }}"{% endif %} hidden aria-hidden="true">
             {{ menuButtonText }}
           </button>
           {% endif %}

govuk_frontend_jinja/templates/components/service-navigation/macro.html

@@ -25,7 +25,7 @@ Changelog = "https://github.com/Crown-Commercial-Service/ccs-govuk-frontend-jinj
 
 [project.optional-dependencies]
 dev = [
-  'flake8==7.3.0',
+  'ruff==0.14.13',
   'mypy==1.19.1',
   'pytest==9.0.2',
   'lxml==6.0.2',
@@ -46,3 +46,23 @@ govuk_frontend_jinja = ["**/*.html"]
 [tool.pytest.ini_options]
 addopts = "-p no:logging"
 testpaths = "tests"
+
+[tool.ruff]
+line-length = 120
+
+target-version = "py311"
+
+[tool.ruff.format]
+quote-style = "single"
+
+indent-style = "space"
+
+skip-magic-trailing-comma = false
+
+line-ending = "auto"
+
+[tool.ruff.lint.mccabe]
+max-complexity = 12
+
+[tool.ruff.lint.per-file-ignores]
+"app/__init__.py" = ["E501"]