Merge pull request #1124 from uktrade/develop

4.2.4 release

.gitignore

@@ -115,3 +115,6 @@ conf/.env
 conf/env/secrets-do-not-commit
 
 .pii-secret-hook/file_content/pii-secret-log
+
+#Docker config file
+Dockerfile.dev

requirements.txt

@@ -48,7 +48,7 @@ cffi==1.15.1
     # via cryptography
 charset-normalizer==3.2.0
     # via requests
-click==8.1.6
+click==8.1.7
     # via
     #   celery
     #   click-didyoumean
@@ -72,7 +72,7 @@ directory-constants==23.1.1
     #   directory-components
 directory-healthcheck==3.1.2
     # via -r requirements.in
-dj-database-url==2.0.0
+dj-database-url==2.1.0
     # via -r requirements.in
 django==4.1.10
     # via
@@ -127,7 +127,7 @@ django-storages==1.13.2
     # via -r requirements.in
 django-taggit==3.1.0
     # via wagtail
-django-timezone-field==5.1
+django-timezone-field==6.0
     # via django-celery-beat
 django-treebeard==4.7
     # via wagtail
@@ -145,7 +145,7 @@ draftjs-exporter==2.1.7
     # via wagtail
 drf-spectacular==0.26.4
     # via -r requirements.in
-ecs-logging==2.0.2
+ecs-logging==2.1.0
     # via elastic-apm
 elastic-apm==6.18.0
     # via -r requirements.in
@@ -227,12 +227,11 @@ pytube==9.2.2
 pytz==2023.3
     # via
     #   django-modelcluster
-    #   django-timezone-field
     #   djangorestframework
     #   l18n
 pyyaml==6.0.1
     # via drf-spectacular
-redis==4.6.0
+redis==5.0.0
     # via
     #   celery
     #   django-redis
@@ -244,7 +243,7 @@ requests[security]==2.31.0
     #   wagtail
 requests-oauthlib==1.3.1
     # via django-staff-sso-client
-s3transfer==0.6.1
+s3transfer==0.6.2
     # via boto3
 sentry-sdk==1.29.2
     # via -r requirements.in
@@ -290,15 +289,15 @@ vine==5.0.0
     #   amqp
     #   celery
     #   kombu
-w3lib==1.22
+w3lib==1.22.0
     # via -r requirements.in
 wagtail==4.1.5
     # via
     #   -r requirements.in
     #   wagtail-markdown
     #   wagtail-modeltranslation
     #   wagtailmedia
-wagtail-markdown==0.11
+wagtail-markdown==0.11.0
     # via -r requirements.in
 wagtail-modeltranslation==0.13.0
     # via -r requirements.in

requirements_test.in

@@ -4,7 +4,7 @@ pytest
 pytest-cov
 pytest-django
 pytest-sugar
-flake8
+flake8==6.1.0
 requests_mock
 freezegun==0.3.14
 coveralls

requirements_test.txt

@@ -50,7 +50,7 @@ cffi==1.15.1
     # via cryptography
 charset-normalizer==3.2.0
     # via requests
-click==8.1.6
+click==8.1.7
     # via
     #   celery
     #   click-didyoumean
@@ -82,7 +82,7 @@ directory-constants==23.1.1
     #   directory-components
 directory-healthcheck==3.1.2
     # via -r requirements.in
-dj-database-url==2.0.0
+dj-database-url==2.1.0
     # via -r requirements.in
 django==4.1.10
     # via
@@ -140,7 +140,7 @@ django-storages==1.13.2
     # via -r requirements.in
 django-taggit==3.1.0
     # via wagtail
-django-timezone-field==5.1
+django-timezone-field==6.0
     # via django-celery-beat
 django-treebeard==4.7
     # via wagtail
@@ -159,7 +159,7 @@ draftjs-exporter==2.1.7
     # via wagtail
 drf-spectacular==0.26.4
     # via -r requirements.in
-ecs-logging==2.0.2
+ecs-logging==2.1.0
     # via elastic-apm
 elastic-apm==6.18.0
     # via -r requirements.in
@@ -181,7 +181,7 @@ gevent==22.10.2
     # via -r requirements.in
 gitdb==4.0.10
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements_test.in
 greenlet==2.0.2
     # via gevent
@@ -294,12 +294,11 @@ pytube==9.2.2
 pytz==2023.3
     # via
     #   django-modelcluster
-    #   django-timezone-field
     #   djangorestframework
     #   l18n
 pyyaml==6.0.1
     # via drf-spectacular
-redis==4.6.0
+redis==5.0.0
     # via
     #   celery
     #   django-redis
@@ -316,7 +315,7 @@ requests-mock==1.11.0
     # via -r requirements_test.in
 requests-oauthlib==1.3.1
     # via django-staff-sso-client
-s3transfer==0.6.1
+s3transfer==0.6.2
     # via boto3
 sentry-sdk==1.29.2
     # via -r requirements.in
@@ -377,7 +376,7 @@ vine==5.0.0
     #   amqp
     #   celery
     #   kombu
-w3lib==1.22
+w3lib==1.22.0
     # via -r requirements.in
 wagtail==4.1.5
     # via
@@ -388,7 +387,7 @@ wagtail==4.1.5
     #   wagtailmedia
 wagtail-factories==2.0.1
     # via -r requirements_test.in
-wagtail-markdown==0.11
+wagtail-markdown==0.11.0
     # via -r requirements.in
 wagtail-modeltranslation==0.13.0
     # via -r requirements.in
@@ -400,7 +399,7 @@ webencodings==0.5.1
     # via
     #   bleach
     #   html5lib
-wheel==0.41.1
+wheel==0.41.2
     # via pip-tools
 whitenoise==6.4.0
     # via -r requirements.in