Merge pull request openedx#23487 from edx/revert-23485-upgrade-edx-when-again

cpennington · web-flow · commit 016dfd64fa4c · 2020-03-24T16:34:59.000-04:00
Revert "Upgrade edx-when to read XBlock dates out of the read-replica"
diff --git a/lms/envs/common.py b/lms/envs/common.py
@@ -553,7 +553,6 @@
 
 DATABASE_ROUTERS = [
     'openedx.core.lib.django_courseware_routers.StudentModuleHistoryExtendedRouter',
-    'edx_django_utils.db.read_replica.ReadReplicaRouter',
 ]
 
 ############################ Cache Configuration ###############################
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -100,7 +100,7 @@ edx-celeryutils==0.4.0    # via -r requirements/edx/base.in, super-csv
 edx-completion==3.1.1     # via -r requirements/edx/base.in
 edx-django-release-util==0.4.1  # via -r requirements/edx/base.in
 edx-django-sites-extensions==2.4.3  # via -r requirements/edx/base.in
-edx-django-utils==3.1     # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when
+edx-django-utils==3.1     # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client
 edx-drf-extensions==5.0.2  # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
 edx-enterprise==3.0.1     # via -r requirements/edx/base.in
 edx-i18n-tools==0.5.0     # via ora2
@@ -116,7 +116,7 @@ edx-sga==0.10.0           # via -r requirements/edx/base.in
 edx-submissions==3.0.4    # via -r requirements/edx/base.in, ora2
 edx-tincan-py35==0.0.5    # via edx-enterprise
 edx-user-state-client==1.1.2  # via -r requirements/edx/base.in
-edx-when==1.1.1           # via -r requirements/edx/base.in, edx-proctoring
+edx-when==1.0.7           # via -r requirements/edx/base.in, edx-proctoring
 edxval==1.2.5             # via -r requirements/edx/base.in
 elasticsearch==1.9.0      # via edx-search
 enum34==1.1.10            # via edxval
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
@@ -112,7 +112,7 @@ edx-celeryutils==0.4.0    # via -r requirements/edx/testing.txt, super-csv
 edx-completion==3.1.1     # via -r requirements/edx/testing.txt
 edx-django-release-util==0.4.1  # via -r requirements/edx/testing.txt
 edx-django-sites-extensions==2.4.3  # via -r requirements/edx/testing.txt
-edx-django-utils==3.1     # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when
+edx-django-utils==3.1     # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client
 edx-drf-extensions==5.0.2  # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
 edx-enterprise==3.0.1     # via -r requirements/edx/testing.txt
 edx-i18n-tools==0.5.0     # via -r requirements/edx/testing.txt, ora2
@@ -130,7 +130,7 @@ edx-sphinx-theme==1.5.0   # via -r requirements/edx/development.in
 edx-submissions==3.0.4    # via -r requirements/edx/testing.txt, ora2
 edx-tincan-py35==0.0.5    # via -r requirements/edx/testing.txt, edx-enterprise
 edx-user-state-client==1.1.2  # via -r requirements/edx/testing.txt
-edx-when==1.1.1           # via -r requirements/edx/testing.txt, edx-proctoring
+edx-when==1.0.7           # via -r requirements/edx/testing.txt, edx-proctoring
 edxval==1.2.5             # via -r requirements/edx/testing.txt
 elasticsearch==1.9.0      # via -r requirements/edx/testing.txt, edx-search
 entrypoints==0.3          # via -r requirements/edx/testing.txt, flake8
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
@@ -108,7 +108,7 @@ edx-celeryutils==0.4.0    # via -r requirements/edx/base.txt, super-csv
 edx-completion==3.1.1     # via -r requirements/edx/base.txt
 edx-django-release-util==0.4.1  # via -r requirements/edx/base.txt
 edx-django-sites-extensions==2.4.3  # via -r requirements/edx/base.txt
-edx-django-utils==3.1     # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when
+edx-django-utils==3.1     # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client
 edx-drf-extensions==5.0.2  # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
 edx-enterprise==3.0.1     # via -r requirements/edx/base.txt
 edx-i18n-tools==0.5.0     # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, ora2
@@ -125,7 +125,7 @@ edx-sga==0.10.0           # via -r requirements/edx/base.txt
 edx-submissions==3.0.4    # via -r requirements/edx/base.txt, ora2
 edx-tincan-py35==0.0.5    # via -r requirements/edx/base.txt, edx-enterprise
 edx-user-state-client==1.1.2  # via -r requirements/edx/base.txt
-edx-when==1.1.1           # via -r requirements/edx/base.txt, edx-proctoring
+edx-when==1.0.7           # via -r requirements/edx/base.txt, edx-proctoring
 edxval==1.2.5             # via -r requirements/edx/base.txt
 elasticsearch==1.9.0      # via -r requirements/edx/base.txt, edx-search
 entrypoints==0.3          # via flake8

Original file line number	Diff line number	Diff line change
`@@ -553,7 +553,6 @@`
`553`	`553`
`554`	`554`	`DATABASE_ROUTERS = [`
`555`	`555`	`'openedx.core.lib.django_courseware_routers.StudentModuleHistoryExtendedRouter',`
`556`		`- 'edx_django_utils.db.read_replica.ReadReplicaRouter',`
`557`	`556`	`]`
`558`	`557`
`559`	`558`	`############################ Cache Configuration ###############################`