From ea0933506f7752cdd53937e691e68115a0a5cc19 Mon Sep 17 00:00:00 2001 From: Jillian Vogel Date: Sat, 25 Mar 2017 13:56:01 +1030 Subject: [PATCH 1/2] Bumps edx-enterprise version to 0.29.0 --- requirements/edx/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 2887cf79d0..97f0bcc05c 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -52,7 +52,7 @@ edx-lint==0.4.3 astroid==1.3.8 edx-django-oauth2-provider==1.1.4 edx-django-sites-extensions==2.1.1 -edx-enterprise==0.28.0 +edx-enterprise==0.29.0 edx-oauth2-provider==1.2.0 edx-opaque-keys==0.4.0 edx-organizations==0.4.3 From 9660e13221c8b727c71ec5edcc86bdb2544d2fe1 Mon Sep 17 00:00:00 2001 From: Jillian Vogel Date: Sat, 25 Mar 2017 19:29:07 +1030 Subject: [PATCH 2/2] Adds ENTERPRISE_ENROLLMENT_API_URL to cms.envs.common Fixes migration error thrown by edxapp-migrate-cms --- cms/envs/common.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cms/envs/common.py b/cms/envs/common.py index 40a46e6ab7..57d7810ebb 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -319,6 +319,7 @@ AUTHENTICATION_BACKENDS = ( LMS_BASE = None LMS_ROOT_URL = "http://localhost:8000" +ENTERPRISE_API_URL = LMS_ROOT_URL + '/enterprise/api/v1/' # These are standard regexes for pulling out info like course_ids, usage_ids, etc. # They are used so that URLs with deprecated-format strings still work. @@ -1250,3 +1251,7 @@ RETRY_ACTIVATION_EMAIL_TIMEOUT = 0.5 # How long until database records about the outcome of a task and its artifacts get deleted? USER_TASKS_MAX_AGE = timedelta(days=7) + +############## Settings for the Enterprise App ###################### + +ENTERPRISE_ENROLLMENT_API_URL = LMS_ROOT_URL + "/api/enrollment/v1/"