Merge pull request #84 from Crown-Commercial-Service/upgrade-flask-to…

…-v3.0

Upgrade flask to v3

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Records breaking changes from major version bumps.
 
+## 2.8.0
+
+Update ccs-digitalmarketplace-utils to v67 which, in turn, updates flask to v3.0
+
+Upgrade Digital Marketplace Frontend to v1.1
+
 ## 2.7.0
 
 Make updates for change from Digital Marketplace GOV.UK Frontend to Digital Marketplace Frontend

README.md

@@ -16,6 +16,9 @@ The following table shows the version of Digital Marketplace Frontend Jinja that
 
 | Digital Marketplace Frontend Jinja Version | Target CCS Digital Marketplace GOV.UK Frontend Version |
 | ----------------------------- | ------------------------------ |
+| [2.8.0](https://github.com/tim-s-ccs/ccs-digitalmarketplace-frontend-jinja/releases/tag/2.8.0) | [1.1.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v1.1.0) |
+| [2.7.0](https://github.com/tim-s-ccs/ccs-digitalmarketplace-frontend-jinja/releases/tag/2.7.0) | [1.0.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v1.0.0) |
+| [2.6.0](https://github.com/tim-s-ccs/ccs-digitalmarketplace-frontend-jinja/releases/tag/2.6.0) | [6.4.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/6.4.0) |
 | [2.5.0](https://github.com/tim-s-ccs/ccs-digitalmarketplace-frontend-jinja/releases/tag/2.5.0) | [6.3.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/6.3.0) |
 | [2.2.0](https://github.com/tim-s-ccs/ccs-digitalmarketplace-frontend-jinja/releases/tag/2.2.0) | [6.2.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/6.2.0) |
 | [2.1.1](https://github.com/tim-s-ccs/ccs-digitalmarketplace-frontend-jinja/releases/tag/2.1.1) | [6.1.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/6.1.1) |

digitalmarketplace_frontend_jinja/__init__.py

@@ -1 +1 @@
-__version__ = '2.7.0'
+__version__ = '2.8.0'

package.json

@@ -5,6 +5,6 @@
   "author": "CCS",
   "license": "MIT",
   "devDependencies": {
-    "digitalmarketplace-frontend": "^1.0.2"
+    "digitalmarketplace-frontend": "^1.1.0"
   }
 }

requirements-dev.txt

@@ -10,21 +10,21 @@ async-timeout==4.0.3
     # via redis
 blinker==1.8.2
     # via flask
-boto3==1.34.22
+boto3==1.34.142
     # via ccs-digitalmarketplace-utils
-botocore==1.34.22
+botocore==1.34.142
     # via
     #   boto3
     #   s3transfer
-cachelib==0.10.2
+cachelib==0.13.0
     # via flask-session
-ccs-digitalmarketplace-apiclient==25.9.0
+ccs-digitalmarketplace-apiclient==25.11.0
     # via ccs-digitalmarketplace-utils
-ccs-digitalmarketplace-utils==66.3.0
+ccs-digitalmarketplace-utils==67.0.0
     # via ccs-digitalmarketplace-frontend-jinja
 ccs-govuk-frontend-jinja==1.2.0
     # via ccs-digitalmarketplace-frontend-jinja
-certifi==2023.11.17
+certifi==2024.7.4
     # via requests
 cffi==1.16.0
     # via cryptography
@@ -34,17 +34,17 @@ click==8.1.7
     # via flask
 contextlib2==21.6.0
     # via ccs-digitalmarketplace-utils
-cryptography==41.0.7
+cryptography==42.0.8
     # via ccs-digitalmarketplace-utils
 defusedxml==0.7.1
     # via odfpy
 docopt==0.6.2
     # via notifications-python-client
-exceptiongroup==1.2.0
+exceptiongroup==1.2.1
     # via pytest
 flake8==7.1.0
     # via -r requirements-dev.in
-flask==2.3.3
+flask==3.0.3
     # via
     #   -r requirements-dev.in
     #   ccs-digitalmarketplace-utils
@@ -64,11 +64,11 @@ fleep==1.0.1
     # via ccs-digitalmarketplace-utils
 govuk-country-register==0.5.0
     # via ccs-digitalmarketplace-utils
-idna==3.6
+idna==3.7
     # via requests
 iniconfig==2.0.0
     # via pytest
-itsdangerous==2.1.2
+itsdangerous==2.2.0
     # via
     #   flask
     #   flask-wtf
@@ -87,7 +87,7 @@ lxml==5.2.2
     #   xmldiff
 mailchimp3==3.0.21
     # via ccs-digitalmarketplace-utils
-markupsafe==2.1.4
+markupsafe==2.1.5
     # via
     #   jinja2
     #   werkzeug
@@ -102,52 +102,52 @@ notifications-python-client==8.2.0
     # via ccs-digitalmarketplace-utils
 odfpy==1.4.1
     # via ccs-digitalmarketplace-utils
-packaging==23.2
+packaging==24.1
     # via pytest
 pluggy==1.5.0
     # via pytest
 pycodestyle==2.12.0
     # via flake8
-pycparser==2.21
+pycparser==2.22
     # via cffi
 pyflakes==3.2.0
     # via flake8
 pyjwt==2.8.0
     # via notifications-python-client
 pytest==8.2.2
     # via -r requirements-dev.in
-python-dateutil==2.8.2
+python-dateutil==2.9.0.post0
     # via botocore
 python-json-logger==2.0.7
     # via ccs-digitalmarketplace-utils
-pytz==2023.3.post1
+pytz==2024.1
     # via ccs-digitalmarketplace-utils
-redis==5.0.1
+redis==5.0.7
     # via ccs-digitalmarketplace-utils
-requests==2.31.0
+requests==2.32.3
     # via
     #   ccs-digitalmarketplace-apiclient
     #   ccs-digitalmarketplace-utils
     #   mailchimp3
     #   notifications-python-client
-s3transfer==0.10.0
+s3transfer==0.10.2
     # via boto3
 six==1.16.0
     # via python-dateutil
 tomli==2.0.1
     # via
     #   mypy
     #   pytest
-typing-extensions==4.9.0
+typing-extensions==4.12.2
     # via mypy
 unicodecsv==0.14.1
     # via ccs-digitalmarketplace-utils
-urllib3==1.26.18
+urllib3==2.2.2
     # via
     #   botocore
     #   ccs-digitalmarketplace-utils
     #   requests
-werkzeug==2.3.8
+werkzeug==3.0.3
     # via
     #   ccs-digitalmarketplace-utils
     #   flask

setup.py

@@ -32,7 +32,7 @@
     install_requires=[
         'jinja2>3',
         'ccs-govuk-frontend-jinja>=1.2,<2',
-        'ccs-digitalmarketplace-utils>=66.0.1',
+        'ccs-digitalmarketplace-utils>=67.0.0',
     ],
     python_requires=">=3.10,<3.13",
 )