Merge pull request #1218 from uktrade/develop

UAT / Prod PR

.circleci/config.yml

@@ -5,7 +5,7 @@ jobs:
     working_directory: ~/directory-api
     docker:
       - image: cimg/python:3.9.13
-      - image: cimg/postgres:11.20
+      - image: cimg/postgres:12.8
         environment:
           POSTGRES_USER: debug
           POSTGRES_PASSWORD: debug

company/migrations/0108_alter_companyuser_company.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.1.13 on 2024-01-15 11:12
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('company', '0107_companycasestudy_is_published_case_study'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='companyuser',
+            name='company',
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='company_users',
+                to='company.company',
+            ),
+        ),
+    ]

exportplan/migrations/0044_alter_companyexportplan_options.py

@@ -0,0 +1,16 @@
+# Generated by Django 4.1.13 on 2024-01-15 11:12
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('exportplan', '0043_alter_companyexportplan_about_your_business_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='companyexportplan',
+            options={'ordering': ['-modified'], 'verbose_name': 'Export Plan', 'verbose_name_plural': 'Export Plans'},
+        ),
+    ]

requirements.in

@@ -1,10 +1,10 @@
-django==4.1.13
+django==4.2
 dj-database-url==0.5.0
 django-environ==0.4.5
 django-extensions==3.2.1
 django-field-history==0.8.0
 djangorestframework==3.14.*
-django-storages==1.13.2
+django-storages==1.14.2
 django-flat-json-widget==0.2
 django-filter==22.*
 django-import-export==3.2.0
@@ -26,7 +26,7 @@ django-staff-sso-client==4.2.0
 directory-validators==9.3.0
 directory-constants==23.1.1
 directory-sso-api-client==7.2.3
-directory-healthcheck==3.1.2
+directory-healthcheck==3.2
 directory-forms-api-client>=7.2.2
 cryptography==41.0.6
 directory-components==39.1.3

requirements.txt

@@ -8,7 +8,7 @@ amqp==5.1.1
     # via kombu
 arabic-reshaper==3.0.0
     # via xhtml2pdf
-asgiref==3.5.2
+asgiref==3.7.2
     # via django
 asn1crypto==1.5.1
     # via
@@ -32,7 +32,6 @@ botocore==1.27.96
 celery[redis]==5.2.7
     # via
     #   -r requirements.in
-    #   celery
     #   django-celery-beat
 certifi==2023.7.22
     # via
@@ -84,15 +83,15 @@ directory-constants==23.1.1
     #   directory-components
 directory-forms-api-client==7.2.2
     # via -r requirements.in
-directory-healthcheck==3.1.2
+directory-healthcheck==3.2
     # via -r requirements.in
 directory-sso-api-client==7.2.3
     # via -r requirements.in
 directory-validators==9.3.0
     # via -r requirements.in
 dj-database-url==0.5.0
     # via -r requirements.in
-django==4.1.13
+django==4.2
     # via
     #   -r requirements.in
     #   directory-client-core
@@ -137,7 +136,7 @@ django-redis==5.2.0
     # via -r requirements.in
 django-staff-sso-client==4.2.0
     # via -r requirements.in
-django-storages==1.13.2
+django-storages==1.14.2
     # via -r requirements.in
 django-timezone-field==5.0
     # via django-celery-beat
@@ -164,8 +163,6 @@ faker==15.3.4
     # via factory-boy
 future==0.18.3
     # via django-json-widget
-greenlet==3.0.1
-    # via sqlalchemy
 html5lib==1.1
     # via xhtml2pdf
 idna==3.4
@@ -288,7 +285,6 @@ requests[security]==2.31.0
     #   notifications-python-client
     #   pyhanko
     #   pyhanko-certvalidator
-    #   requests
     #   requests-oauthlib
 requests-oauthlib==1.3.1
     # via django-staff-sso-client
@@ -321,15 +317,15 @@ sqlparse==0.4.4
 svglib==1.4.1
     # via xhtml2pdf
 tablib[html,ods,xls,xlsx,yaml]==3.4.0
-    # via
-    #   django-import-export
-    #   tablib
+    # via django-import-export
 tinycss2==1.2.1
     # via
     #   cssselect2
     #   svglib
 typing-extensions==4.7.1
-    # via pypdf
+    # via
+    #   asgiref
+    #   pypdf
 tzdata==2022.7
     # via
     #   django-celery-beat

requirements_test.in

@@ -7,7 +7,7 @@ pytest-sugar==0.9.2
 requests_mock==1.6.0
 freezegun==0.3.12
 pytest-codecov
-GitPython==3.1.37
+GitPython==3.1.41
 
 # Pinned because pre-commit features specific versions
 black==23.1.0

requirements_test.txt

@@ -8,7 +8,7 @@ amqp==5.0.9
     # via kombu
 arabic-reshaper==3.0.0
     # via xhtml2pdf
-asgiref==3.5.2
+asgiref==3.7.2
     # via django
 asn1crypto==1.5.1
     # via
@@ -40,7 +40,6 @@ botocore==1.27.96
 celery[redis]==5.2.3
     # via
     #   -r requirements.in
-    #   celery
     #   django-celery-beat
 certifi==2023.7.22
     # via
@@ -68,7 +67,6 @@ click-repl==0.2.0
     # via celery
 coverage[toml]==6.3
     # via
-    #   coverage
     #   pytest-codecov
     #   pytest-cov
 cron-descriptor==1.4.0
@@ -100,15 +98,15 @@ directory-constants==23.1.1
     #   directory-components
 directory-forms-api-client==7.2.2
     # via -r requirements.in
-directory-healthcheck==3.1.2
+directory-healthcheck==3.2
     # via -r requirements.in
 directory-sso-api-client==7.2.3
     # via -r requirements.in
 directory-validators==9.3.0
     # via -r requirements.in
 dj-database-url==0.5.0
     # via -r requirements.in
-django==4.1.13
+django==4.2
     # via
     #   -r requirements.in
     #   directory-client-core
@@ -153,7 +151,7 @@ django-redis==5.2.0
     # via -r requirements.in
 django-staff-sso-client==4.2.0
     # via -r requirements.in
-django-storages==1.13.2
+django-storages==1.14.2
     # via -r requirements.in
 django-timezone-field==5.0
     # via django-celery-beat
@@ -186,10 +184,8 @@ future==0.18.3
     # via django-json-widget
 gitdb==4.0.10
     # via gitpython
-gitpython==3.1.37
+gitpython==3.1.41
     # via -r requirements_test.in
-greenlet==3.0.1
-    # via sqlalchemy
 html5lib==1.1
     # via xhtml2pdf
 idna==2.10
@@ -358,7 +354,6 @@ requests[security]==2.31.0
     #   pyhanko
     #   pyhanko-certvalidator
     #   pytest-codecov
-    #   requests
     #   requests-mock
     #   requests-oauthlib
 requests-mock==1.6.0
@@ -402,9 +397,7 @@ sqlparse==0.4.4
 svglib==1.2.1
     # via xhtml2pdf
 tablib[html,ods,xls,xlsx,yaml]==3.4.0
-    # via
-    #   django-import-export
-    #   tablib
+    # via django-import-export
 termcolor==1.1.0
     # via pytest-sugar
 text-unidecode==1.3
@@ -422,6 +415,7 @@ tomli==1.2.3
     #   pytest
 typing-extensions==4.0.1
     # via
+    #   asgiref
     #   black
     #   pypdf
 tzdata==2022.1