Merge branch 'master' into move-account-deletion-email

ocadotechnology · May 1, 2024 · f04ffbc · f04ffbc
2 parents af5330a + 46dffa1
commit f04ffbc
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 65 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/example_project/portal_test_settings.py b/example_project/portal_test_settings.py
@@ -60,6 +60,7 @@
         "NAME": os.path.join(
             os.path.abspath(os.path.dirname(__file__)), "db.sqlite3"
         ),  # Or path to database file if using sqlite3.
+        "ATOMIC_REQUESTS": True,
     }
 }
 

diff --git a/example_project/settings.py b/example_project/settings.py
@@ -11,6 +11,7 @@
         "NAME": os.path.join(
             os.path.abspath(os.path.dirname(__file__)), "db.sqlite3"
         ),  # Or path to database file if using sqlite3.
+        "ATOMIC_REQUESTS": True,
     }
 }
 

diff --git a/portal/__init__.py b/portal/__init__.py
@@ -1 +1 @@
-__version__ = "6.41.10"
+__version__ = "6.42.0"
diff --git a/portal/templates/portal/base.html b/portal/templates/portal/base.html
@@ -10,6 +10,7 @@
         </title>
         <meta name="msapplication-config" content="none"/>
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
+        <script type="text/javascript" src="{% static 'portal/js/lib/jquery.min.js' %}"></script>
         {% include "common/onetrust_cookies_consent_notice.html" %}
         {% block head %}
         {% endblock head %}
@@ -31,21 +32,14 @@
                   type="image/x-icon">
         {% endblock css %}
         {% include "portal/tag_manager/tag_manager_head.html" %}
-        <script type="text/javascript"
-                src="{% static 'portal/js/lib/jquery.min.js' %}"></script>
-        <script type="text/javascript"
-                src="{% static 'portal/js/lib/modernizr-build.js' %}"></script>
+
+        <script type="text/javascript" src="{% static 'portal/js/lib/modernizr-build.js' %}"></script>
         <script type="text/javascript" src="{% static 'portal/js/common.js' %}"></script>
-        <script type="text/javascript"
-                src="{% static 'portal/js/jquery.placeholder.js' %}"></script>
-        <script type="text/javascript"
-                src="{% static 'portal/js/lib/jquery.colorbox.js' %}"></script>
-        <script type="text/javascript"
-                src="{% static 'portal/js/lib/papaparse.min.js' %}"></script>
-        <script type="text/javascript"
-                src="{% static 'portal/js/sticky_subnav.js' %}"></script>
-        <script type="text/javascript"
-                src="{% static 'portal/js/bootstrap.min.js' %}"></script>
+        <script type="text/javascript" src="{% static 'portal/js/jquery.placeholder.js' %}"></script>
+        <script type="text/javascript" src="{% static 'portal/js/lib/jquery.colorbox.js' %}"></script>
+        <script type="text/javascript" src="{% static 'portal/js/lib/papaparse.min.js' %}"></script>
+        <script type="text/javascript" src="{% static 'portal/js/sticky_subnav.js' %}"></script>
+        <script type="text/javascript" src="{% static 'portal/js/bootstrap.min.js' %}"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/crypto-js.min.js"></script>
         <script src="https://code.iconify.design/2/2.0.3/iconify.min.js"
                 integrity="sha256-pRhh6noOilGT8GyGitRuoRwdp5k1p8QJW2lvyGz4B9M="

diff --git a/portal/tests/test_emails.py b/portal/tests/test_emails.py
@@ -59,6 +59,7 @@ def test_newsletter_calls_correct_requests(mocker, monkeypatch):
     mocked_add_to_address_book.assert_called_once()
 
 
+@pytest.mark.django_db
 def test_newsletter_get_not_allowed():
     c = Client()
 

diff --git a/setup.py b/setup.py
@@ -36,8 +36,7 @@
         "django-treebeard==4.3.1",
         "django-sekizai==2.0.0",
         "django-classy-tags==2.0.0",
-        "sqlparse==0.4.4",
-        "libsass==0.22.0",
+        "libsass==0.23.0",
         "phonenumbers==8.12.12",
         "more-itertools==8.7.0",
         f"cfl-common=={version}",