Merge pull request #228 from uktrade/develop

UAT / PROD release
uktrade · Nov 17, 2023 · 9f42621 · 9f42621
2 parents c49527f + 6abcb53
commit 9f42621
Show file tree

Hide file tree

Showing 7 changed files with 122 additions and 90 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,7 +27,6 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
-
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.

diff --git a/config/settings/__init__.py b/config/settings/__init__.py
@@ -352,7 +352,7 @@
     LOGIN_URL = reverse_lazy('authbroker_client:login')
     LOGIN_REDIRECT_URL = reverse_lazy('admin:index')
 
-    # authbroker config
+# authbroker config
 AUTHBROKER_URL = env.str('STAFF_SSO_AUTHBROKER_URL')
 AUTHBROKER_CLIENT_ID = env.str('AUTHBROKER_CLIENT_ID')
 AUTHBROKER_CLIENT_SECRET = env.str('AUTHBROKER_CLIENT_SECRET')

diff --git a/config/wsgi.py b/config/wsgi.py
@@ -10,9 +10,7 @@
 import os
 
 from django.core.wsgi import get_wsgi_application
-from whitenoise.django import DjangoWhiteNoise
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
 
 application = get_wsgi_application()
-application = DjangoWhiteNoise(application)
diff --git a/makefile b/makefile
@@ -155,10 +155,10 @@ debug_shell:
 debug: test_requirements debug_test
 
 compile_requirements:
-	PIP_CONSTRAINT=cython_constraint.txt python -m piptools compile requirements.in
+	python -m piptools compile requirements.in
 
 compile_test_requirements:
-	PIP_CONSTRAINT=cython_constraint.txt python -m piptools compile requirements_test.in
+	python -m piptools compile requirements_test.in
 
 compile_all_requirements: compile_requirements && compile_test_requirements
 

diff --git a/requirements.in b/requirements.in
@@ -1,42 +1,42 @@
 boto3==1.17.*
 botocore==1.20.*
 dj-database-url==0.4.2
-django==2.2.28
-django-amazon-ses==4.0.0
-django-clear-cache==0.3
-django-crispy-forms==1.7.1
-django_recaptcha==3.0.0
-django-redis==4.8.0
-django-storages==1.12.3
-django-modeltranslation==0.13.1
+django==3.2.23
+django-amazon-ses>=4.0.0
+django-clear-cache>=0.3
+django-crispy-forms==2.0
+django_recaptcha>=3.0.0
+django-redis==5.4.0
+django-storages>=1.14.2
+django-modeltranslation>=0.18.10
 dj-database-url==0.4.2
-drf-spectacular==0.26.*
+drf-spectacular>=0.26.*
 gunicorn==19.7.1
 pillow==10.0.1
 waitress==2.1.2
 psycopg2-binary==2.8.6
 pytz==2021.3
 raven==6.5.0
-whitenoise==3.3.1
+whitenoise==6.6.0
 zenpy==1.1.10
 kombu<6.0,>=5.2.3
 celery[redis]>=5.2.2
-directory-validators>=8.0.1
+directory-validators>=9.3.1
 # Pinned at this commit as includes vital model import logic fix.
 # Should be merged in 0.5.1
-django-modelcluster==6.0
-django-taggit==1.0.*
-djangorestframework==3.12.4
+django-modelcluster>=6.0
+django-taggit>=1.0.*
+djangorestframework>=3.12.4
 sorl-thumbnail==12.9.0
-django-countries==5.2
-django-countries-plus==2.1.0
+django-countries>=7.5.1
+django-countries-plus>=2.1.0
 notifications-python-client==6.3.*
 weasyprint==52.5
 PyPDF2==1.27.9
-sigauth==4.3.0
+sigauth>=4.3.0
 bs4
 raven
-django-axes==4.4.0
+django-axes>=6.1.1
 requests[security]==2.31.0
 pyyaml==6.0.0
 django-environ==0.4.5
@@ -45,9 +45,9 @@ cryptography==41.0.4
 urllib3>=1.26.18
 # Latest django-moderation release(0.0.7) package has restriction for django upto 2.2 and we wanted to install
 # django 2.2.24 for critical vulnerabilities - hence installing from master
-django-moderation==0.8.0
-django-markdownx==3.0.1
+django-moderation>=0.8.0
+django-markdownx>=3.0.1
 Pyjwt==2.4.0
-django-staff-sso-client==3.1.1
+django-staff-sso-client>=3.1.1
 certifi==2023.7.22
 sqlparse>=0.4.4