From d6f87720311f1b8d30a6ce36231842c90a0eb464 Mon Sep 17 00:00:00 2001 From: John Eskew Date: Thu, 2 Nov 2017 16:46:53 -0400 Subject: [PATCH] Move course_overviews startup.py over to AppConfig::ready --- cms/envs/common.py | 18 +++++++++--------- lms/envs/common.py | 18 +++++++++--------- .../content/course_overviews/apps.py | 17 +++++++++++++++++ .../content/course_overviews/startup.py | 5 ----- 4 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 openedx/core/djangoapps/content/course_overviews/apps.py delete mode 100644 openedx/core/djangoapps/content/course_overviews/startup.py diff --git a/cms/envs/common.py b/cms/envs/common.py index e9bad5cd99..8768ac7055 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -1015,7 +1015,7 @@ INSTALLED_APPS = [ # Additional problem types 'edx_jsme', # Molecular Structure - 'openedx.core.djangoapps.content.course_overviews', + 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig', 'openedx.core.djangoapps.content.course_structures.apps.CourseStructuresConfig', 'openedx.core.djangoapps.content.block_structure.apps.BlockStructureConfig', @@ -1188,19 +1188,19 @@ MAX_FAILED_LOGIN_ATTEMPTS_LOCKOUT_PERIOD_SECS = 15 * 60 # that this app should be inserted *before*. A None here means it should be appended to the list. OPTIONAL_APPS = ( ('mentoring', None), - ('problem_builder', 'openedx.core.djangoapps.content.course_overviews'), + ('problem_builder', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), ('edx_sga', None), # edx-ora2 - ('submissions', 'openedx.core.djangoapps.content.course_overviews'), - ('openassessment', 'openedx.core.djangoapps.content.course_overviews'), - ('openassessment.assessment', 'openedx.core.djangoapps.content.course_overviews'), - ('openassessment.fileupload', 'openedx.core.djangoapps.content.course_overviews'), - ('openassessment.workflow', 'openedx.core.djangoapps.content.course_overviews'), - ('openassessment.xblock', 'openedx.core.djangoapps.content.course_overviews'), + ('submissions', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), + ('openassessment', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), + ('openassessment.assessment', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), + ('openassessment.fileupload', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), + ('openassessment.workflow', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), + ('openassessment.xblock', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), # edxval - ('edxval', 'openedx.core.djangoapps.content.course_overviews'), + ('edxval', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), # Organizations App (http://github.com/edx/edx-organizations) ('organizations', None), diff --git a/lms/envs/common.py b/lms/envs/common.py index a68975b3b1..c575cff276 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -2221,7 +2221,7 @@ INSTALLED_APPS = [ 'lms.djangoapps.lms_xblock', # Course data caching - 'openedx.core.djangoapps.content.course_overviews', + 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig', 'openedx.core.djangoapps.content.course_structures.apps.CourseStructuresConfig', 'openedx.core.djangoapps.content.block_structure.apps.BlockStructureConfig', 'lms.djangoapps.course_blocks', @@ -2883,19 +2883,19 @@ ALL_LANGUAGES = [ # that this app should be inserted *before*. A None here means it should be appended to the list. OPTIONAL_APPS = [ ('mentoring', None), - ('problem_builder', 'openedx.core.djangoapps.content.course_overviews'), + ('problem_builder', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), ('edx_sga', None), # edx-ora2 - ('submissions', 'openedx.core.djangoapps.content.course_overviews'), - ('openassessment', 'openedx.core.djangoapps.content.course_overviews'), - ('openassessment.assessment', 'openedx.core.djangoapps.content.course_overviews'), - ('openassessment.fileupload', 'openedx.core.djangoapps.content.course_overviews'), - ('openassessment.workflow', 'openedx.core.djangoapps.content.course_overviews'), - ('openassessment.xblock', 'openedx.core.djangoapps.content.course_overviews'), + ('submissions', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), + ('openassessment', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), + ('openassessment.assessment', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), + ('openassessment.fileupload', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), + ('openassessment.workflow', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), + ('openassessment.xblock', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), # edxval - ('edxval', 'openedx.core.djangoapps.content.course_overviews'), + ('edxval', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), # edX Proctoring ('edx_proctoring', None), diff --git a/openedx/core/djangoapps/content/course_overviews/apps.py b/openedx/core/djangoapps/content/course_overviews/apps.py new file mode 100644 index 0000000000..f972abab03 --- /dev/null +++ b/openedx/core/djangoapps/content/course_overviews/apps.py @@ -0,0 +1,17 @@ +""" +Configuration for course_overviews Django app +""" +from django.apps import AppConfig + + +class CourseOverviewsConfig(AppConfig): + """ + Configuration class for course_overviews Django app + """ + name = 'openedx.core.djangoapps.content.course_overviews' + verbose_name = "Course Overviews" + + def ready(self): + # Import signals to activate signal handler which invalidates + # the CourseOverview cache every time a course is published. + from . import signals # pylint: disable=unused-import diff --git a/openedx/core/djangoapps/content/course_overviews/startup.py b/openedx/core/djangoapps/content/course_overviews/startup.py deleted file mode 100644 index 8ec2e71004..0000000000 --- a/openedx/core/djangoapps/content/course_overviews/startup.py +++ /dev/null @@ -1,5 +0,0 @@ -"""Code run at server start up to initialize the course_overviews app.""" - -# Importing signals is necessary to activate signal handler, which invalidates -# the CourseOverview cache every time a course is published. -import openedx.core.djangoapps.content.course_overviews.signals # pylint: disable=unused-import