Merge pull request #1225 from uktrade/develop

Release PR

activitystream/tests/test_views.py

@@ -108,7 +108,7 @@ def test_empty_object_returned_with_authentication(api_client, activities_url):
         content=response.content,
         content_type=response['Content-Type'],
     )
-    with pytest.raises(mohawk.exc.MacMismatch):
+    with pytest.raises(mohawk.exc.BadHeaderValue):
         sender.accept_response(
             response_header=response['Server-Authorization'] + 'incorrect',
             content=response.content,

company/management/commands/update_investment_services_directory.py

@@ -1,6 +1,7 @@
 """
 Management utility to update Investment Services Directory.
 """
+
 import ast
 import csv
 from datetime import datetime

dataservices/tests/factories.py

@@ -52,6 +52,7 @@ class CountryFactory(factory.django.DjangoModelFactory):
 
     class Meta:
         model = models.Country
+        django_get_or_create = ('name', 'iso1', 'iso2', 'iso3')
 
 
 class UKTradeInGoodsByCountryFactory(factory.django.DjangoModelFactory):

requirements.in

@@ -1,54 +1,57 @@
-django==4.2
-dj-database-url==0.5.0
-django-environ==0.4.5
-django-extensions==3.2.1
+django==4.2.8
+django-celery-beat==2.5.0
+django-cleanup==8.1.0
+django-cte==1.3.2
+django-environ==0.11.2
+django-extensions==3.2.3
 django-field-history==0.8.0
-djangorestframework==3.14.*
-django_storages[boto3]==1.13.2
+django-filter==23.5
 django-flat-json-widget==0.2
-django-filter==22.*
-django-import-export==3.2.0
-kombu<6.0,>=5.2.3
-django-celery-beat==2.5.0
-django-redis==5.2.*
-django-cleanup==5.2.0
-whitenoise==6.4.0
-psycopg2-binary==2.9.*
-sentry-sdk==1.29.2
-boto3==1.24.*
-celery[redis]>=5.2.2
-requests[security]==2.31.0
-elasticsearch==7.*
-elasticsearch-dsl>=7.0.0,<8.0.0
-waitress==2.1.2
-sigauth==5.2.0
+django-health-check==3.17.0
+django-import-export==3.3.6
+django-json-widget==1.1.1
+django-redis==5.4.0
 django-staff-sso-client==4.2.1
-directory-validators==9.3.2
-directory-constants==24.0.0
+django-storages==1.13.2
+django-timezone-field==6.1.0
+djangorestframework==3.14.0
+directory-client-core==7.2.11
+directory-components==40.2.0
+directory-constants==24.1.0
+directory-forms-api-client==7.3.2
+directory-healthcheck==3.3
 directory-sso-api-client==7.2.6
-directory-healthcheck==3.2
-directory-forms-api-client>=7.3.2
+directory-validators==9.3.2
+notifications-python-client==9.0.0
+boto3==1.24.*
+celery[redis]>=5.2.2
+certifi==2023.07.22
 cryptography==41.0.6
-directory-components==40.1.0
-urllib3==1.26.18
+deprecated==1.2.*
+dj-database-url
+drf-spectacular==0.26.1
+elasticsearch-dsl>=7.0.0,<8.0.0
+elasticsearch<7.14.0
 factory-boy==2.12.0
-markdown2==2.4.0
 iso3166==1.0.1
-django_json_widget==1.0.1
-deprecated==1.2.*
-pyyaml==6.0
-urllib3>=1.26.5
-xmltodict==0.12.0
-notifications-python-client==6.3.0
-xhtml2pdf==0.2.11
-pyjwt==2.4.0
-pandas==1.4.2
-sqlalchemy==1.4.36
-django-cte==1.2.0
+kombu<6.0,>=5.2.3
 lxml==4.9.1
+markdown2==2.4.0
 oauthlib==3.2.2
-pillow==10.0.1
-sqlparse==0.4.4
-drf-spectacular==0.26.1
-certifi==2023.07.22
+pandas==1.4.2
+pillow==10.2.0
+psycopg2-binary==2.9.*
+pyjwt==2.4.0
 pypdf==3.17.0
+pyyaml==6.0
+requests[security]==2.31.0
+sentry-sdk==1.29.2
+sigauth==5.2.5
+sqlalchemy==1.4.36
+sqlparse==0.4.4
+urllib3==1.26.18
+urllib3>=1.26.5
+waitress==2.1.2
+whitenoise==6.4.0
+xhtml2pdf==0.2.11
+xmltodict==0.12.0