Upgrade, fix unit test and quality failure

designer/apps/branding/models.py

@@ -2,6 +2,7 @@
 from django.db import models
 from wagtail.wagtailadmin.edit_handlers import FieldPanel, MultiFieldPanel
 from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
+from wagtail.wagtailimages.models import Image
 from designer.apps.branding.utils import validate_hexadecimal_color
 
 
@@ -12,7 +13,7 @@ class Branding(models.Model):
     .. no_pii:
     """
     organization_logo_image = models.ForeignKey(
-        'wagtailimages.Image',
+        Image,
         null=True,
         blank=False,
         on_delete=models.SET_NULL,

designer/apps/core/tests/test_views.py

@@ -39,7 +39,7 @@ def _assert_health(self, status_code, overall_status, database_status):
             }
         }
 
-        self.assertJSONEqual(response.content, expected_data)
+        self.assertJSONEqual(response.content.decode(), expected_data)
 
 
 class AutoAuthTests(TestCase):

requirements/base.txt

@@ -5,16 +5,16 @@
 #    make upgrade
 #
 beautifulsoup4==4.6.0     # via wagtail
-certifi==2019.9.11        # via requests
+certifi==2019.11.28       # via requests
 chardet==3.0.4            # via requests
 coreapi==2.3.3            # via django-rest-swagger, openapi-codec
 coreschema==0.0.4         # via coreapi
 defusedxml==0.6.0         # via python3-openid, social-auth-core
-django-cors-headers==3.1.1
+django-cors-headers==3.2.0
 django-extensions==2.2.5
 django-modelcluster==3.1  # via wagtail
 django-rest-swagger==2.2.0
-django-storages==1.7.2
+django-storages==1.8
 django-taggit==0.22.2     # via wagtail
 django-treebeard==4.3     # via wagtail
 django-waffle==0.18.0
@@ -25,34 +25,34 @@ edx-auth-backends==2.0.2
 edx-django-release-util==0.3.2
 edx-django-utils==2.0.2
 edx-drf-extensions==2.4.5
-edx-opaque-keys==2.0.0    # via edx-drf-extensions
+edx-opaque-keys==2.0.1    # via edx-drf-extensions
 edx-rest-api-client==1.9.2
 future==0.18.2            # via pyjwkest
 html5lib==0.999999999     # via wagtail
 idna==2.8                 # via requests
 itypes==1.1.0             # via coreapi
 jinja2==2.10.3            # via coreschema
 markupsafe==1.1.1         # via jinja2
-mysqlclient==1.4.5
-newrelic==5.2.2.130       # via edx-django-utils
+mysqlclient==1.4.6
+newrelic==5.4.0.132       # 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.3                # via stevedore
+pbr==5.4.4                # via stevedore
 pillow==6.2.1             # via wagtail
 psutil==1.2.1             # via edx-django-utils, edx-drf-extensions
-pycryptodomex==3.9.3      # via pyjwkest
+pycryptodomex==3.9.4      # via pyjwkest
 pyjwkest==1.3.2           # via edx-drf-extensions, social-auth-core
 pyjwt==1.7.1              # via djangorestframework-jwt, edx-auth-backends, edx-rest-api-client, social-auth-core
 pymongo==3.9.0            # via edx-opaque-keys
 python-dateutil==2.8.0
 python3-openid==3.1.0     # via social-auth-core
 pytz==2019.3
-pyyaml==5.1.2             # via edx-django-release-util
+pyyaml==5.2               # via edx-django-release-util
 requests-oauthlib==1.3.0  # via social-auth-core
 requests==2.22.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.2   # via edx-drf-extensions
-simplejson==3.16.0        # via django-rest-swagger
+semantic-version==2.8.3   # via edx-drf-extensions
+simplejson==3.17.0        # via django-rest-swagger
 six==1.13.0               # via django-extensions, edx-auth-backends, edx-django-release-util, edx-drf-extensions, edx-opaque-keys, html5lib, pyjwkest, python-dateutil, social-auth-app-django, social-auth-core, stevedore
 slumber==0.7.1            # via edx-rest-api-client
 social-auth-app-django==1.2.0  # via edx-auth-backends
@@ -66,4 +66,4 @@ webencodings==0.5.1       # via html5lib
 willow==1.0               # via wagtail
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.6.0        # via html5lib
+# setuptools

requirements/dev.txt

@@ -9,7 +9,7 @@ astroid==2.3.3
 backports.functools-lru-cache==1.6.1
 beautifulsoup4==4.6.0
 caniusepython3==7.2.0
-certifi==2019.9.11
+certifi==2019.11.28
 chardet==3.0.4
 click-log==0.3.2
 click==7.0
@@ -18,16 +18,16 @@ coreapi==2.3.3
 coreschema==0.0.4
 coverage==4.5.4
 defusedxml==0.6.0
-diff-cover==2.4.0
+diff-cover==2.4.1
 distlib==0.3.0
-django-cors-headers==3.1.1
+django-cors-headers==3.2.0
 django-debug-toolbar==1.11
 django-dynamic-fixture==2.0.0
 django-extensions==2.2.5
 django-modelcluster==3.1
 django-nose==1.4.6
 django-rest-swagger==2.2.0
-django-storages==1.7.2
+django-storages==1.8
 django-taggit==0.22.2
 django-treebeard==4.3
 django-waffle==0.18.0
@@ -40,14 +40,14 @@ edx-django-utils==2.0.2
 edx-drf-extensions==2.4.5
 edx-i18n-tools==0.4.8
 edx-lint==1.4.1
-edx-opaque-keys==2.0.0
+edx-opaque-keys==2.0.1
 edx-rest-api-client==1.9.2
 factory-boy==2.12.0
-faker==2.0.3
+faker==3.0.0
 future==0.18.2
 html5lib==0.999999999
 idna==2.8
-importlib-metadata==0.23  # via inflect, path.py
+importlib-metadata==1.1.0  # via inflect, path
 inflect==3.0.2            # via jinja2-pluralize
 isort==4.3.21
 itypes==1.1.0
@@ -57,24 +57,25 @@ lazy-object-proxy==1.4.3
 markupsafe==1.1.1
 mccabe==0.6.1
 mock==3.0.5
-more-itertools==7.2.0     # via zipp
-mysqlclient==1.4.5
-newrelic==5.2.2.130
+more-itertools==8.0.0     # via zipp
+mysqlclient==1.4.6
+newrelic==5.4.0.132
 nose-ignore-docstring==0.2
 nose==1.3.7
 oauthlib==3.1.0
 openapi-codec==1.3.2
 packaging==19.2
-path.py==12.0.2           # via edx-i18n-tools
-pbr==5.4.3
+path.py==12.4.0           # via edx-i18n-tools
+path==13.1.0              # via path.py
+pbr==5.4.4
 pillow==6.2.1
-pip-tools==4.2.0
+pip-tools==4.3.0
 polib==1.1.0              # via edx-i18n-tools
 psutil==1.2.1
 pycodestyle==2.5.0
-pycryptodomex==3.9.3
+pycryptodomex==3.9.4
 pydocstyle==4.0.1
-pygments==2.4.2           # via diff-cover
+pygments==2.5.2           # via diff-cover
 pyjwkest==1.3.2
 pyjwt==1.7.1
 pylint-celery==0.3
@@ -87,12 +88,12 @@ python-dateutil==2.8.0
 python-slugify==4.0.0
 python3-openid==3.1.0
 pytz==2019.3
-pyyaml==5.1.2
+pyyaml==5.2
 requests-oauthlib==1.3.0
 requests==2.22.0
 rest-condition==1.0.3
-semantic-version==2.8.2
-simplejson==3.16.0
+semantic-version==2.8.3
+simplejson==3.17.0
 six==1.13.0
 slumber==0.7.1
 snowballstemmer==2.0.0
@@ -112,4 +113,4 @@ wrapt==1.11.2
 zipp==0.6.0               # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.6.0        # via caniusepython3, html5lib
+# setuptools

requirements/doc.txt

@@ -9,7 +9,7 @@ astroid==2.3.3
 babel==2.7.0              # via sphinx
 beautifulsoup4==4.6.0
 bleach==3.1.0             # via readme-renderer
-certifi==2019.9.11
+certifi==2019.11.28
 chardet==3.0.4
 click-log==0.3.2
 click==7.0
@@ -18,13 +18,13 @@ coreapi==2.3.3
 coreschema==0.0.4
 coverage==4.5.4
 defusedxml==0.6.0
-django-cors-headers==3.1.1
+django-cors-headers==3.2.0
 django-dynamic-fixture==2.0.0
 django-extensions==2.2.5
 django-modelcluster==3.1
 django-nose==1.4.6
 django-rest-swagger==2.2.0
-django-storages==1.7.2
+django-storages==1.8
 django-taggit==0.22.2
 django-treebeard==4.3
 django-waffle==0.18.0
@@ -38,11 +38,11 @@ edx-django-release-util==0.3.2
 edx-django-utils==2.0.2
 edx-drf-extensions==2.4.5
 edx-lint==1.4.1
-edx-opaque-keys==2.0.0
+edx-opaque-keys==2.0.1
 edx-rest-api-client==1.9.2
 edx-sphinx-theme==1.5.0
 factory-boy==2.12.0
-faker==2.0.3
+faker==3.0.0
 future==0.18.2
 html5lib==0.999999999
 idna==2.8
@@ -54,18 +54,18 @@ lazy-object-proxy==1.4.3
 markupsafe==1.1.1
 mccabe==0.6.1
 mock==3.0.5
-mysqlclient==1.4.5
-newrelic==5.2.2.130
+mysqlclient==1.4.6
+newrelic==5.4.0.132
 nose-ignore-docstring==0.2
 nose==1.3.7
 oauthlib==3.1.0
 openapi-codec==1.3.2
 packaging==19.2           # via sphinx
-pbr==5.4.3
+pbr==5.4.4
 pillow==6.2.1
 psutil==1.2.1
-pycryptodomex==3.9.3
-pygments==2.4.2           # via readme-renderer, sphinx
+pycryptodomex==3.9.4
+pygments==2.5.2           # via readme-renderer, sphinx
 pyjwkest==1.3.2
 pyjwt==1.7.1
 pylint-celery==0.3
@@ -78,20 +78,20 @@ python-dateutil==2.8.0
 python-slugify==4.0.0
 python3-openid==3.1.0
 pytz==2019.3
-pyyaml==5.1.2
+pyyaml==5.2
 readme-renderer==24.0
 requests-oauthlib==1.3.0
 requests==2.22.0
 rest-condition==1.0.3
 restructuredtext-lint==1.3.0  # via doc8
-semantic-version==2.8.2
-simplejson==3.16.0
+semantic-version==2.8.3
+simplejson==3.17.0
 six==1.13.0
 slumber==0.7.1
 snowballstemmer==2.0.0    # via sphinx
 social-auth-app-django==1.2.0
 social-auth-core[openidconnect]==1.7.0
-sphinx==2.2.1
+sphinx==2.2.2
 sphinxcontrib-applehelp==1.0.1  # via sphinx
 sphinxcontrib-devhelp==1.0.1  # via sphinx
 sphinxcontrib-htmlhelp==1.0.2  # via sphinx
@@ -110,4 +110,4 @@ willow==1.0
 wrapt==1.11.2
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.6.0        # via html5lib, sphinx
+# setuptools

requirements/pip-tools.txt

@@ -5,5 +5,5 @@
 #    make upgrade
 #
 click==7.0                # via pip-tools
-pip-tools==4.2.0
+pip-tools==4.3.0
 six==1.13.0               # via pip-tools

requirements/production.txt

@@ -5,18 +5,18 @@
 #    make upgrade
 #
 beautifulsoup4==4.6.0
-boto3==1.10.15
-botocore==1.13.15         # via boto3, s3transfer
-certifi==2019.9.11
+boto3==1.10.32
+botocore==1.13.32         # via boto3, s3transfer
+certifi==2019.11.28
 chardet==3.0.4
 coreapi==2.3.3
 coreschema==0.0.4
 defusedxml==0.6.0
-django-cors-headers==3.1.1
+django-cors-headers==3.2.0
 django-extensions==2.2.5
 django-modelcluster==3.1
 django-rest-swagger==2.2.0
-django-storages==1.7.2
+django-storages==1.8
 django-taggit==0.22.2
 django-treebeard==4.3
 django-waffle==0.18.0
@@ -28,40 +28,40 @@ edx-auth-backends==2.0.2
 edx-django-release-util==0.3.2
 edx-django-utils==2.0.2
 edx-drf-extensions==2.4.5
-edx-opaque-keys==2.0.0
+edx-opaque-keys==2.0.1
 edx-rest-api-client==1.9.2
 future==0.18.2
 gevent==1.4.0
 greenlet==0.4.15          # via gevent
-gunicorn==20.0.0
+gunicorn==20.0.4
 html5lib==0.999999999
 idna==2.8
 itypes==1.1.0
 jinja2==2.10.3
 jmespath==0.9.4           # via boto3, botocore
 markupsafe==1.1.1
-mysqlclient==1.4.5
-newrelic==5.2.2.130
+mysqlclient==1.4.6
+newrelic==5.4.0.132
 oauthlib==3.1.0
 openapi-codec==1.3.2
-pbr==5.4.3
+pbr==5.4.4
 pillow==6.2.1
 psutil==1.2.1
-pycryptodomex==3.9.3
+pycryptodomex==3.9.4
 pyjwkest==1.3.2
 pyjwt==1.7.1
 pymongo==3.9.0
 python-dateutil==2.8.0
 python-memcached==1.59
 python3-openid==3.1.0
 pytz==2019.3
-pyyaml==5.1.2
+pyyaml==5.2
 requests-oauthlib==1.3.0
 requests==2.22.0
 rest-condition==1.0.3
 s3transfer==0.2.1         # via boto3
-semantic-version==2.8.2
-simplejson==3.16.0
+semantic-version==2.8.3
+simplejson==3.17.0
 six==1.13.0
 slumber==0.7.1
 social-auth-app-django==1.2.0
@@ -75,4 +75,4 @@ webencodings==0.5.1
 willow==1.0
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.6.0        # via gunicorn, html5lib
+# setuptools