Django Version bump to 3.2p

mitodl · Jan 27, 2022 · 4e8c9c3 · 4e8c9c3
1 parent b7f8baf
commit 4e8c9c3
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 96 deletions.
diff --git a/authentication/middleware_test.py b/authentication/middleware_test.py
@@ -20,7 +20,7 @@ def test_process_exception_no_strategy(rf, settings):
 def test_process_exception(rf, settings):
     """Tests that a process_exception handles auth exceptions correctly"""
     settings.DEBUG = False
-    msg = "error message"
+    msg = "This account is already in use."
     request = rf.get(reverse("social:complete", args=("email",)))
     # social_django depends on request.sesssion, so use the middleware to set that
     SessionMiddleware().process_request(request)

diff --git a/cms/embeds.py b/cms/embeds.py
@@ -30,7 +30,7 @@ def __init__(self, providers=None, options=None):
 
         super().__init__(providers=providers, options=options)
 
-    def find_embed(self, url, max_width=None):
+    def find_embed(self, url, max_width=None):  # pylint: disable=arguments-differ
         embed = super().find_embed(url, max_width)
         embed_tag = BeautifulSoup(embed["html"], "html.parser")
         player_iframe = embed_tag.find("iframe")

diff --git a/cms/migrations/0051_new_page_data_migrations.py b/cms/migrations/0051_new_page_data_migrations.py
@@ -238,7 +238,7 @@ def reverse_migrate_data(apps, schema_editor):
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("wagtailcore", "0059_apply_collection_ordering"),
+        ("wagtailcore", "0062_comment_models_and_pagesubscription"),
         ("cms", "0050_news_and_events_page"),
     ]
 

diff --git a/cms/models.py b/cms/models.py
@@ -9,7 +9,7 @@
 
 import pytz
 from django.conf import settings
-from django.contrib.staticfiles.templatetags.staticfiles import static
+from django.templatetags.static import static
 from django.db import models
 from django.http.response import Http404
 from django.shortcuts import reverse

diff --git a/ecommerce/api_test.py b/ecommerce/api_test.py
@@ -227,19 +227,21 @@ def test_signed_payload(mocker, has_coupon, has_company, is_program_product, use
         "amount": str(total_price),
         "consumer_id": username,
         "currency": "USD",
-        "item_0_code": "program" if is_program_product else "course run",
+        "item_0_code": "courses | program"
+        if is_program_product
+        else "courses | course run",
         "item_0_name": line1.product_version.description,
         "item_0_quantity": line1.quantity,
         "item_0_sku": line1.product_version.product.content_object.id,
         "item_0_tax_amount": "0",
         "item_0_unit_price": str(line1.product_version.price),
-        "item_1_code": "course run",
+        "item_1_code": "courses | course run",
         "item_1_name": line2.product_version.description,
         "item_1_quantity": line2.quantity,
         "item_1_sku": line2.product_version.product.content_object.id,
         "item_1_tax_amount": "0",
         "item_1_unit_price": str(line2.product_version.price),
-        "item_2_code": "program",
+        "item_2_code": "courses | program",
         "item_2_name": line3.product_version.description,
         "item_2_quantity": line3.quantity,
         "item_2_sku": line3.product_version.product.content_object.id,
@@ -256,7 +258,9 @@ def test_signed_payload(mocker, has_coupon, has_company, is_program_product, use
         "transaction_type": "sale",
         "transaction_uuid": transaction_uuid,
         "unsigned_field_names": "",
-        "merchant_defined_data1": "program" if is_program_product else "course run",
+        "merchant_defined_data1": "courses | program"
+        if is_program_product
+        else "courses | course run",
         "merchant_defined_data2": content_object.readable_id
         if is_program_product
         else content_object.courseware_id,

diff --git a/pytest.ini b/pytest.ini
@@ -7,6 +7,7 @@ filterwarnings =
     ignore:Failed to load HostKeys
     ignore:Coverage disabled via --no-cov switch!
     ignore:.*Not importing directory.*:ImportWarning
+    ignore:.*:django.utils.deprecation.RemovedInDjango41Warning
 env =
   CELERY_TASK_ALWAYS_EAGER=True
   CYBERSOURCE_WSDL_URL=

diff --git a/requirements.in b/requirements.in
@@ -3,14 +3,14 @@ celery==4.3.0
 celery-redbeat==0.13.0
 boto3==1.16.63
 dj-database-url==0.5.0
-django==2.2.25
-django-anymail[mailgun]==6.1.0
+django
+django-anymail[mailgun]==8.4
 django-filter==2.3.0
 django-hijack==2.1.10
 django-hijack-admin==2.1.10
 django-ipware==3.0.0
-django-redis==4.10.0
-django-robots==3.1.0
+django-redis~=5.0.0
+django-robots~=4.0.0
 django-server-status==0.6.0
 django-webpack-loader==0.7.0
 django-oauth-toolkit==1.4.0
@@ -44,7 +44,7 @@ ua-parser==0.8.0
 user-agents==2.0
 user-util==0.1.5
 uwsgi
-wagtail==2.12.5
+wagtail==2.13.4
 wagtail-metadata==3.3.0
 zeep==3.4.0
 flaky==3.7.0