Merge pull request #207 from ministryofjustice/LGA-2296-Update-insecu…

…re-packages LGA-2296: Update insecure packages flagged by Snyk and Dependabot
ministryofjustice · Dec 13, 2022 · 0446519 · 0446519
2 parents 445c193 + 4bf7d75
commit 0446519
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 15 deletions.
diff --git a/docker/run_worker.sh b/docker/run_worker.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 set -e
-exec celery worker -A laalaa --concurrency=${WORKER_APP_CONCURRENCY:-4} --loglevel=${LOG_LEVEL:-INFO}
+exec celery -A laalaa worker --concurrency=${WORKER_APP_CONCURRENCY:-4} --loglevel=${LOG_LEVEL:-INFO}
diff --git a/laalaa/apps/advisers/tasks.py b/laalaa/apps/advisers/tasks.py
@@ -115,6 +115,9 @@ def log_error(err):
                 locations.update(point=point)
                 self.update_state(state="RUNNING", meta={"count": n, "total": tot, "errors": self.errors})
 
+        # clean up task errors
+        self.errors = []
+
 
 class ProgressiveAdviserImport(Task):
     name = "advisers.tasks.ProgressiveAdviserImport"

diff --git a/laalaa/settings/base.py b/laalaa/settings/base.py
@@ -218,6 +218,8 @@ def traces_sampler(sampling_context):
 TEST_RUNNER = "xmlrunner.extra.djangotestrunner.XMLTestRunner"
 TEST_OUTPUT_DIR = "test-reports"
 
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
 # .local.py overrides all the common settings.
 try:
     from laalaa.settings.local import *  # noqa: F401,F403

diff --git a/laalaa/templates/admin_index.html b/laalaa/templates/admin_index.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_static %}
+{% load i18n static %}
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}" />{% endblock %}
 

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,17 +1,17 @@
-requests==2.20.0
-boto3==1.9.159
-celery[redis]==4.4.0
-django-celery-results==1.1.2
-django-filter==1.1
-django==2.2.28
-django-storages==1.7.1
-djangorestframework-gis==0.14.0
+requests==2.28.1
+boto3==1.24.95
+celery[redis]==5.2.3
+django-celery-results==2.4.0
+django-filter==2.4.0
+django==3.2.15
+django-storages==1.13.1
+djangorestframework-gis==0.15.0
 djangorestframework==3.11.2
 logstash-formatter==0.5.9
-psycopg2-binary==2.8.6
+psycopg2-binary==2.9.4
 sentry-sdk==0.19.3
 uwsgi==2.0.17.1
 xlrd==1.2.0
 django-moj-irat>=0.4
 dj-database-url==0.5.0
-importlib_metadata==4.11.4
+importlib_metadata==4.13.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -6,4 +6,4 @@ responses==0.9.0
 pre-commit==1.14.2
 unittest-xml-reporting==3.0.2
 coverage==5.0.3
-coveralls==1.11.0
+coveralls==3.3.1
diff --git a/requirements/jenkins.txt b/requirements/jenkins.txt