From d21a330d0ab20d275d930021348ce7fcce540bfb Mon Sep 17 00:00:00 2001 From: Kyle McCormick <kmccormick@edx.org> Date: Sun, 18 Oct 2020 17:38:05 -0400 Subject: [PATCH] Tell isort not to sort certain imports in cms/ --- cms/__init__.py | 3 +++ cms/conftest.py | 2 +- cms/urls.py | 4 ++-- cms/wsgi.py | 3 +++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cms/__init__.py b/cms/__init__.py index e4f4b580af3..fd763b62c23 100644 --- a/cms/__init__.py +++ b/cms/__init__.py @@ -1,6 +1,9 @@ """ Celery needs to be loaded when the cms modules are so that task registration and discovery can work correctly. + +Import sorting is intentionally disabled in this module. +isort:skip_file """ diff --git a/cms/conftest.py b/cms/conftest.py index f937c14e81e..d769b876995 100644 --- a/cms/conftest.py +++ b/cms/conftest.py @@ -17,7 +17,7 @@ from openedx.core.pytest_hooks import DeferPlugin # Patch the xml libs before anything else. -from safe_lxml import defuse_xml_libs +from safe_lxml import defuse_xml_libs # isort:skip defuse_xml_libs() diff --git a/cms/urls.py b/cms/urls.py index aba622395e8..fb7099f2f65 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -304,9 +304,9 @@ if 'openedx.testing.coverage_context_listener' in settings.INSTALLED_APPS: ] # pylint: disable=wrong-import-position, wrong-import-order -from edx_django_utils.plugins import get_plugin_url_patterns +from edx_django_utils.plugins import get_plugin_url_patterns # isort:skip # pylint: disable=wrong-import-position -from openedx.core.djangoapps.plugins.constants import ProjectType +from openedx.core.djangoapps.plugins.constants import ProjectType # isort:skip urlpatterns.extend(get_plugin_url_patterns(ProjectType.CMS)) # Contentstore diff --git a/cms/wsgi.py b/cms/wsgi.py index 0250f2de229..3183ef69d49 100644 --- a/cms/wsgi.py +++ b/cms/wsgi.py @@ -6,6 +6,9 @@ and any production WSGI deployments. It exposes a module-level variable named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover this application via the ``WSGI_APPLICATION`` setting. + +Import sorting is intentionally disabled in this module. +isort:skip_file """ # Patch the xml libs before anything else. -- GitLab