Merge pull request #1818 from uktrade/release

Prod release - 2.10.0

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 exclude: ^react-components/dist/
 repos:
     - repo: https://github.com/psf/black
-      rev: 22.1.0
+      rev: 22.6.0
       hooks:
           - id: black
           # Config for black lives in pyproject.toml
@@ -19,7 +19,7 @@ repos:
       hooks:
           - id: flake8
     - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v4.1.0
+      rev: v4.3.0
       hooks:
           - id: trailing-whitespace
             args: ["--markdown-linebreak-ext=md,markdown"]

CHANGELOG.md

@@ -2,13 +2,20 @@
 
 ## Pre release
 
+* GLS-269 - Add last release date to market guide visualisations
+
 ### Hotfix
 
 ### Bugs fixed
 
 * GLS-271 - Fixed duplicate title for office which has override office
+* GLS-98 - Fixed product finder not updating when changing previously answered question
+* GLS-301 - Fix select2 vulnerability
+
 ### Enhancements
 
+* GLS-230 - Add soft delete to Wagtail to prevent accidental data loss
+
 ## [2.9.1](https://github.com/uktrade/great-cms/releases/tag/2.9.1)
 
 [Full Changelog](https://github.com/uktrade/great-cms/compare/2.9.0...2.9.1)

README.md

@@ -4,7 +4,7 @@
 [![codecov-image]][codecov]
 [![docs-image]][docs]
 [![gitflow-image]][gitflow]
-[![calver-image]][calver]
+[![semver-image]][semver]
 
 **CMS for the GREAT platform - The Department for International Trade (DIT)**
 
@@ -343,6 +343,6 @@ https://github.com/uktrade?q=great
 
 [gitflow]: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
 
-[calver-image]: https://img.shields.io/badge/Versioning%20strategy-CalVer-5FBB1C.svg
+[semver-image]: https://img.shields.io/badge/Versioning%20strategy-SemVer-5FBB1C.svg
 
-[calver]: https://calver.org
+[semver]: https://semver.org

config/settings.py

@@ -51,6 +51,7 @@
     'wagtailfontawesome',
     'wagtail_transfer',
     'wagtailseo',
+    'wagtail_trash',
     'modelcluster',
     'taggit',
     'storages',

core/templates/core/includes/data_source.html

@@ -6,8 +6,13 @@
     {% else %}
       {{ source.label }}
     {% endif %}
-    {% if source.next_release %}
-    <br/>Next release: {{ source.next_release }}
+    <br/>Last release:
+    {% if source.label == 'ONS UK trade' %}
+    13 June 2022
+    {% elif source.label == 'ONS UK total trade: all countries' %}
+    28 April 2022
+    {% elif source.label == 'ONS UK trade in services: service type by partner country' %}
+    28 April 2022
     {% endif %}
     {% if source.notes %}
     <br/>{{ source.notes|join:" " }}