From 02993ef5c1c73271d72206435796ba7a042a6a8b Mon Sep 17 00:00:00 2001
From: Awais Qureshi <awais.qureshi@arbisoft.com>
Date: Tue, 5 May 2020 19:36:18 +0500
Subject: [PATCH 1/2] BOM-1593 pylint-django plugin issue with wagtail fixed.
 run make upgrade.

---
 .annotation_safe_list.yml                     |  2 +
 .travis.yml                                   |  2 -
 designer/apps/api/v1/serializers.py           |  5 +-
 designer/apps/api/v1/test_pages_api.py        |  5 +-
 designer/apps/api/v1/views.py                 |  2 +-
 designer/apps/branding/tests/utils.py         |  1 -
 designer/apps/core/apps.py                    |  2 +-
 designer/apps/core/constants.py               |  2 +-
 designer/apps/core/models.py                  |  4 +-
 designer/apps/core/signals.py                 |  2 +-
 designer/apps/core/tests/utils.py             |  1 -
 designer/apps/pages/models.py                 |  5 +-
 .../apps/pages/tests/test_create_pages.py     |  3 +-
 designer/apps/pages/tests/utils.py            |  1 -
 designer/urls.py                              |  2 +-
 requirements/base.txt                         | 22 ++++----
 requirements/dev.txt                          | 49 +++++++++---------
 requirements/doc.txt                          | 51 ++++++++++---------
 requirements/pip-tools.txt                    |  4 +-
 requirements/production.txt                   | 28 +++++-----
 requirements/quality.in                       |  2 +-
 requirements/quality.txt                      | 45 ++++++++--------
 requirements/test.in                          |  2 +-
 requirements/test.txt                         | 45 ++++++++--------
 24 files changed, 151 insertions(+), 136 deletions(-)

diff --git a/.annotation_safe_list.yml b/.annotation_safe_list.yml
index fff085d9..dc33c9ff 100644
--- a/.annotation_safe_list.yml
+++ b/.annotation_safe_list.yml
@@ -75,3 +75,5 @@ wagtailusers.UserProfile:
     ".. no_pii:": "This model has no PII"
 blacklist.BlacklistedToken:
     ".. no_pii:": "This model has no PII"
+wagtailimages.UploadedImage:
+    ".. no_pii:": "This model has no PII"
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 51eaeb1f..e5366e2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,8 +23,6 @@ matrix:
     - python: '3.8'
       env: TESTNAME=translations
       script: make validate_translations
-  allow_failures:
-    - python: 3.8
 sudo: false
 cache: pip
 install:
diff --git a/designer/apps/api/v1/serializers.py b/designer/apps/api/v1/serializers.py
index 9d15c69a..816a4242 100644
--- a/designer/apps/api/v1/serializers.py
+++ b/designer/apps/api/v1/serializers.py
@@ -16,7 +16,8 @@ class Meta:
         )
 
 
-class BrandedPageSerializerMixin(object):
+class BrandedPageSerializerMixin:
+    """Serializer fot the Branded page."""
 
     def get_branding(self, obj):
         """
@@ -177,7 +178,7 @@ def get_hostname(self, obj):
 
 
 class EnterprisePageSerializer(BrandedPageSerializerMixin, serializers.ModelSerializer):
-
+    """  Serializer for Enterprisepage."""
     branding = serializers.SerializerMethodField()
 
     class Meta:
diff --git a/designer/apps/api/v1/test_pages_api.py b/designer/apps/api/v1/test_pages_api.py
index 1c6a317f..24f624b1 100644
--- a/designer/apps/api/v1/test_pages_api.py
+++ b/designer/apps/api/v1/test_pages_api.py
@@ -1,10 +1,11 @@
 """ Test the Designer Pages API """
 from django.test import TestCase
 from django.urls import reverse
-from designer.apps.core.tests.utils import DEFAULT_WAGTAIL_PAGES
-from designer.apps.pages.tests.utils import create_site, create_program_page
 from wagtail.core.models import Page
 
+from designer.apps.core.tests.utils import DEFAULT_WAGTAIL_PAGES
+from designer.apps.pages.tests.utils import create_program_page, create_site
+
 
 class TestDesignerPagesAPIEndpoint(TestCase):
     """ Tests for DesignerPagesAPIEndpoint """
diff --git a/designer/apps/api/v1/views.py b/designer/apps/api/v1/views.py
index 275ddf2d..a8f6318f 100644
--- a/designer/apps/api/v1/views.py
+++ b/designer/apps/api/v1/views.py
@@ -52,7 +52,7 @@ def get_queryset(self):
         queryset = queryset.public().live().specific()
         return queryset
 
-    def get(self, request):  # pylint: disable=unused-argument
+    def get(self, request):
         """Returns a list of Page-derived objects, filtered by hostname"""
         hostname = self.request.query_params.get('hostname')
         queryset = self.get_queryset()
diff --git a/designer/apps/branding/tests/utils.py b/designer/apps/branding/tests/utils.py
index 5212a1f1..8fe26eec 100644
--- a/designer/apps/branding/tests/utils.py
+++ b/designer/apps/branding/tests/utils.py
@@ -1,4 +1,3 @@
-# pylint: disable=E1101
 """Utilities to enabling testing of Branding related code"""
 import factory
 from faker import Faker
diff --git a/designer/apps/core/apps.py b/designer/apps/core/apps.py
index b2dd4e03..ebb44581 100644
--- a/designer/apps/core/apps.py
+++ b/designer/apps/core/apps.py
@@ -7,4 +7,4 @@ class CoreConfig(AppConfig):
     name = 'designer.apps.core'
 
     def ready(self):
-        from . import signals  # pylint: disable=unused-variable
+        from . import signals  # pylint: disable=unused-import
diff --git a/designer/apps/core/constants.py b/designer/apps/core/constants.py
index 3154a440..d6f5f320 100644
--- a/designer/apps/core/constants.py
+++ b/designer/apps/core/constants.py
@@ -1,7 +1,7 @@
 """ Constants for the core app. """
 
 
-class Status(object):
+class Status:
     """Health statuses."""
     OK = u"OK"
     UNAVAILABLE = u"UNAVAILABLE"
diff --git a/designer/apps/core/models.py b/designer/apps/core/models.py
index ba86c3ea..33c83255 100644
--- a/designer/apps/core/models.py
+++ b/designer/apps/core/models.py
@@ -24,11 +24,11 @@ def access_token(self):
         Assumes user has authenticated at least once with edX Open ID Connect.
         """
         try:
-            return self.social_auth.first().extra_data[u'access_token']
+            return self.social_auth.first().extra_data[u'access_token']  # pylint: disable=no-member
         except Exception:  # pylint: disable=broad-except
             return None
 
-    class Meta(object):
+    class Meta:
         get_latest_by = 'date_joined'
 
     def get_full_name(self):
diff --git a/designer/apps/core/signals.py b/designer/apps/core/signals.py
index cee73bf7..ffbb618a 100644
--- a/designer/apps/core/signals.py
+++ b/designer/apps/core/signals.py
@@ -17,7 +17,7 @@
 # but should always exist any time afterwards.
 @receiver(post_save, sender=User)
 def add_observer_group_to_staff(instance, **kwargs):
-    # if the user already exists, just return.
+    """ return the user already exists, otherwise just return. """
     if kwargs['update_fields']:
         return
     if instance.is_staff:
diff --git a/designer/apps/core/tests/utils.py b/designer/apps/core/tests/utils.py
index 6826620c..88699673 100644
--- a/designer/apps/core/tests/utils.py
+++ b/designer/apps/core/tests/utils.py
@@ -1,4 +1,3 @@
-# pylint: disable=E1101
 """Utilities to enabling testing of Site related code"""
 import random
 import factory
diff --git a/designer/apps/pages/models.py b/designer/apps/pages/models.py
index d6ee6ffd..ec15a6a8 100644
--- a/designer/apps/pages/models.py
+++ b/designer/apps/pages/models.py
@@ -15,6 +15,7 @@
 from wagtail.core.fields import StreamField
 from wagtail.core.models import Page
 from wagtail.documents.blocks import DocumentChooserBlock
+from wagtail.images.models import Image
 
 from designer.apps.branding.models import Branding
 from designer.apps.branding.utils import validate_hexadecimal_color
@@ -191,7 +192,7 @@ class ProgramPageBranding(Branding):
     page = ParentalKey(ProgramPage, on_delete=models.CASCADE, related_name='branding', unique=True)
 
     cover_image = models.ForeignKey(
-        'wagtailimages.Image',
+        Image,
         null=True,
         blank=False,
         on_delete=models.SET_NULL,
@@ -199,7 +200,7 @@ class ProgramPageBranding(Branding):
         verbose_name='Cover Image'
     )
     texture_image = models.ForeignKey(
-        'wagtailimages.Image',
+        Image,
         null=True,
         blank=False,
         on_delete=models.SET_NULL,
diff --git a/designer/apps/pages/tests/test_create_pages.py b/designer/apps/pages/tests/test_create_pages.py
index 9803d219..10b992ea 100644
--- a/designer/apps/pages/tests/test_create_pages.py
+++ b/designer/apps/pages/tests/test_create_pages.py
@@ -1,4 +1,3 @@
-# pylint: disable=E1101
 """ Test Creation of Pages """
 from random import getrandbits, randint
 
@@ -20,7 +19,7 @@
 fake.add_provider(color)
 
 
-class PageCreationMixin(object):
+class PageCreationMixin:
     """
     Mixin for testing page creation
     """
diff --git a/designer/apps/pages/tests/utils.py b/designer/apps/pages/tests/utils.py
index 65a49b91..9e2fa309 100644
--- a/designer/apps/pages/tests/utils.py
+++ b/designer/apps/pages/tests/utils.py
@@ -1,4 +1,3 @@
-# pylint: disable=E1101
 """ Page Factories """
 import json
 from random import getrandbits, randint
diff --git a/designer/urls.py b/designer/urls.py
index f77187e3..ae0614b9 100644
--- a/designer/urls.py
+++ b/designer/urls.py
@@ -48,5 +48,5 @@
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 if settings.DEBUG and os.environ.get('ENABLE_DJANGO_TOOLBAR', False):  # pragma: no cover
-    import debug_toolbar
+    import debug_toolbar  # pylint: disable=import-error
     urlpatterns.append(url(r'^__debug__/', include(debug_toolbar.urls)))
diff --git a/requirements/base.txt b/requirements/base.txt
index 1a4349fa..c966069b 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-beautifulsoup4==4.6.0     # via wagtail
+beautifulsoup4==4.8.2     # via wagtail
 certifi==2020.4.5.1       # via requests
 chardet==3.0.4            # via requests
 coreapi==2.3.3            # via django-rest-swagger, openapi-codec
@@ -23,10 +23,10 @@ djangorestframework==3.11.0  # via -r requirements/base.in, django-rest-swagger,
 draftjs-exporter==2.1.7   # via wagtail
 drf-jwt==1.14.0           # via edx-drf-extensions
 edx-auth-backends==3.0.2  # via -r requirements/base.in
-edx-django-release-util==0.4.2  # via -r requirements/base.in
-edx-django-utils==3.2.1   # via -r requirements/base.in, edx-drf-extensions, edx-rest-api-client
-edx-drf-extensions==5.0.2  # via -r requirements/base.in
-edx-opaque-keys==2.0.2    # via edx-drf-extensions
+edx-django-release-util==0.4.4  # via -r requirements/base.in
+edx-django-utils==3.2.2   # via -r requirements/base.in, edx-drf-extensions, edx-rest-api-client
+edx-drf-extensions==6.0.0  # via -r requirements/base.in
+edx-opaque-keys==2.1.0    # via edx-drf-extensions
 edx_rest_api_client==4.0.1  # via -r requirements/base.in
 future==0.18.2            # via pyjwkest
 html5lib==1.0.1           # via wagtail
@@ -39,11 +39,11 @@ l18n==2018.5              # via wagtail
 markupsafe==1.1.1         # via jinja2
 mock==3.0.5               # via -r requirements/base.in
 mysqlclient==1.4.6        # via -r requirements/base.in
-newrelic==5.12.0.140      # via edx-django-utils
+newrelic==5.12.1.141      # via edx-django-utils
 oauthlib==3.1.0           # via requests-oauthlib, social-auth-core
 openapi-codec==1.3.2      # via django-rest-swagger
 pbr==5.4.5                # via stevedore
-pillow==6.2.2             # via wagtail
+pillow==7.1.2             # via wagtail
 psutil==1.2.1             # via edx-django-utils
 pycryptodomex==3.9.7      # via pyjwkest
 pyjwkest==1.4.2           # via edx-drf-extensions
@@ -51,23 +51,25 @@ pyjwt==1.7.1              # via drf-jwt, edx-auth-backends, edx-rest-api-client,
 pymongo==3.10.1           # via edx-opaque-keys
 python-dateutil==2.8.0    # via -r requirements/base.in, edx-drf-extensions
 python3-openid==3.1.0     # via social-auth-core
-pytz==2019.3              # via -r requirements/base.in, django, django-modelcluster, l18n
+pytz==2020.1              # via -r requirements/base.in, django, django-modelcluster, l18n
 pyyaml==5.3.1             # via edx-django-release-util
 requests-oauthlib==1.3.0  # via social-auth-core
 requests==2.23.0          # via coreapi, edx-drf-extensions, edx-rest-api-client, pyjwkest, requests-oauthlib, slumber, social-auth-core, wagtail
 rest-condition==1.0.3     # via edx-drf-extensions
-semantic-version==2.8.4   # via edx-drf-extensions
+semantic-version==2.8.5   # via edx-drf-extensions
 simplejson==3.17.0        # via django-rest-swagger
 six==1.14.0               # via django-extensions, django-waffle, edx-auth-backends, edx-django-release-util, edx-drf-extensions, edx-opaque-keys, html5lib, l18n, mock, pyjwkest, python-dateutil, social-auth-app-django, social-auth-core, stevedore
 slumber==0.7.1            # via edx-rest-api-client
 git+https://github.com/python-social-auth/social-app-django.git@c00d23c2b45c3317bd35b15ad1b959338689cef8#egg=social-auth-app-django  # via -r requirements/github.in, edx-auth-backends
 social-auth-core==3.2.0   # via -r requirements/base.in, edx-auth-backends, social-auth-app-django
+soupsieve==2.0            # via beautifulsoup4
 sqlparse==0.3.1           # via django
 stevedore==1.32.0         # via edx-opaque-keys
 unidecode==1.1.1          # via wagtail
 uritemplate==3.0.1        # via coreapi
 urllib3==1.25.9           # via requests
-wagtail==2.8.1            # via -r requirements/base.in
+wagtail==2.9              # via -r requirements/base.in
 webencodings==0.5.1       # via html5lib
 willow==1.3               # via wagtail
+xlsxwriter==1.2.8         # via wagtail
 zipp==1.2.0               # via -r requirements/base.in, importlib-metadata
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 0695a874..c8e9bcc9 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -6,16 +6,16 @@
 #
 appdirs==1.4.3            # via -r requirements/quality.txt, virtualenv
 argparse==1.4.0           # via -r requirements/quality.txt, caniusepython3
-astroid==1.5.3            # via -r requirements/quality.txt, pylint, pylint-celery
+astroid==2.3.3            # via -r requirements/quality.txt, pylint, pylint-celery
 attrs==19.3.0             # via -r requirements/quality.txt, pytest
 backports.functools-lru-cache==1.6.1  # via -r requirements/quality.txt, caniusepython3
-beautifulsoup4==4.6.0     # via -r requirements/quality.txt, wagtail
+beautifulsoup4==4.8.2     # via -r requirements/quality.txt, wagtail
 caniusepython3==7.2.0     # via -r requirements/quality.txt
 certifi==2020.4.5.1       # via -r requirements/quality.txt, requests
 chardet==3.0.4            # via -r requirements/quality.txt, requests
 click-log==0.3.2          # via -r requirements/quality.txt, edx-lint
-click==7.1.1              # via -r requirements/pip-tools.txt, -r requirements/quality.txt, click-log, code-annotations, edx-lint, pip-tools
-code-annotations==0.3.3   # via -r requirements/quality.txt
+click==7.1.2              # via -r requirements/pip-tools.txt, -r requirements/quality.txt, click-log, code-annotations, edx-lint, pip-tools
+code-annotations==0.3.4   # via -r requirements/quality.txt
 coreapi==2.3.3            # via -r requirements/quality.txt, django-rest-swagger, openapi-codec
 coreschema==0.0.4         # via -r requirements/quality.txt, coreapi
 coverage==5.1             # via -r requirements/quality.txt, pytest-cov
@@ -37,12 +37,12 @@ djangorestframework==3.11.0  # via -r requirements/quality.txt, django-rest-swag
 draftjs-exporter==2.1.7   # via -r requirements/quality.txt, wagtail
 drf-jwt==1.14.0           # via -r requirements/quality.txt, edx-drf-extensions
 edx-auth-backends==3.0.2  # via -r requirements/quality.txt
-edx-django-release-util==0.4.2  # via -r requirements/quality.txt
-edx-django-utils==3.2.1   # via -r requirements/quality.txt, edx-drf-extensions, edx-rest-api-client
-edx-drf-extensions==5.0.2  # via -r requirements/quality.txt
-edx-i18n-tools==0.5.0     # via -r requirements/dev.in
-edx-lint==1.3.0           # via -r requirements/quality.txt
-edx-opaque-keys==2.0.2    # via -r requirements/quality.txt, edx-drf-extensions
+edx-django-release-util==0.4.4  # via -r requirements/quality.txt
+edx-django-utils==3.2.2   # via -r requirements/quality.txt, edx-drf-extensions, edx-rest-api-client
+edx-drf-extensions==6.0.0  # via -r requirements/quality.txt
+edx-i18n-tools==0.5.1     # via -r requirements/dev.in
+edx-lint==1.4.1           # via -r requirements/quality.txt
+edx-opaque-keys==2.1.0    # via -r requirements/quality.txt, edx-drf-extensions
 edx_rest_api_client==4.0.1  # via -r requirements/quality.txt
 factory-boy==2.12.0       # via -r requirements/quality.txt
 faker==4.0.3              # via -r requirements/quality.txt, factory-boy
@@ -51,7 +51,7 @@ future==0.18.2            # via -r requirements/quality.txt, pyjwkest
 html5lib==1.0.1           # via -r requirements/quality.txt, wagtail
 idna==2.9                 # via -r requirements/quality.txt, requests
 importlib-metadata==1.6.0  # via -r requirements/quality.txt, importlib-resources, inflect, path, pluggy, pytest, tox, virtualenv
-importlib-resources==1.4.0  # via -r requirements/quality.txt, virtualenv
+importlib-resources==1.5.0  # via -r requirements/quality.txt, virtualenv
 inflect==3.0.2            # via -r requirements/quality.txt, jinja2-pluralize
 isort==4.3.21             # via -r requirements/quality.txt, pylint
 itypes==1.2.0             # via -r requirements/quality.txt, coreapi
@@ -64,7 +64,7 @@ mccabe==0.6.1             # via -r requirements/quality.txt, pylint
 mock==3.0.5               # via -r requirements/quality.txt
 more-itertools==8.2.0     # via -r requirements/quality.txt, pytest
 mysqlclient==1.4.6        # via -r requirements/quality.txt
-newrelic==5.12.0.140      # via -r requirements/quality.txt, edx-django-utils
+newrelic==5.12.1.141      # via -r requirements/quality.txt, edx-django-utils
 oauthlib==3.1.0           # via -r requirements/quality.txt, requests-oauthlib, social-auth-core
 openapi-codec==1.3.2      # via -r requirements/quality.txt, django-rest-swagger
 packaging==20.3           # via -r requirements/quality.txt, caniusepython3, pytest, tox
@@ -72,8 +72,8 @@ path.py==12.4.0           # via edx-i18n-tools
 path==13.1.0              # via path.py
 pathlib2==2.3.5           # via -r requirements/quality.txt, pytest
 pbr==5.4.5                # via -r requirements/quality.txt, stevedore
-pillow==6.2.2             # via -r requirements/quality.txt, wagtail
-pip-tools==5.0.0          # via -r requirements/pip-tools.txt
+pillow==7.1.2             # via -r requirements/quality.txt, wagtail
+pip-tools==5.1.2          # via -r requirements/pip-tools.txt
 pluggy==0.13.1            # via -r requirements/quality.txt, diff-cover, pytest, tox
 polib==1.1.0              # via edx-i18n-tools
 psutil==1.2.1             # via -r requirements/quality.txt, edx-django-utils
@@ -85,9 +85,9 @@ pygments==2.6.1           # via diff-cover
 pyjwkest==1.4.2           # via -r requirements/quality.txt, edx-drf-extensions
 pyjwt==1.7.1              # via -r requirements/quality.txt, drf-jwt, edx-auth-backends, edx-rest-api-client, social-auth-core
 pylint-celery==0.3        # via -r requirements/quality.txt, edx-lint
-pylint-django==0.7.2      # via -r requirements/quality.txt, edx-lint
+pylint-django==2.0.11     # via -r requirements/quality.txt, edx-lint
 pylint-plugin-utils==0.6  # via -r requirements/quality.txt, pylint-celery, pylint-django
-pylint==1.7.6             # via -r requirements/quality.txt, edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pylint==2.4.2             # via -r requirements/quality.txt, edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
 pymongo==3.10.1           # via -r requirements/quality.txt, edx-opaque-keys
 pyparsing==2.4.7          # via -r requirements/quality.txt, packaging
 pytest-cov==2.8.1         # via -r requirements/quality.txt
@@ -96,32 +96,35 @@ pytest==5.4.1             # via -r requirements/quality.txt, pytest-cov, pytest-
 python-dateutil==2.8.0    # via -r requirements/quality.txt, edx-drf-extensions, faker
 python-slugify==4.0.0     # via -r requirements/quality.txt, code-annotations
 python3-openid==3.1.0     # via -r requirements/quality.txt, social-auth-core
-pytz==2019.3              # via -r requirements/quality.txt, django, django-modelcluster, l18n
+pytz==2020.1              # via -r requirements/quality.txt, django, django-modelcluster, l18n
 pyyaml==5.3.1             # via -r requirements/quality.txt, code-annotations, edx-django-release-util, edx-i18n-tools
 requests-oauthlib==1.3.0  # via -r requirements/quality.txt, social-auth-core
 requests==2.23.0          # via -r requirements/quality.txt, caniusepython3, coreapi, edx-drf-extensions, edx-rest-api-client, pyjwkest, requests-oauthlib, slumber, social-auth-core, wagtail
 rest-condition==1.0.3     # via -r requirements/quality.txt, edx-drf-extensions
-semantic-version==2.8.4   # via -r requirements/quality.txt, edx-drf-extensions
+semantic-version==2.8.5   # via -r requirements/quality.txt, edx-drf-extensions
 simplejson==3.17.0        # via -r requirements/quality.txt, django-rest-swagger
-six==1.14.0               # via -r requirements/pip-tools.txt, -r requirements/quality.txt, astroid, diff-cover, django-dynamic-fixture, django-extensions, django-waffle, edx-auth-backends, edx-django-release-util, edx-drf-extensions, edx-i18n-tools, edx-lint, edx-opaque-keys, html5lib, l18n, mock, packaging, pathlib2, pip-tools, pyjwkest, pylint, python-dateutil, social-auth-app-django, social-auth-core, stevedore, tox, virtualenv
+six==1.14.0               # via -r requirements/pip-tools.txt, -r requirements/quality.txt, astroid, diff-cover, django-dynamic-fixture, django-extensions, django-waffle, edx-auth-backends, edx-django-release-util, edx-drf-extensions, edx-i18n-tools, edx-lint, edx-opaque-keys, html5lib, l18n, mock, packaging, pathlib2, pip-tools, pyjwkest, python-dateutil, social-auth-app-django, social-auth-core, stevedore, tox, virtualenv
 slumber==0.7.1            # via -r requirements/quality.txt, edx-rest-api-client
 snowballstemmer==2.0.0    # via -r requirements/quality.txt, pydocstyle
 git+https://github.com/python-social-auth/social-app-django.git@c00d23c2b45c3317bd35b15ad1b959338689cef8#egg=social-auth-app-django  # via -r requirements/quality.txt, edx-auth-backends
 social-auth-core==3.2.0   # via -r requirements/quality.txt, edx-auth-backends, social-auth-app-django
+soupsieve==2.0            # via -r requirements/quality.txt, beautifulsoup4
 sqlparse==0.3.1           # via -r requirements/quality.txt, django, django-debug-toolbar
 stevedore==1.32.0         # via -r requirements/quality.txt, code-annotations, edx-opaque-keys
 text-unidecode==1.3       # via -r requirements/quality.txt, faker, python-slugify
 toml==0.10.0              # via -r requirements/quality.txt, tox
-tox==3.14.6               # via -r requirements/quality.txt
+tox==3.15.0               # via -r requirements/quality.txt
+typed-ast==1.4.1          # via -r requirements/quality.txt, astroid
 unidecode==1.1.1          # via -r requirements/quality.txt, wagtail
 uritemplate==3.0.1        # via -r requirements/quality.txt, coreapi
 urllib3==1.25.9           # via -r requirements/quality.txt, requests
-virtualenv==20.0.18       # via -r requirements/quality.txt, tox
-wagtail==2.8.1            # via -r requirements/quality.txt
+virtualenv==20.0.20       # via -r requirements/quality.txt, tox
+wagtail==2.9              # via -r requirements/quality.txt
 wcwidth==0.1.9            # via -r requirements/quality.txt, pytest
 webencodings==0.5.1       # via -r requirements/quality.txt, html5lib
 willow==1.3               # via -r requirements/quality.txt, wagtail
-wrapt==1.12.1             # via -r requirements/quality.txt, astroid
+wrapt==1.11.2             # via -r requirements/quality.txt, astroid
+xlsxwriter==1.2.8         # via -r requirements/quality.txt, wagtail
 zipp==1.2.0               # via -r requirements/quality.txt, importlib-metadata, importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/doc.txt b/requirements/doc.txt
index 9ebedb72..41d3795e 100644
--- a/requirements/doc.txt
+++ b/requirements/doc.txt
@@ -6,16 +6,16 @@
 #
 alabaster==0.7.12         # via sphinx
 appdirs==1.4.3            # via -r requirements/test.txt, virtualenv
-astroid==1.5.3            # via -r requirements/test.txt, pylint, pylint-celery
+astroid==2.3.3            # via -r requirements/test.txt, pylint, pylint-celery
 attrs==19.3.0             # via -r requirements/test.txt, pytest
 babel==2.8.0              # via sphinx
-beautifulsoup4==4.6.0     # via -r requirements/test.txt, wagtail
-bleach==3.1.4             # via readme-renderer
+beautifulsoup4==4.8.2     # via -r requirements/test.txt, wagtail
+bleach==3.1.5             # via readme-renderer
 certifi==2020.4.5.1       # via -r requirements/test.txt, requests
 chardet==3.0.4            # via -r requirements/test.txt, doc8, requests
 click-log==0.3.2          # via -r requirements/test.txt, edx-lint
-click==7.1.1              # via -r requirements/test.txt, click-log, code-annotations, edx-lint
-code-annotations==0.3.3   # via -r requirements/test.txt
+click==7.1.2              # via -r requirements/test.txt, click-log, code-annotations, edx-lint
+code-annotations==0.3.4   # via -r requirements/test.txt
 coreapi==2.3.3            # via -r requirements/test.txt, django-rest-swagger, openapi-codec
 coreschema==0.0.4         # via -r requirements/test.txt, coreapi
 coverage==5.1             # via -r requirements/test.txt, pytest-cov
@@ -37,11 +37,11 @@ docutils==0.16            # via doc8, readme-renderer, restructuredtext-lint, sp
 draftjs-exporter==2.1.7   # via -r requirements/test.txt, wagtail
 drf-jwt==1.14.0           # via -r requirements/test.txt, edx-drf-extensions
 edx-auth-backends==3.0.2  # via -r requirements/test.txt
-edx-django-release-util==0.4.2  # via -r requirements/test.txt
-edx-django-utils==3.2.1   # via -r requirements/test.txt, edx-drf-extensions, edx-rest-api-client
-edx-drf-extensions==5.0.2  # via -r requirements/test.txt
-edx-lint==1.3.0           # via -r requirements/test.txt
-edx-opaque-keys==2.0.2    # via -r requirements/test.txt, edx-drf-extensions
+edx-django-release-util==0.4.4  # via -r requirements/test.txt
+edx-django-utils==3.2.2   # via -r requirements/test.txt, edx-drf-extensions, edx-rest-api-client
+edx-drf-extensions==6.0.0  # via -r requirements/test.txt
+edx-lint==1.4.1           # via -r requirements/test.txt
+edx-opaque-keys==2.1.0    # via -r requirements/test.txt, edx-drf-extensions
 edx-sphinx-theme==1.5.0   # via -r requirements/doc.in
 edx_rest_api_client==4.0.1  # via -r requirements/test.txt
 factory-boy==2.12.0       # via -r requirements/test.txt
@@ -52,7 +52,7 @@ html5lib==1.0.1           # via -r requirements/test.txt, wagtail
 idna==2.9                 # via -r requirements/test.txt, requests
 imagesize==1.2.0          # via sphinx
 importlib-metadata==1.6.0  # via -r requirements/test.txt, importlib-resources, inflect, pluggy, pytest, tox, virtualenv
-importlib-resources==1.4.0  # via -r requirements/test.txt, virtualenv
+importlib-resources==1.5.0  # via -r requirements/test.txt, virtualenv
 inflect==3.0.2            # via -r requirements/test.txt
 isort==4.3.21             # via -r requirements/test.txt, pylint
 itypes==1.2.0             # via -r requirements/test.txt, coreapi
@@ -64,13 +64,13 @@ mccabe==0.6.1             # via -r requirements/test.txt, pylint
 mock==3.0.5               # via -r requirements/test.txt
 more-itertools==8.2.0     # via -r requirements/test.txt, pytest
 mysqlclient==1.4.6        # via -r requirements/test.txt
-newrelic==5.12.0.140      # via -r requirements/test.txt, edx-django-utils
+newrelic==5.12.1.141      # via -r requirements/test.txt, edx-django-utils
 oauthlib==3.1.0           # via -r requirements/test.txt, requests-oauthlib, social-auth-core
 openapi-codec==1.3.2      # via -r requirements/test.txt, django-rest-swagger
-packaging==20.3           # via -r requirements/test.txt, pytest, sphinx, tox
+packaging==20.3           # via -r requirements/test.txt, bleach, pytest, sphinx, tox
 pathlib2==2.3.5           # via -r requirements/test.txt, pytest
 pbr==5.4.5                # via -r requirements/test.txt, stevedore
-pillow==6.2.2             # via -r requirements/test.txt, wagtail
+pillow==7.1.2             # via -r requirements/test.txt, wagtail
 pluggy==0.13.1            # via -r requirements/test.txt, pytest, tox
 psutil==1.2.1             # via -r requirements/test.txt, edx-django-utils
 py==1.8.1                 # via -r requirements/test.txt, pytest, tox
@@ -79,9 +79,9 @@ pygments==2.6.1           # via readme-renderer, sphinx
 pyjwkest==1.4.2           # via -r requirements/test.txt, edx-drf-extensions
 pyjwt==1.7.1              # via -r requirements/test.txt, drf-jwt, edx-auth-backends, edx-rest-api-client, social-auth-core
 pylint-celery==0.3        # via -r requirements/test.txt, edx-lint
-pylint-django==0.7.2      # via -r requirements/test.txt, edx-lint
+pylint-django==2.0.11     # via -r requirements/test.txt, edx-lint
 pylint-plugin-utils==0.6  # via -r requirements/test.txt, pylint-celery, pylint-django
-pylint==1.7.6             # via -r requirements/test.txt, edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pylint==2.4.2             # via -r requirements/test.txt, edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
 pymongo==3.10.1           # via -r requirements/test.txt, edx-opaque-keys
 pyparsing==2.4.7          # via -r requirements/test.txt, packaging
 pytest-cov==2.8.1         # via -r requirements/test.txt
@@ -90,21 +90,22 @@ pytest==5.4.1             # via -r requirements/test.txt, pytest-cov, pytest-dja
 python-dateutil==2.8.0    # via -r requirements/test.txt, edx-drf-extensions, faker
 python-slugify==4.0.0     # via -r requirements/test.txt, code-annotations
 python3-openid==3.1.0     # via -r requirements/test.txt, social-auth-core
-pytz==2019.3              # via -r requirements/test.txt, babel, django, django-modelcluster, l18n
+pytz==2020.1              # via -r requirements/test.txt, babel, django, django-modelcluster, l18n
 pyyaml==5.3.1             # via -r requirements/test.txt, code-annotations, edx-django-release-util
 readme-renderer==26.0     # via -r requirements/doc.in
 requests-oauthlib==1.3.0  # via -r requirements/test.txt, social-auth-core
 requests==2.23.0          # via -r requirements/test.txt, coreapi, edx-drf-extensions, edx-rest-api-client, pyjwkest, requests-oauthlib, slumber, social-auth-core, sphinx, wagtail
 rest-condition==1.0.3     # via -r requirements/test.txt, edx-drf-extensions
 restructuredtext-lint==1.3.0  # via doc8
-semantic-version==2.8.4   # via -r requirements/test.txt, edx-drf-extensions
+semantic-version==2.8.5   # via -r requirements/test.txt, edx-drf-extensions
 simplejson==3.17.0        # via -r requirements/test.txt, django-rest-swagger
-six==1.14.0               # via -r requirements/test.txt, astroid, bleach, django-dynamic-fixture, django-extensions, django-waffle, doc8, edx-auth-backends, edx-django-release-util, edx-drf-extensions, edx-lint, edx-opaque-keys, edx-sphinx-theme, html5lib, l18n, mock, packaging, pathlib2, pyjwkest, pylint, python-dateutil, readme-renderer, social-auth-app-django, social-auth-core, stevedore, tox, virtualenv
+six==1.14.0               # via -r requirements/test.txt, astroid, bleach, django-dynamic-fixture, django-extensions, django-waffle, doc8, edx-auth-backends, edx-django-release-util, edx-drf-extensions, edx-lint, edx-opaque-keys, edx-sphinx-theme, html5lib, l18n, mock, packaging, pathlib2, pyjwkest, python-dateutil, readme-renderer, social-auth-app-django, social-auth-core, stevedore, tox, virtualenv
 slumber==0.7.1            # via -r requirements/test.txt, edx-rest-api-client
 snowballstemmer==2.0.0    # via sphinx
 git+https://github.com/python-social-auth/social-app-django.git@c00d23c2b45c3317bd35b15ad1b959338689cef8#egg=social-auth-app-django  # via -r requirements/test.txt, edx-auth-backends
 social-auth-core==3.2.0   # via -r requirements/test.txt, edx-auth-backends, social-auth-app-django
-sphinx==3.0.2             # via -r requirements/doc.in, edx-sphinx-theme
+soupsieve==2.0            # via -r requirements/test.txt, beautifulsoup4
+sphinx==3.0.3             # via -r requirements/doc.in, edx-sphinx-theme
 sphinxcontrib-applehelp==1.0.2  # via sphinx
 sphinxcontrib-devhelp==1.0.2  # via sphinx
 sphinxcontrib-htmlhelp==1.0.3  # via sphinx
@@ -115,16 +116,18 @@ sqlparse==0.3.1           # via -r requirements/test.txt, django
 stevedore==1.32.0         # via -r requirements/test.txt, code-annotations, doc8, edx-opaque-keys
 text-unidecode==1.3       # via -r requirements/test.txt, faker, python-slugify
 toml==0.10.0              # via -r requirements/test.txt, tox
-tox==3.14.6               # via -r requirements/test.txt
+tox==3.15.0               # via -r requirements/test.txt
+typed-ast==1.4.1          # via -r requirements/test.txt, astroid
 unidecode==1.1.1          # via -r requirements/test.txt, wagtail
 uritemplate==3.0.1        # via -r requirements/test.txt, coreapi
 urllib3==1.25.9           # via -r requirements/test.txt, requests
-virtualenv==20.0.18       # via -r requirements/test.txt, tox
-wagtail==2.8.1            # via -r requirements/test.txt
+virtualenv==20.0.20       # via -r requirements/test.txt, tox
+wagtail==2.9              # via -r requirements/test.txt
 wcwidth==0.1.9            # via -r requirements/test.txt, pytest
 webencodings==0.5.1       # via -r requirements/test.txt, bleach, html5lib
 willow==1.3               # via -r requirements/test.txt, wagtail
-wrapt==1.12.1             # via -r requirements/test.txt, astroid
+wrapt==1.11.2             # via -r requirements/test.txt, astroid
+xlsxwriter==1.2.8         # via -r requirements/test.txt, wagtail
 zipp==1.2.0               # via -r requirements/test.txt, importlib-metadata, importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
index 86d87e5c..89fbde99 100644
--- a/requirements/pip-tools.txt
+++ b/requirements/pip-tools.txt
@@ -4,8 +4,8 @@
 #
 #    make upgrade
 #
-click==7.1.1              # via pip-tools
-pip-tools==5.0.0          # via -r requirements/pip-tools.in
+click==7.1.2              # via pip-tools
+pip-tools==5.1.2          # via -r requirements/pip-tools.in
 six==1.14.0               # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/production.txt b/requirements/production.txt
index 33678bf9..d8032eb0 100644
--- a/requirements/production.txt
+++ b/requirements/production.txt
@@ -4,9 +4,9 @@
 #
 #    make upgrade
 #
-beautifulsoup4==4.6.0     # via -r requirements/base.txt, wagtail
-boto3==1.12.45            # via -r requirements/production.in
-botocore==1.15.45         # via boto3, s3transfer
+beautifulsoup4==4.8.2     # via -r requirements/base.txt, wagtail
+boto3==1.13.3             # via -r requirements/production.in
+botocore==1.16.3          # via boto3, s3transfer
 certifi==2020.4.5.1       # via -r requirements/base.txt, requests
 chardet==3.0.4            # via -r requirements/base.txt, requests
 coreapi==2.3.3            # via -r requirements/base.txt, django-rest-swagger, openapi-codec
@@ -26,13 +26,13 @@ docutils==0.15.2          # via botocore
 draftjs-exporter==2.1.7   # via -r requirements/base.txt, wagtail
 drf-jwt==1.14.0           # via -r requirements/base.txt, edx-drf-extensions
 edx-auth-backends==3.0.2  # via -r requirements/base.txt
-edx-django-release-util==0.4.2  # via -r requirements/base.txt
-edx-django-utils==3.2.1   # via -r requirements/base.txt, edx-drf-extensions, edx-rest-api-client
-edx-drf-extensions==5.0.2  # via -r requirements/base.txt
-edx-opaque-keys==2.0.2    # via -r requirements/base.txt, edx-drf-extensions
+edx-django-release-util==0.4.4  # via -r requirements/base.txt
+edx-django-utils==3.2.2   # via -r requirements/base.txt, edx-drf-extensions, edx-rest-api-client
+edx-drf-extensions==6.0.0  # via -r requirements/base.txt
+edx-opaque-keys==2.1.0    # via -r requirements/base.txt, edx-drf-extensions
 edx_rest_api_client==4.0.1  # via -r requirements/base.txt
 future==0.18.2            # via -r requirements/base.txt, pyjwkest
-gevent==20.4.0            # via -r requirements/production.in
+gevent==20.5.0            # via -r requirements/production.in
 greenlet==0.4.15          # via gevent
 gunicorn==20.0.4          # via -r requirements/production.in
 html5lib==1.0.1           # via -r requirements/base.txt, wagtail
@@ -46,11 +46,11 @@ l18n==2018.5              # via -r requirements/base.txt, wagtail
 markupsafe==1.1.1         # via -r requirements/base.txt, jinja2
 mock==3.0.5               # via -r requirements/base.txt
 mysqlclient==1.4.6        # via -r requirements/base.txt
-newrelic==5.12.0.140      # via -r requirements/base.txt, edx-django-utils
+newrelic==5.12.1.141      # via -r requirements/base.txt, edx-django-utils
 oauthlib==3.1.0           # via -r requirements/base.txt, requests-oauthlib, social-auth-core
 openapi-codec==1.3.2      # via -r requirements/base.txt, django-rest-swagger
 pbr==5.4.5                # via -r requirements/base.txt, stevedore
-pillow==6.2.2             # via -r requirements/base.txt, wagtail
+pillow==7.1.2             # via -r requirements/base.txt, wagtail
 psutil==1.2.1             # via -r requirements/base.txt, edx-django-utils
 pycryptodomex==3.9.7      # via -r requirements/base.txt, pyjwkest
 pyjwkest==1.4.2           # via -r requirements/base.txt, edx-drf-extensions
@@ -59,26 +59,28 @@ pymongo==3.10.1           # via -r requirements/base.txt, edx-opaque-keys
 python-dateutil==2.8.0    # via -r requirements/base.txt, botocore, edx-drf-extensions
 python-memcached==1.59    # via -r requirements/production.in
 python3-openid==3.1.0     # via -r requirements/base.txt, social-auth-core
-pytz==2019.3              # via -r requirements/base.txt, django, django-modelcluster, l18n
+pytz==2020.1              # via -r requirements/base.txt, django, django-modelcluster, l18n
 pyyaml==5.3.1             # via -r requirements/base.txt, -r requirements/production.in, edx-django-release-util
 requests-oauthlib==1.3.0  # via -r requirements/base.txt, social-auth-core
 requests==2.23.0          # via -r requirements/base.txt, coreapi, edx-drf-extensions, edx-rest-api-client, pyjwkest, requests-oauthlib, slumber, social-auth-core, wagtail
 rest-condition==1.0.3     # via -r requirements/base.txt, edx-drf-extensions
 s3transfer==0.3.3         # via boto3
-semantic-version==2.8.4   # via -r requirements/base.txt, edx-drf-extensions
+semantic-version==2.8.5   # via -r requirements/base.txt, edx-drf-extensions
 simplejson==3.17.0        # via -r requirements/base.txt, django-rest-swagger
 six==1.14.0               # via -r requirements/base.txt, django-extensions, django-waffle, edx-auth-backends, edx-django-release-util, edx-drf-extensions, edx-opaque-keys, html5lib, l18n, mock, pyjwkest, python-dateutil, python-memcached, social-auth-app-django, social-auth-core, stevedore
 slumber==0.7.1            # via -r requirements/base.txt, edx-rest-api-client
 git+https://github.com/python-social-auth/social-app-django.git@c00d23c2b45c3317bd35b15ad1b959338689cef8#egg=social-auth-app-django  # via -r requirements/base.txt, edx-auth-backends
 social-auth-core==3.2.0   # via -r requirements/base.txt, edx-auth-backends, social-auth-app-django
+soupsieve==2.0            # via -r requirements/base.txt, beautifulsoup4
 sqlparse==0.3.1           # via -r requirements/base.txt, django
 stevedore==1.32.0         # via -r requirements/base.txt, edx-opaque-keys
 unidecode==1.1.1          # via -r requirements/base.txt, wagtail
 uritemplate==3.0.1        # via -r requirements/base.txt, coreapi
 urllib3==1.25.9           # via -r requirements/base.txt, botocore, requests
-wagtail==2.8.1            # via -r requirements/base.txt
+wagtail==2.9              # via -r requirements/base.txt
 webencodings==0.5.1       # via -r requirements/base.txt, html5lib
 willow==1.3               # via -r requirements/base.txt, wagtail
+xlsxwriter==1.2.8         # via -r requirements/base.txt, wagtail
 zipp==1.2.0               # via -r requirements/base.txt, importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/quality.in b/requirements/quality.in
index 8ba41ee4..e4fabe4e 100644
--- a/requirements/quality.in
+++ b/requirements/quality.in
@@ -3,7 +3,7 @@
 -r test.txt               # Core and testing dependencies for this package
 
 caniusepython3            # Additional Python 3 compatibility pylint checks
-edx-lint==1.3.0           # There is a compatibility issues with newer versions of pylint-django and wagtail that will be fixed in https://github.com/wagtail/wagtail/pull/5538
+edx-lint==1.4.1
 isort                     # to standardize order of imports
 pycodestyle               # PEP 8 compliance validation
 pydocstyle                # PEP 257 compliance validation
diff --git a/requirements/quality.txt b/requirements/quality.txt
index 847bf451..4a88a1bb 100644
--- a/requirements/quality.txt
+++ b/requirements/quality.txt
@@ -6,16 +6,16 @@
 #
 appdirs==1.4.3            # via -r requirements/test.txt, virtualenv
 argparse==1.4.0           # via caniusepython3
-astroid==1.5.3            # via -r requirements/test.txt, pylint, pylint-celery
+astroid==2.3.3            # via -r requirements/test.txt, pylint, pylint-celery
 attrs==19.3.0             # via -r requirements/test.txt, pytest
 backports.functools-lru-cache==1.6.1  # via caniusepython3
-beautifulsoup4==4.6.0     # via -r requirements/test.txt, wagtail
+beautifulsoup4==4.8.2     # via -r requirements/test.txt, wagtail
 caniusepython3==7.2.0     # via -r requirements/quality.in
 certifi==2020.4.5.1       # via -r requirements/test.txt, requests
 chardet==3.0.4            # via -r requirements/test.txt, requests
 click-log==0.3.2          # via -r requirements/test.txt, edx-lint
-click==7.1.1              # via -r requirements/test.txt, click-log, code-annotations, edx-lint
-code-annotations==0.3.3   # via -r requirements/test.txt
+click==7.1.2              # via -r requirements/test.txt, click-log, code-annotations, edx-lint
+code-annotations==0.3.4   # via -r requirements/test.txt
 coreapi==2.3.3            # via -r requirements/test.txt, django-rest-swagger, openapi-codec
 coreschema==0.0.4         # via -r requirements/test.txt, coreapi
 coverage==5.1             # via -r requirements/test.txt, pytest-cov
@@ -35,11 +35,11 @@ djangorestframework==3.11.0  # via -r requirements/test.txt, django-rest-swagger
 draftjs-exporter==2.1.7   # via -r requirements/test.txt, wagtail
 drf-jwt==1.14.0           # via -r requirements/test.txt, edx-drf-extensions
 edx-auth-backends==3.0.2  # via -r requirements/test.txt
-edx-django-release-util==0.4.2  # via -r requirements/test.txt
-edx-django-utils==3.2.1   # via -r requirements/test.txt, edx-drf-extensions, edx-rest-api-client
-edx-drf-extensions==5.0.2  # via -r requirements/test.txt
-edx-lint==1.3.0           # via -r requirements/quality.in, -r requirements/test.txt
-edx-opaque-keys==2.0.2    # via -r requirements/test.txt, edx-drf-extensions
+edx-django-release-util==0.4.4  # via -r requirements/test.txt
+edx-django-utils==3.2.2   # via -r requirements/test.txt, edx-drf-extensions, edx-rest-api-client
+edx-drf-extensions==6.0.0  # via -r requirements/test.txt
+edx-lint==1.4.1           # via -r requirements/quality.in, -r requirements/test.txt
+edx-opaque-keys==2.1.0    # via -r requirements/test.txt, edx-drf-extensions
 edx_rest_api_client==4.0.1  # via -r requirements/test.txt
 factory-boy==2.12.0       # via -r requirements/test.txt
 faker==4.0.3              # via -r requirements/test.txt, factory-boy
@@ -48,7 +48,7 @@ future==0.18.2            # via -r requirements/test.txt, pyjwkest
 html5lib==1.0.1           # via -r requirements/test.txt, wagtail
 idna==2.9                 # via -r requirements/test.txt, requests
 importlib-metadata==1.6.0  # via -r requirements/test.txt, importlib-resources, inflect, pluggy, pytest, tox, virtualenv
-importlib-resources==1.4.0  # via -r requirements/test.txt, virtualenv
+importlib-resources==1.5.0  # via -r requirements/test.txt, virtualenv
 inflect==3.0.2            # via -r requirements/test.txt
 isort==4.3.21             # via -r requirements/quality.in, -r requirements/test.txt, pylint
 itypes==1.2.0             # via -r requirements/test.txt, coreapi
@@ -60,13 +60,13 @@ mccabe==0.6.1             # via -r requirements/test.txt, pylint
 mock==3.0.5               # via -r requirements/test.txt
 more-itertools==8.2.0     # via -r requirements/test.txt, pytest
 mysqlclient==1.4.6        # via -r requirements/test.txt
-newrelic==5.12.0.140      # via -r requirements/test.txt, edx-django-utils
+newrelic==5.12.1.141      # via -r requirements/test.txt, edx-django-utils
 oauthlib==3.1.0           # via -r requirements/test.txt, requests-oauthlib, social-auth-core
 openapi-codec==1.3.2      # via -r requirements/test.txt, django-rest-swagger
 packaging==20.3           # via -r requirements/test.txt, caniusepython3, pytest, tox
 pathlib2==2.3.5           # via -r requirements/test.txt, pytest
 pbr==5.4.5                # via -r requirements/test.txt, stevedore
-pillow==6.2.2             # via -r requirements/test.txt, wagtail
+pillow==7.1.2             # via -r requirements/test.txt, wagtail
 pluggy==0.13.1            # via -r requirements/test.txt, pytest, tox
 psutil==1.2.1             # via -r requirements/test.txt, edx-django-utils
 py==1.8.1                 # via -r requirements/test.txt, pytest, tox
@@ -76,9 +76,9 @@ pydocstyle==5.0.2         # via -r requirements/quality.in
 pyjwkest==1.4.2           # via -r requirements/test.txt, edx-drf-extensions
 pyjwt==1.7.1              # via -r requirements/test.txt, drf-jwt, edx-auth-backends, edx-rest-api-client, social-auth-core
 pylint-celery==0.3        # via -r requirements/test.txt, edx-lint
-pylint-django==0.7.2      # via -r requirements/test.txt, edx-lint
+pylint-django==2.0.11     # via -r requirements/test.txt, edx-lint
 pylint-plugin-utils==0.6  # via -r requirements/test.txt, pylint-celery, pylint-django
-pylint==1.7.6             # via -r requirements/test.txt, edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pylint==2.4.2             # via -r requirements/test.txt, edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
 pymongo==3.10.1           # via -r requirements/test.txt, edx-opaque-keys
 pyparsing==2.4.7          # via -r requirements/test.txt, packaging
 pytest-cov==2.8.1         # via -r requirements/test.txt
@@ -87,32 +87,35 @@ pytest==5.4.1             # via -r requirements/test.txt, pytest-cov, pytest-dja
 python-dateutil==2.8.0    # via -r requirements/test.txt, edx-drf-extensions, faker
 python-slugify==4.0.0     # via -r requirements/test.txt, code-annotations
 python3-openid==3.1.0     # via -r requirements/test.txt, social-auth-core
-pytz==2019.3              # via -r requirements/test.txt, django, django-modelcluster, l18n
+pytz==2020.1              # via -r requirements/test.txt, django, django-modelcluster, l18n
 pyyaml==5.3.1             # via -r requirements/test.txt, code-annotations, edx-django-release-util
 requests-oauthlib==1.3.0  # via -r requirements/test.txt, social-auth-core
 requests==2.23.0          # via -r requirements/test.txt, caniusepython3, coreapi, edx-drf-extensions, edx-rest-api-client, pyjwkest, requests-oauthlib, slumber, social-auth-core, wagtail
 rest-condition==1.0.3     # via -r requirements/test.txt, edx-drf-extensions
-semantic-version==2.8.4   # via -r requirements/test.txt, edx-drf-extensions
+semantic-version==2.8.5   # via -r requirements/test.txt, edx-drf-extensions
 simplejson==3.17.0        # via -r requirements/test.txt, django-rest-swagger
-six==1.14.0               # via -r requirements/test.txt, astroid, django-dynamic-fixture, django-extensions, django-waffle, edx-auth-backends, edx-django-release-util, edx-drf-extensions, edx-lint, edx-opaque-keys, html5lib, l18n, mock, packaging, pathlib2, pyjwkest, pylint, python-dateutil, social-auth-app-django, social-auth-core, stevedore, tox, virtualenv
+six==1.14.0               # via -r requirements/test.txt, astroid, django-dynamic-fixture, django-extensions, django-waffle, edx-auth-backends, edx-django-release-util, edx-drf-extensions, edx-lint, edx-opaque-keys, html5lib, l18n, mock, packaging, pathlib2, pyjwkest, python-dateutil, social-auth-app-django, social-auth-core, stevedore, tox, virtualenv
 slumber==0.7.1            # via -r requirements/test.txt, edx-rest-api-client
 snowballstemmer==2.0.0    # via pydocstyle
 git+https://github.com/python-social-auth/social-app-django.git@c00d23c2b45c3317bd35b15ad1b959338689cef8#egg=social-auth-app-django  # via -r requirements/test.txt, edx-auth-backends
 social-auth-core==3.2.0   # via -r requirements/test.txt, edx-auth-backends, social-auth-app-django
+soupsieve==2.0            # via -r requirements/test.txt, beautifulsoup4
 sqlparse==0.3.1           # via -r requirements/test.txt, django
 stevedore==1.32.0         # via -r requirements/test.txt, code-annotations, edx-opaque-keys
 text-unidecode==1.3       # via -r requirements/test.txt, faker, python-slugify
 toml==0.10.0              # via -r requirements/test.txt, tox
-tox==3.14.6               # via -r requirements/test.txt
+tox==3.15.0               # via -r requirements/test.txt
+typed-ast==1.4.1          # via -r requirements/test.txt, astroid
 unidecode==1.1.1          # via -r requirements/test.txt, wagtail
 uritemplate==3.0.1        # via -r requirements/test.txt, coreapi
 urllib3==1.25.9           # via -r requirements/test.txt, requests
-virtualenv==20.0.18       # via -r requirements/test.txt, tox
-wagtail==2.8.1            # via -r requirements/test.txt
+virtualenv==20.0.20       # via -r requirements/test.txt, tox
+wagtail==2.9              # via -r requirements/test.txt
 wcwidth==0.1.9            # via -r requirements/test.txt, pytest
 webencodings==0.5.1       # via -r requirements/test.txt, html5lib
 willow==1.3               # via -r requirements/test.txt, wagtail
-wrapt==1.12.1             # via -r requirements/test.txt, astroid
+wrapt==1.11.2             # via -r requirements/test.txt, astroid
+xlsxwriter==1.2.8         # via -r requirements/test.txt, wagtail
 zipp==1.2.0               # via -r requirements/test.txt, importlib-metadata, importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/test.in b/requirements/test.in
index 712c49c9..214b6278 100644
--- a/requirements/test.in
+++ b/requirements/test.in
@@ -5,7 +5,7 @@
 code-annotations
 coverage
 django-dynamic-fixture    # library to create dynamic model instances for testing purposes
-edx-lint==1.3.0
+edx-lint==1.4.1
 Faker
 factory_boy
 mock==3.0.5
diff --git a/requirements/test.txt b/requirements/test.txt
index e1c8f404..fee91b44 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -5,14 +5,14 @@
 #    make upgrade
 #
 appdirs==1.4.3            # via virtualenv
-astroid==1.5.3            # via pylint, pylint-celery
+astroid==2.3.3            # via pylint, pylint-celery
 attrs==19.3.0             # via pytest
-beautifulsoup4==4.6.0     # via -r requirements/base.txt, wagtail
+beautifulsoup4==4.8.2     # via -r requirements/base.txt, wagtail
 certifi==2020.4.5.1       # via -r requirements/base.txt, requests
 chardet==3.0.4            # via -r requirements/base.txt, requests
 click-log==0.3.2          # via edx-lint
-click==7.1.1              # via click-log, code-annotations, edx-lint
-code-annotations==0.3.3   # via -r requirements/test.in
+click==7.1.2              # via click-log, code-annotations, edx-lint
+code-annotations==0.3.4   # via -r requirements/test.in
 coreapi==2.3.3            # via -r requirements/base.txt, django-rest-swagger, openapi-codec
 coreschema==0.0.4         # via -r requirements/base.txt, coreapi
 coverage==5.1             # via -r requirements/test.in, pytest-cov
@@ -31,11 +31,11 @@ djangorestframework==3.11.0  # via -r requirements/base.txt, django-rest-swagger
 draftjs-exporter==2.1.7   # via -r requirements/base.txt, wagtail
 drf-jwt==1.14.0           # via -r requirements/base.txt, edx-drf-extensions
 edx-auth-backends==3.0.2  # via -r requirements/base.txt
-edx-django-release-util==0.4.2  # via -r requirements/base.txt
-edx-django-utils==3.2.1   # via -r requirements/base.txt, edx-drf-extensions, edx-rest-api-client
-edx-drf-extensions==5.0.2  # via -r requirements/base.txt
-edx-lint==1.3.0           # via -r requirements/test.in
-edx-opaque-keys==2.0.2    # via -r requirements/base.txt, edx-drf-extensions
+edx-django-release-util==0.4.4  # via -r requirements/base.txt
+edx-django-utils==3.2.2   # via -r requirements/base.txt, edx-drf-extensions, edx-rest-api-client
+edx-drf-extensions==6.0.0  # via -r requirements/base.txt
+edx-lint==1.4.1           # via -r requirements/test.in
+edx-opaque-keys==2.1.0    # via -r requirements/base.txt, edx-drf-extensions
 edx_rest_api_client==4.0.1  # via -r requirements/base.txt
 factory-boy==2.12.0       # via -r requirements/test.in
 faker==4.0.3              # via -r requirements/test.in, factory-boy
@@ -44,7 +44,7 @@ future==0.18.2            # via -r requirements/base.txt, pyjwkest
 html5lib==1.0.1           # via -r requirements/base.txt, wagtail
 idna==2.9                 # via -r requirements/base.txt, requests
 importlib-metadata==1.6.0  # via -r requirements/base.txt, importlib-resources, inflect, pluggy, pytest, tox, virtualenv
-importlib-resources==1.4.0  # via virtualenv
+importlib-resources==1.5.0  # via virtualenv
 inflect==3.0.2            # via -r requirements/base.txt
 isort==4.3.21             # via pylint
 itypes==1.2.0             # via -r requirements/base.txt, coreapi
@@ -56,13 +56,13 @@ mccabe==0.6.1             # via pylint
 mock==3.0.5               # via -r requirements/base.txt, -r requirements/test.in
 more-itertools==8.2.0     # via pytest
 mysqlclient==1.4.6        # via -r requirements/base.txt
-newrelic==5.12.0.140      # via -r requirements/base.txt, edx-django-utils
+newrelic==5.12.1.141      # via -r requirements/base.txt, edx-django-utils
 oauthlib==3.1.0           # via -r requirements/base.txt, requests-oauthlib, social-auth-core
 openapi-codec==1.3.2      # via -r requirements/base.txt, django-rest-swagger
 packaging==20.3           # via pytest, tox
 pathlib2==2.3.5           # via pytest
 pbr==5.4.5                # via -r requirements/base.txt, stevedore
-pillow==6.2.2             # via -r requirements/base.txt, wagtail
+pillow==7.1.2             # via -r requirements/base.txt, wagtail
 pluggy==0.13.1            # via pytest, tox
 psutil==1.2.1             # via -r requirements/base.txt, edx-django-utils
 py==1.8.1                 # via pytest, tox
@@ -70,9 +70,9 @@ pycryptodomex==3.9.7      # via -r requirements/base.txt, pyjwkest
 pyjwkest==1.4.2           # via -r requirements/base.txt, edx-drf-extensions
 pyjwt==1.7.1              # via -r requirements/base.txt, drf-jwt, edx-auth-backends, edx-rest-api-client, social-auth-core
 pylint-celery==0.3        # via edx-lint
-pylint-django==0.7.2      # via edx-lint
+pylint-django==2.0.11     # via edx-lint
 pylint-plugin-utils==0.6  # via pylint-celery, pylint-django
-pylint==1.7.6             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pylint==2.4.2             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
 pymongo==3.10.1           # via -r requirements/base.txt, edx-opaque-keys
 pyparsing==2.4.7          # via packaging
 pytest-cov==2.8.1         # via -r requirements/test.in
@@ -81,29 +81,32 @@ pytest==5.4.1             # via -r requirements/test.in, pytest-cov, pytest-djan
 python-dateutil==2.8.0    # via -r requirements/base.txt, edx-drf-extensions, faker
 python-slugify==4.0.0     # via code-annotations
 python3-openid==3.1.0     # via -r requirements/base.txt, social-auth-core
-pytz==2019.3              # via -r requirements/base.txt, django, django-modelcluster, l18n
+pytz==2020.1              # via -r requirements/base.txt, django, django-modelcluster, l18n
 pyyaml==5.3.1             # via -r requirements/base.txt, code-annotations, edx-django-release-util
 requests-oauthlib==1.3.0  # via -r requirements/base.txt, social-auth-core
 requests==2.23.0          # via -r requirements/base.txt, coreapi, edx-drf-extensions, edx-rest-api-client, pyjwkest, requests-oauthlib, slumber, social-auth-core, wagtail
 rest-condition==1.0.3     # via -r requirements/base.txt, edx-drf-extensions
-semantic-version==2.8.4   # via -r requirements/base.txt, edx-drf-extensions
+semantic-version==2.8.5   # via -r requirements/base.txt, edx-drf-extensions
 simplejson==3.17.0        # via -r requirements/base.txt, django-rest-swagger
-six==1.14.0               # via -r requirements/base.txt, astroid, django-dynamic-fixture, django-extensions, django-waffle, edx-auth-backends, edx-django-release-util, edx-drf-extensions, edx-lint, edx-opaque-keys, html5lib, l18n, mock, packaging, pathlib2, pyjwkest, pylint, python-dateutil, social-auth-app-django, social-auth-core, stevedore, tox, virtualenv
+six==1.14.0               # via -r requirements/base.txt, astroid, django-dynamic-fixture, django-extensions, django-waffle, edx-auth-backends, edx-django-release-util, edx-drf-extensions, edx-lint, edx-opaque-keys, html5lib, l18n, mock, packaging, pathlib2, pyjwkest, python-dateutil, social-auth-app-django, social-auth-core, stevedore, tox, virtualenv
 slumber==0.7.1            # via -r requirements/base.txt, edx-rest-api-client
 git+https://github.com/python-social-auth/social-app-django.git@c00d23c2b45c3317bd35b15ad1b959338689cef8#egg=social-auth-app-django  # via -r requirements/base.txt, edx-auth-backends
 social-auth-core==3.2.0   # via -r requirements/base.txt, edx-auth-backends, social-auth-app-django
+soupsieve==2.0            # via -r requirements/base.txt, beautifulsoup4
 sqlparse==0.3.1           # via -r requirements/base.txt, django
 stevedore==1.32.0         # via -r requirements/base.txt, code-annotations, edx-opaque-keys
 text-unidecode==1.3       # via faker, python-slugify
 toml==0.10.0              # via tox
-tox==3.14.6               # via -r requirements/test.in
+tox==3.15.0               # via -r requirements/test.in
+typed-ast==1.4.1          # via astroid
 unidecode==1.1.1          # via -r requirements/base.txt, wagtail
 uritemplate==3.0.1        # via -r requirements/base.txt, coreapi
 urllib3==1.25.9           # via -r requirements/base.txt, requests
-virtualenv==20.0.18       # via tox
-wagtail==2.8.1            # via -r requirements/base.txt
+virtualenv==20.0.20       # via tox
+wagtail==2.9              # via -r requirements/base.txt
 wcwidth==0.1.9            # via pytest
 webencodings==0.5.1       # via -r requirements/base.txt, html5lib
 willow==1.3               # via -r requirements/base.txt, wagtail
-wrapt==1.12.1             # via astroid
+wrapt==1.11.2             # via astroid
+xlsxwriter==1.2.8         # via -r requirements/base.txt, wagtail
 zipp==1.2.0               # via -r requirements/base.txt, importlib-metadata, importlib-resources

From b3299cc609ebd63bbb2542ef81ff24ebb652afb2 Mon Sep 17 00:00:00 2001
From: Awais Qureshi <awais.qureshi@arbisoft.com>
Date: Thu, 7 May 2020 15:02:19 +0500
Subject: [PATCH 2/2] BOM-1300 Switching from nose to pytest.

---
 .annotation_safe_list.yml   | 2 +-
 requirements/production.txt | 4 ++--
 requirements/test.in        | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.annotation_safe_list.yml b/.annotation_safe_list.yml
index dc33c9ff..a7d2002c 100644
--- a/.annotation_safe_list.yml
+++ b/.annotation_safe_list.yml
@@ -76,4 +76,4 @@ wagtailusers.UserProfile:
 blacklist.BlacklistedToken:
     ".. no_pii:": "This model has no PII"
 wagtailimages.UploadedImage:
-    ".. no_pii:": "This model has no PII"
\ No newline at end of file
+    ".. no_pii:": "This model has no PII"
diff --git a/requirements/production.txt b/requirements/production.txt
index d8032eb0..e49e0b54 100644
--- a/requirements/production.txt
+++ b/requirements/production.txt
@@ -5,8 +5,8 @@
 #    make upgrade
 #
 beautifulsoup4==4.8.2     # via -r requirements/base.txt, wagtail
-boto3==1.13.3             # via -r requirements/production.in
-botocore==1.16.3          # via boto3, s3transfer
+boto3==1.13.4             # via -r requirements/production.in
+botocore==1.16.4          # via boto3, s3transfer
 certifi==2020.4.5.1       # via -r requirements/base.txt, requests
 chardet==3.0.4            # via -r requirements/base.txt, requests
 coreapi==2.3.3            # via -r requirements/base.txt, django-rest-swagger, openapi-codec
diff --git a/requirements/test.in b/requirements/test.in
index 214b6278..13a04ce9 100644
--- a/requirements/test.in
+++ b/requirements/test.in
@@ -5,10 +5,11 @@
 code-annotations
 coverage
 django-dynamic-fixture    # library to create dynamic model instances for testing purposes
-edx-lint==1.4.1
+edx-lint
 Faker
 factory_boy
-mock==3.0.5
+# mock version 4.0.0 drops support for python 3.5
+mock<4.0.0
 pytest
 pytest-cov
 pytest-django