Merge pull request #226 from uktrade/develop

UAT / Prod release

makefile

@@ -158,7 +158,7 @@ compile_requirements:
 	PIP_CONSTRAINT=cython_constraint.txt python -m piptools compile requirements.in
 
 compile_test_requirements:
-	python -m piptools compile requirements_test.in
+	PIP_CONSTRAINT=cython_constraint.txt python -m piptools compile requirements_test.in
 
 compile_all_requirements: compile_requirements && compile_test_requirements
 

requirements.in

@@ -31,14 +31,14 @@ sorl-thumbnail==12.9.0
 django-countries==5.2
 django-countries-plus==2.1.0
 notifications-python-client==6.3.*
-weasyprint==53.4
+weasyprint==52.5
 PyPDF2==1.27.9
 sigauth==4.3.0
 bs4
 raven
 django-axes==4.4.0
 requests[security]==2.31.0
-pyyaml>=4.2b1,<6.0.0
+pyyaml==6.0.0
 django-environ==0.4.5
 oauthlib==3.2.2
 cryptography==41.0.4

requirements.txt

@@ -23,20 +23,27 @@ botocore==1.20.112
     #   -r requirements.in
     #   boto3
     #   s3transfer
-brotli==1.1.0
-    # via fonttools
 bs4==0.0.1
     # via -r requirements.in
 cachetools==2.0.1
     # via zenpy
+cairocffi==1.6.1
+    # via
+    #   cairosvg
+    #   weasyprint
+cairosvg==2.7.1
+    # via weasyprint
 celery[redis]==5.2.3
-    # via -r requirements.in
+    # via
+    #   -r requirements.in
+    #   celery
 certifi==2023.7.22
     # via
     #   -r requirements.in
     #   requests
 cffi==1.14.5
     # via
+    #   cairocffi
     #   cryptography
     #   weasyprint
 charset-normalizer==3.0.1
@@ -56,7 +63,11 @@ click-repl==0.2.0
 cryptography==41.0.4
     # via -r requirements.in
 cssselect2==0.2.1
-    # via weasyprint
+    # via
+    #   cairosvg
+    #   weasyprint
+defusedxml==0.7.1
+    # via cairosvg
 directory-validators==8.0.1
     # via -r requirements.in
 dj-database-url==0.4.2
@@ -123,8 +134,6 @@ docopt==0.6.2
     # via notifications-python-client
 drf-spectacular==0.26.2
     # via -r requirements.in
-fonttools[woff]==4.43.1
-    # via weasyprint
 gunicorn==19.7.1
     # via -r requirements.in
 html5lib==1.0.1
@@ -158,6 +167,7 @@ olefile==0.44
 pillow==10.0.1
     # via
     #   -r requirements.in
+    #   cairosvg
     #   directory-validators
     #   django-markdownx
     #   weasyprint
@@ -167,8 +177,6 @@ psycopg2-binary==2.8.6
     # via -r requirements.in
 pycparser==2.18
     # via cffi
-pydyf==0.8.0
-    # via weasyprint
 pyjwt==2.4.0
     # via
     #   -r requirements.in
@@ -191,7 +199,7 @@ pytz==2021.3
     #   django
     #   django-axes
     #   django-modelcluster
-pyyaml==5.4.1
+pyyaml==6.0
     # via
     #   -r requirements.in
     #   drf-spectacular
@@ -206,6 +214,7 @@ requests[security]==2.31.0
     #   -r requirements.in
     #   django-countries-plus
     #   notifications-python-client
+    #   requests
     #   requests-oauthlib
     #   zenpy
 requests-oauthlib==1.3.0
@@ -228,6 +237,7 @@ sqlparse==0.4.4
     #   django
 tinycss2==1.1.0
     # via
+    #   cairosvg
     #   cssselect2
     #   weasyprint
 uritemplate==4.1.1
@@ -247,7 +257,7 @@ waitress==2.1.2
     # via -r requirements.in
 wcwidth==0.2.5
     # via prompt-toolkit
-weasyprint==53.4
+weasyprint==52.5
     # via -r requirements.in
 webencodings==0.5.1
     # via
@@ -257,8 +267,6 @@ whitenoise==3.3.1
     # via -r requirements.in
 zenpy==1.1.10
     # via -r requirements.in
-zopfli==0.2.3
-    # via fonttools
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements_test.in

@@ -0,0 +1,16 @@
+-r requirements.in
+
+# Testing
+# ------------
+beautifulsoup4==4.6.0
+flake8==4.0.1
+gitpython==3.1.37
+jinja2==3.1.2
+markupsafe==2.1.2
+moto==4.1.3
+pytest==7.3.1
+pytest-codecov==0.5.1
+pytest-cov==4.0.0
+pytest-django==4.5.2
+pytest-sugar==0.9.7
+werkzeug==3.0.1

requirements_test.txt

@@ -4,8 +4,6 @@
 #
 #    pip-compile requirements_test.in
 #
--e git+https://github.com/dominno/django-moderation.git#egg=django-moderation
-    # via -r requirements.in
 amqp==5.0.9
     # via kombu
 async-timeout==4.0.2
@@ -33,14 +31,16 @@ bs4==0.0.1
     # via -r requirements.in
 cachetools==2.0.1
     # via zenpy
-cairocffi==1.2.0
+cairocffi==1.6.1
     # via
     #   cairosvg
     #   weasyprint
-cairosvg==2.7.0
+cairosvg==2.7.1
     # via weasyprint
 celery[redis]==5.2.3
-    # via -r requirements.in
+    # via
+    #   -r requirements.in
+    #   celery
 certifi==2023.7.22
     # via
     #   -r requirements.in
@@ -66,17 +66,18 @@ click-repl==0.2.0
     # via celery
 coverage[toml]==7.2.5
     # via
+    #   coverage
     #   pytest-codecov
     #   pytest-cov
-cryptography==41.0.3
+cryptography==41.0.4
     # via
     #   -r requirements.in
     #   moto
 cssselect2==0.2.1
     # via
     #   cairosvg
     #   weasyprint
-defusedxml==0.5.0
+defusedxml==0.7.1
     # via cairosvg
 directory-validators==8.0.1
     # via -r requirements.in
@@ -94,6 +95,7 @@ django==2.2.28
     #   django-moderation
     #   django-recaptcha
     #   django-staff-sso-client
+    #   django-storages
     #   django-taggit
     #   djangorestframework
     #   drf-spectacular
@@ -122,13 +124,15 @@ django-modelcluster==6.0
     # via -r requirements.in
 django-modeltranslation==0.13.1
     # via -r requirements.in
-django-recaptcha==1.2.0
+django-moderation==0.8.0
+    # via -r requirements.in
+django-recaptcha==3.0.0
     # via -r requirements.in
 django-redis==4.8.0
     # via -r requirements.in
 django-staff-sso-client==3.1.1
     # via -r requirements.in
-django-storages==1.6.5
+django-storages==1.12.3
     # via -r requirements.in
 django-taggit==1.0.0
     # via -r requirements.in
@@ -198,12 +202,13 @@ packaging==21.3
     # via
     #   pytest
     #   pytest-sugar
-pillow==9.3.0
+pillow==10.0.1
     # via
     #   -r requirements.in
     #   cairosvg
     #   directory-validators
     #   django-markdownx
+    #   weasyprint
 pluggy==0.13.1
     # via pytest
 prompt-toolkit==3.0.19
@@ -219,7 +224,6 @@ pyflakes==2.4.0
 pyjwt==2.4.0
     # via
     #   -r requirements.in
-    #   -r requirements_test.in
     #   notifications-python-client
 pyparsing==3.0.6
     # via packaging
@@ -259,7 +263,7 @@ pytz==2021.3
     #   django
     #   django-axes
     #   django-modelcluster
-pyyaml==5.4.1
+pyyaml==6.0
     # via
     #   -r requirements.in
     #   drf-spectacular
@@ -276,6 +280,7 @@ requests[security]==2.31.0
     #   moto
     #   notifications-python-client
     #   pytest-codecov
+    #   requests
     #   requests-oauthlib
     #   responses
     #   zenpy
@@ -296,7 +301,7 @@ six==1.11.0
     #   responses
 smmap==5.0.0
     # via gitdb
-sorl-thumbnail==12.4.1
+sorl-thumbnail==12.9.0
     # via -r requirements.in
 sqlparse==0.4.4
     # via
@@ -315,7 +320,7 @@ tomli==2.0.1
     #   pytest
 uritemplate==4.1.1
     # via drf-spectacular
-urllib3==1.26.5
+urllib3==1.26.18
     # via
     #   -r requirements.in
     #   botocore
@@ -331,13 +336,13 @@ waitress==2.1.2
     # via -r requirements.in
 wcwidth==0.2.5
     # via prompt-toolkit
-weasyprint==51
+weasyprint==52.5
     # via -r requirements.in
 webencodings==0.5.1
     # via
     #   html5lib
     #   tinycss2
-werkzeug==2.2.3
+werkzeug==3.0.1
     # via
     #   -r requirements_test.in
     #   moto