From 928a84f969ef32cd1293509c6832c0d6b77c3285 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 24 Dec 2019 16:01:03 +0500 Subject: [PATCH] BOM-1117 Specifying a namespace in django.conf.urls.include() without providing an app_name is deprecated. Adding the app_name attribute in the included module. --- cms/djangoapps/api/urls.py | 3 +++ cms/djangoapps/api/v1/urls.py | 2 ++ cms/djangoapps/maintenance/urls.py | 2 ++ cms/urls.py | 2 +- lms/djangoapps/experiments/urls.py | 3 ++- openedx/core/djangoapps/content_libraries/urls.py | 3 +++ openedx/core/djangoapps/theming/urls.py | 2 ++ openedx/core/djangoapps/xblock/rest_api/urls.py | 2 ++ requirements/edx/base.txt | 4 ++-- requirements/edx/development.txt | 8 ++++---- requirements/edx/testing.txt | 8 ++++---- 11 files changed, 27 insertions(+), 12 deletions(-) diff --git a/cms/djangoapps/api/urls.py b/cms/djangoapps/api/urls.py index c2776e5548..90b2014997 100644 --- a/cms/djangoapps/api/urls.py +++ b/cms/djangoapps/api/urls.py @@ -6,6 +6,9 @@ from __future__ import absolute_import from django.conf.urls import include, url + +app_name = 'cms.djangoapps.api' + urlpatterns = [ url(r'^v1/', include('cms.djangoapps.api.v1.urls', namespace='v1')), ] diff --git a/cms/djangoapps/api/v1/urls.py b/cms/djangoapps/api/v1/urls.py index 10b87e0e70..c5ef152dc0 100644 --- a/cms/djangoapps/api/v1/urls.py +++ b/cms/djangoapps/api/v1/urls.py @@ -8,6 +8,8 @@ from rest_framework.routers import DefaultRouter from .views.course_runs import CourseRunViewSet +app_name = 'cms.djangoapps.api.v1' + router = DefaultRouter() router.register(r'course_runs', CourseRunViewSet, base_name='course_run') urlpatterns = router.urls diff --git a/cms/djangoapps/maintenance/urls.py b/cms/djangoapps/maintenance/urls.py index 1d5c15da8e..07fcbda4ba 100644 --- a/cms/djangoapps/maintenance/urls.py +++ b/cms/djangoapps/maintenance/urls.py @@ -14,6 +14,8 @@ from .views import ( MaintenanceIndexView ) +app_name = 'cms.djangoapps.maintenance' + urlpatterns = [ url(r'^$', MaintenanceIndexView.as_view(), name='maintenance_index'), url(r'^force_publish_course/?$', ForcePublishCourseView.as_view(), name='force_publish_course'), diff --git a/cms/urls.py b/cms/urls.py index 9c92ea0dde..f4a6373ae1 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -217,7 +217,7 @@ if settings.FEATURES.get('ENABLE_SERVICE_STATUS'): # changes go through our user portal and follow complexity requirements. urlpatterns.append(url(r'^admin/password_change/$', handler404)) urlpatterns.append(url(r'^admin/auth/user/\d+/password/$', handler404)) -urlpatterns.append(url(r'^admin/', include(admin.site.urls))) +urlpatterns.append(url(r'^admin/', admin.site.urls)) # enable entrance exams if settings.FEATURES.get('ENTRANCE_EXAMS'): diff --git a/lms/djangoapps/experiments/urls.py b/lms/djangoapps/experiments/urls.py index f0a013611c..f11ef81665 100644 --- a/lms/djangoapps/experiments/urls.py +++ b/lms/djangoapps/experiments/urls.py @@ -11,7 +11,8 @@ router = routers.DefaultRouter() router.register(r'data', views.ExperimentDataViewSet, base_name='data') router.register(r'key-value', views.ExperimentKeyValueViewSet, base_name='key_value') -app_name = 'experiments' +app_name = 'lms.djangoapps.experiments' + urlpatterns = [ url(r'^v0/custom/REV-934/', views_custom.Rev934.as_view(), name='rev_934'), url(r'^v0/', include(router.urls, namespace='v0')), diff --git a/openedx/core/djangoapps/content_libraries/urls.py b/openedx/core/djangoapps/content_libraries/urls.py index adea51cd8e..a8f5798b7c 100644 --- a/openedx/core/djangoapps/content_libraries/urls.py +++ b/openedx/core/djangoapps/content_libraries/urls.py @@ -7,6 +7,9 @@ from django.conf.urls import include, url from . import views + +app_name = 'openedx.core.djangoapps.content_libraries' + # These URLs are only used in Studio. The LMS already provides all the # API endpoints needed to serve XBlocks from content libraries using the # standard XBlock REST API (see openedx.core.django_apps.xblock.rest_api.urls) diff --git a/openedx/core/djangoapps/theming/urls.py b/openedx/core/djangoapps/theming/urls.py index bba24e4caf..282d2557ab 100644 --- a/openedx/core/djangoapps/theming/urls.py +++ b/openedx/core/djangoapps/theming/urls.py @@ -9,6 +9,8 @@ from django.conf.urls import url from .helpers import is_comprehensive_theming_enabled from .views import ThemingAdministrationFragmentView +app_name = 'openedx.core.djangoapps.theming' + if is_comprehensive_theming_enabled(): urlpatterns = [ url( diff --git a/openedx/core/djangoapps/xblock/rest_api/urls.py b/openedx/core/djangoapps/xblock/rest_api/urls.py index 92daffcfb6..2048c91b80 100644 --- a/openedx/core/djangoapps/xblock/rest_api/urls.py +++ b/openedx/core/djangoapps/xblock/rest_api/urls.py @@ -9,6 +9,8 @@ from . import views # may act a bit differently in each (e.g. Studio stores user state ephemerally). # If necessary at some point in the future, these URLs could be duplicated into # urls_studio and urls_lms, and/or the views could be likewise duplicated. +app_name = 'openedx.core.djangoapps.xblock.rest_api' + urlpatterns = [ url(r'^api/xblock/v2/', include([ url(r'^xblocks/(?P[^/]+)/', include([ diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index e51646c7cb..2e45e9e45d 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -111,7 +111,7 @@ edx-oauth2-provider==1.3.1 edx-opaque-keys[django]==2.0.1 edx-organizations==2.2.0 edx-proctoring-proctortrack==1.0.5 -edx-proctoring==2.2.2 +edx-proctoring==2.2.3 edx-rbac==1.0.5 # via edx-enterprise edx-rest-api-client==1.9.2 edx-search==1.2.2 @@ -245,7 +245,7 @@ webob==1.8.5 # via xblock wrapt==1.10.5 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.6#egg=xblock-drag-and-drop-v2==2.2.6 git+https://github.com/open-craft/xblock-poll@3c7dcaf6c933d914188f0740a60711603f948d26#egg=xblock-poll==1.9.1 -xblock-utils==1.2.3 +xblock-utils==1.2.4 xblock==1.2.9 xmlsec==1.3.3 # via python3-saml xss-utils==0.1.2 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 1a55f32fd8..488fc156b7 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -127,7 +127,7 @@ edx-oauth2-provider==1.3.1 edx-opaque-keys[django]==2.0.1 edx-organizations==2.2.0 edx-proctoring-proctortrack==1.0.5 -edx-proctoring==2.2.2 +edx-proctoring==2.2.3 edx-rbac==1.0.5 edx-rest-api-client==1.9.2 edx-search==1.2.2 @@ -223,7 +223,7 @@ pluggy==0.13.1 polib==1.1.0 psutil==1.2.1 py2neo==3.1.2 -py==1.8.0 +py==1.8.1 pyaml==19.12.0 pycodestyle==2.5.0 pycontracts==1.7.1 @@ -311,7 +311,7 @@ text-unidecode==1.3 tincan==0.0.5 toml==0.10.0 tox-battery==0.5.1 -tox==3.14.2 +tox==3.14.3 transifex-client==0.13.4 unicodecsv==0.14.1 unidiff==0.5.5 @@ -331,7 +331,7 @@ werkzeug==0.16.0 wrapt==1.10.5 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.6#egg=xblock-drag-and-drop-v2==2.2.6 git+https://github.com/open-craft/xblock-poll@3c7dcaf6c933d914188f0740a60711603f948d26#egg=xblock-poll==1.9.1 -xblock-utils==1.2.3 +xblock-utils==1.2.4 xblock==1.2.9 xmlsec==1.3.3 xmltodict==0.12.0 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index a7678c1c26..931b967c31 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -124,7 +124,7 @@ edx-oauth2-provider==1.3.1 edx-opaque-keys[django]==2.0.1 edx-organizations==2.2.0 edx-proctoring-proctortrack==1.0.5 -edx-proctoring==2.2.2 +edx-proctoring==2.2.3 edx-rbac==1.0.5 edx-rest-api-client==1.9.2 edx-search==1.2.2 @@ -214,7 +214,7 @@ pluggy==0.13.1 polib==1.1.0 psutil==1.2.1 py2neo==3.1.2 -py==1.8.0 # via pytest, tox +py==1.8.1 # via pytest, tox pyaml==19.12.0 # via moto pycodestyle==2.5.0 pycontracts==1.7.1 @@ -290,7 +290,7 @@ text-unidecode==1.3 tincan==0.0.5 toml==0.10.0 # via tox tox-battery==0.5.1 -tox==3.14.2 +tox==3.14.3 transifex-client==0.13.4 unicodecsv==0.14.1 unidiff==0.5.5 @@ -309,7 +309,7 @@ werkzeug==0.16.0 # via moto wrapt==1.10.5 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.6#egg=xblock-drag-and-drop-v2==2.2.6 git+https://github.com/open-craft/xblock-poll@3c7dcaf6c933d914188f0740a60711603f948d26#egg=xblock-poll==1.9.1 -xblock-utils==1.2.3 +xblock-utils==1.2.4 xblock==1.2.9 xmlsec==1.3.3 xmltodict==0.12.0 # via moto