Merge branch 'master' into pwnage101/ENT-11510

Author: kiram15

cms/__init__.py

@@ -1,9 +1,9 @@
+# ruff: noqa: I001
 """
 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
 """
 
 

cms/conftest.py

@@ -1,3 +1,4 @@
+# ruff: noqa: I001
 """
 Studio unit test configuration and fixtures.
 
@@ -13,7 +14,7 @@
 from openedx.core.pytest_hooks import DeferPlugin
 
 # Patch the xml libs before anything else.
-from openedx.core.lib.safe_lxml import defuse_xml_libs  # isort:skip
+from openedx.core.lib.safe_lxml import defuse_xml_libs  # must patch xml libs before other imports execute
 defuse_xml_libs()
 
 

cms/djangoapps/api/urls.py

@@ -3,8 +3,7 @@
 """
 
 
-from django.urls import include
-from django.urls import path
+from django.urls import include, path
 
 app_name = 'cms.djangoapps.api'
 

cms/djangoapps/api/v1/tests/test_serializers/test_course_runs.py

@@ -2,14 +2,17 @@
 
 
 import datetime
+
 import ddt
 import pytz
 from django.test import RequestFactory
 
 from common.djangoapps.student.roles import CourseInstructorRole, CourseStaffRole
 from common.djangoapps.student.tests.factories import UserFactory
 from openedx.core.lib.courses import course_image_url
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase  # lint-amnesty, pylint: disable=wrong-import-order
+from xmodule.modulestore.tests.django_utils import (
+    ModuleStoreTestCase,  # lint-amnesty, pylint: disable=wrong-import-order
+)
 from xmodule.modulestore.tests.factories import CourseFactory  # lint-amnesty, pylint: disable=wrong-import-order
 
 from ...serializers.course_runs import CourseRunSerializer

cms/djangoapps/api/v1/tests/test_views/test_course_runs.py

@@ -20,8 +20,13 @@
 from xmodule.contentstore.django import contentstore  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.exceptions import NotFoundError  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.tests.factories import CourseFactory, ToyCourseFactory  # lint-amnesty, pylint: disable=wrong-import-order
+from xmodule.modulestore.tests.django_utils import (
+    ModuleStoreTestCase,  # lint-amnesty, pylint: disable=wrong-import-order
+)
+from xmodule.modulestore.tests.factories import (  # lint-amnesty, pylint: disable=wrong-import-order
+    CourseFactory,
+    ToyCourseFactory,
+)
 
 from ...serializers.course_runs import CourseRunSerializer
 from ..utils import serialize_datetime

cms/djangoapps/api/v1/views/course_runs.py

@@ -15,7 +15,7 @@
     CourseRunCreateSerializer,
     CourseRunImageSerializer,
     CourseRunRerunSerializer,
-    CourseRunSerializer
+    CourseRunSerializer,
 )
 
 

cms/djangoapps/contentstore/api/tests/base.py

@@ -5,11 +5,10 @@
 
 from django.urls import reverse
 from rest_framework.test import APITestCase
-from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
-from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory
 
-from common.djangoapps.student.tests.factories import StaffFactory
-from common.djangoapps.student.tests.factories import UserFactory
+from common.djangoapps.student.tests.factories import StaffFactory, UserFactory
+from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
+from xmodule.modulestore.tests.factories import BlockFactory, CourseFactory
 
 
 # pylint: disable=unused-variable

cms/djangoapps/contentstore/api/tests/test_import.py

@@ -12,12 +12,11 @@
 from rest_framework import status
 from rest_framework.test import APITestCase
 from user_tasks.models import UserTaskStatus
+
+from common.djangoapps.student.tests.factories import StaffFactory, UserFactory
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
-from common.djangoapps.student.tests.factories import StaffFactory
-from common.djangoapps.student.tests.factories import UserFactory
-
 
 class CourseImportViewTest(SharedModuleStoreTestCase, APITestCase):
     """

cms/djangoapps/contentstore/api/tests/test_quality.py

@@ -2,12 +2,13 @@
 Tests for the course import API views
 """
 
-from rest_framework.test import APIClient
+from openedx_authz.constants.roles import COURSE_DATA_RESEARCHER, COURSE_STAFF
 from rest_framework import status
-from openedx_authz.constants.roles import COURSE_STAFF, COURSE_DATA_RESEARCHER
+from rest_framework.test import APIClient
 
 from common.djangoapps.student.tests.factories import UserFactory
 from openedx.core.djangoapps.authz.tests.mixins import CourseAuthzTestMixin
+
 from .base import BaseCourseViewTest
 
 

cms/djangoapps/contentstore/api/tests/test_validation.py

@@ -7,23 +7,21 @@
 
 import ddt
 import factory
-
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.test.utils import override_settings
 from django.urls import reverse
+from openedx_authz.constants.roles import COURSE_DATA_RESEARCHER, COURSE_STAFF
 from rest_framework import status
-from rest_framework.test import APITestCase
-from rest_framework.test import APIClient
-from openedx.core.djangoapps.authz.tests.mixins import CourseAuthzTestMixin
-from openedx_authz.constants.roles import COURSE_STAFF, COURSE_DATA_RESEARCHER
+from rest_framework.test import APIClient, APITestCase
 
+from cms.djangoapps.contentstore.api.tests.base import BaseCourseViewTest
 from common.djangoapps.course_modes.models import CourseMode
 from common.djangoapps.course_modes.tests.factories import CourseModeFactory
 from common.djangoapps.student.tests.factories import StaffFactory, UserFactory
+from openedx.core.djangoapps.authz.tests.mixins import CourseAuthzTestMixin
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import BlockFactory, CourseFactory
-from cms.djangoapps.contentstore.api.tests.base import BaseCourseViewTest
 
 User = get_user_model()