From 72c338a8dded1626950f0690a0a3c33d519c7d52 Mon Sep 17 00:00:00 2001 From: chavesj Date: Wed, 12 Aug 2020 17:50:17 -0400 Subject: [PATCH 1/2] upgrading edx-enterprise --- requirements/constraints.txt | 2 +- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 4 ++-- requirements/edx/testing.txt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index b491cde58f..04517cdafd 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -40,7 +40,7 @@ drf-yasg<1.17.1 # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better # for them. -edx-enterprise==3.5.3 +edx-enterprise==3.6.0 # Upgrading to 2.12.0 breaks several test classes due to API changes, need to update our code accordingly factory-boy==2.8.1 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 8aeda1bcdb..a2c40ba7b2 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -99,7 +99,7 @@ edx-django-release-util==0.4.4 # via -r requirements/edx/base.in edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.in edx-django-utils==3.7.3 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.1.1 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in +edx-enterprise==3.6.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in edx-i18n-tools==0.5.3 # via ora2 edx-milestones==0.3.0 # via -r requirements/edx/base.in edx-opaque-keys[django]==2.1.1 # via -r requirements/edx/paver.txt, edx-bulk-grades, edx-ccx-keys, edx-completion, edx-drf-extensions, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-user-state-client, edx-when, xmodule diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index edb0ea26ee..c1bbf331f6 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -110,7 +110,7 @@ edx-django-release-util==0.4.4 # via -r requirements/edx/testing.txt edx-django-sites-extensions==2.5.1 # via -r requirements/edx/testing.txt edx-django-utils==3.7.3 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.1.1 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt +edx-enterprise==3.6.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt edx-i18n-tools==0.5.3 # via -r requirements/edx/testing.txt, ora2 edx-lint==1.5.0 # via -r requirements/edx/testing.txt edx-milestones==0.3.0 # via -r requirements/edx/testing.txt @@ -304,7 +304,7 @@ transifex-client==0.13.11 # via -r requirements/edx/testing.txt typed-ast==1.4.1 # via -r requirements/edx/testing.txt, astroid ua-parser==0.10.0 # via -r requirements/edx/testing.txt, django-cookies-samesite unicodecsv==0.14.1 # via -r requirements/edx/testing.txt, edx-enterprise -unidiff==0.6.0 # via -r requirements/edx/testing.txt +unidiff==0.6.0 # via -r requirements/edx/testing.txt, coverage-pytest-plugin uritemplate==3.0.1 # via -r requirements/edx/testing.txt, coreapi, drf-yasg urllib3==1.25.10 # via -r requirements/edx/testing.txt, elasticsearch, geoip2, requests, selenium, transifex-client user-util==0.2 # via -r requirements/edx/testing.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index a9a18a4d8d..eb8c41b5ae 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -107,7 +107,7 @@ edx-django-release-util==0.4.4 # via -r requirements/edx/base.txt edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.txt edx-django-utils==3.7.3 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.1.1 # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt +edx-enterprise==3.6.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt edx-i18n-tools==0.5.3 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, ora2 edx-lint==1.5.0 # via -r requirements/edx/testing.in edx-milestones==0.3.0 # via -r requirements/edx/base.txt @@ -283,7 +283,7 @@ transifex-client==0.13.11 # via -r requirements/edx/testing.in typed-ast==1.4.1 # via astroid ua-parser==0.10.0 # via -r requirements/edx/base.txt, django-cookies-samesite unicodecsv==0.14.1 # via -r requirements/edx/base.txt, edx-enterprise -unidiff==0.6.0 # via -r requirements/edx/testing.in +unidiff==0.6.0 # via -r requirements/edx/testing.in, coverage-pytest-plugin uritemplate==3.0.1 # via -r requirements/edx/base.txt, coreapi, drf-yasg urllib3==1.25.10 # via -r requirements/edx/base.txt, elasticsearch, geoip2, requests, selenium, transifex-client user-util==0.2 # via -r requirements/edx/base.txt From c09914b7de4c6c673cee9b8a9169c58e66ca7fb0 Mon Sep 17 00:00:00 2001 From: chavesj Date: Wed, 12 Aug 2020 17:51:58 -0400 Subject: [PATCH 2/2] removing ENTERPRISE_CUSTOMERS_EXCLUDED_FROM_CATALOG list --- lms/envs/common.py | 3 --- lms/envs/devstack.py | 3 --- lms/envs/production.py | 3 --- 3 files changed, 9 deletions(-) diff --git a/lms/envs/common.py b/lms/envs/common.py index c5e1cfcc4c..9554ce9e76 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -3672,9 +3672,6 @@ DATA_CONSENT_SHARE_CACHE_TIMEOUT = 8 * 60 * 60 # 8 hours ENTERPRISE_MARKETING_FOOTER_QUERY_PARAMS = {} ENTERPRISE_TAGLINE = '' -# List of enterprise customer uuids to exclude from transition to use of enterprise-catalog -ENTERPRISE_CUSTOMERS_EXCLUDED_FROM_CATALOG = [] - ############## Settings for Course Enrollment Modes ###################### # The min_price key refers to the minimum price allowed for an instance # of a particular type of course enrollment mode. This is not to be confused diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py index b5669b5506..004d4d9bd4 100644 --- a/lms/envs/devstack.py +++ b/lms/envs/devstack.py @@ -394,9 +394,6 @@ if FEATURES.get('ENABLE_ENTERPRISE_INTEGRATION'): 'enterprise.SystemWideEnterpriseUserRoleAssignment', ) -# List of enterprise customer uuids to exclude from transition to use of enterprise-catalog -ENTERPRISE_CUSTOMERS_EXCLUDED_FROM_CATALOG = () - ##################################################################### # django-session-cookie middleware diff --git a/lms/envs/production.py b/lms/envs/production.py index 597f38c6a8..5479e412bf 100644 --- a/lms/envs/production.py +++ b/lms/envs/production.py @@ -877,9 +877,6 @@ ENTERPRISE_CATALOG_INTERNAL_ROOT_URL = ENV_TOKENS.get( ENTERPRISE_CATALOG_INTERNAL_ROOT_URL ) -# List of enterprise customer uuids to exclude from transition to use of enterprise-catalog -ENTERPRISE_CUSTOMERS_EXCLUDED_FROM_CATALOG = ENV_TOKENS.get('ENTERPRISE_CUSTOMERS_EXCLUDED_FROM_CATALOG', ()) - ############## ENTERPRISE SERVICE LMS CONFIGURATION ################################## # The LMS has some features embedded that are related to the Enterprise service, but # which are not provided by the Enterprise service. These settings override the