From 5551ef08bf4e1f660970e28bf9e6a3fb3bd128cd Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Wed, 25 Mar 2020 14:29:48 -0400
Subject: [PATCH] Revert "Revert "Upgrade edx-when to read XBlock dates out of
the read-replica""
---
lms/envs/common.py | 1 +
requirements/edx/base.txt | 4 ++--
requirements/edx/development.txt | 4 ++--
requirements/edx/testing.txt | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 1df3a4345b1..f8bf3051e9f 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -553,6 +553,7 @@ STATUS_MESSAGE_PATH = ENV_ROOT / "status_message.json"
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
index f23de6f8e6b..2610c6ff901 100644
--- 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-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-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.0.7 # via -r requirements/edx/base.in, edx-proctoring
+edx-when==1.1.1 # 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
index 2e36f9c9724..83b5bd6a1d9 100644
--- 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-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-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.0.7 # via -r requirements/edx/testing.txt, edx-proctoring
+edx-when==1.1.1 # 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
index 770bfda4235..0865be72163 100644
--- 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-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-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.0.7 # via -r requirements/edx/base.txt, edx-proctoring
+edx-when==1.1.1 # 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
--
GitLab