BOM-1593

pylint-django plugin issue with wagtail fixed. run make upgrade.
edx · May 6, 2020 · edb9b98 · edb9b98
1 parent 8791889
commit edb9b98
Show file tree

Hide file tree

Showing 23 changed files with 149 additions and 136 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,15 +192,15 @@ 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,
         related_name='+',
         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
@@ -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
@@ -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
@@ -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
@@ -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,35 +39,37 @@ 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
 pyjwt==1.7.1              # via drf-jwt, edx-auth-backends, edx-rest-api-client, social-auth-core
 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
@@ -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,16 +64,16 @@ 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
 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: