diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py index ee0e74f433..52e1acbfad 100644 --- a/cms/envs/devstack.py +++ b/cms/envs/devstack.py @@ -230,6 +230,17 @@ add_plugins(__name__, ProjectType.CMS, SettingsType.DEVSTACK) OPENAPI_CACHE_TIMEOUT = 0 +##################################################################### +# set replica set of contentstore to none as we haven't setup any for cms in devstack +CONTENTSTORE['DOC_STORE_CONFIG']['replicaSet'] = None + +##################################################################### +# set replica sets of moduelstore to none as we haven't setup any for cms in devstack +for store in MODULESTORE['default']['OPTIONS']['stores']: + if 'DOC_STORE_CONFIG' in store and 'replicaSet' in store['DOC_STORE_CONFIG']: + store['DOC_STORE_CONFIG']['replicaSet'] = None + + ##################################################################### # Lastly, run any migrations, if needed. MODULESTORE = convert_module_store_setting_if_needed(MODULESTORE) diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py index 8810c867c2..0a535278d6 100644 --- a/lms/envs/devstack.py +++ b/lms/envs/devstack.py @@ -329,10 +329,22 @@ REST_FRAMEWORK['DEFAULT_RENDERER_CLASSES'] += ( OPENAPI_CACHE_TIMEOUT = 0 +##################################################################### +# set replica set of contentstore to none as we haven't setup any for lms in devstack +CONTENTSTORE['DOC_STORE_CONFIG']['replicaSet'] = None + +##################################################################### +# set replica sets of moduelstore to none as we haven't setup any for lms in devstack +for store in MODULESTORE['default']['OPTIONS']['stores']: + if 'DOC_STORE_CONFIG' in store and 'replicaSet' in store['DOC_STORE_CONFIG']: + store['DOC_STORE_CONFIG']['replicaSet'] = None + + ##################################################################### # Lastly, run any migrations, if needed. MODULESTORE = convert_module_store_setting_if_needed(MODULESTORE) + SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd' EDXNOTES_INTERNAL_API = 'http://edx.devstack.edxnotesapi:18120/api/v1' diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 02773191e2..a21b524a60 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -36,8 +36,9 @@ django-oauth-toolkit<=1.3.2 # Will be updated once we update python-dateutil package matplotlib<3.4.0 -# tests failing for pymongo==3.11 -pymongo<3.11 +# constrained in opaque_keys. migration guide here: https://pymongo.readthedocs.io/en/4.0/migrate-to-pymongo4.html +# Major upgrade will be done in separate ticket. +pymongo<4.0.0 # python3-saml==1.10.0 version started breaking a11y tests python3-saml<1.10.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index f0d3b10e7a..b464311d1d 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -831,9 +831,8 @@ pylatexenc==2.10 # via olxcleaner pylti1p3==1.11.0 # via -r requirements/edx/base.in -pymongo==3.10.1 +pymongo==3.12.3 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in # -r requirements/edx/paver.txt # edx-opaque-keys diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index f2c3e61dc6..e7ecfaa3b4 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1133,9 +1133,8 @@ pylint-pytest==0.3.0 # via -r requirements/edx/testing.txt pylti1p3==1.11.0 # via -r requirements/edx/testing.txt -pymongo==3.10.1 +pymongo==3.12.3 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # edx-opaque-keys # event-tracking diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 87e86afebd..3f369a3ab9 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -28,7 +28,7 @@ pbr==5.9.0 # via stevedore psutil==5.9.1 # via -r requirements/edx/paver.in -pymongo==3.10.1 +pymongo==3.12.3 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/paver.in diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index d67aba5c31..d0cb2b0797 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1068,9 +1068,8 @@ pylint-pytest==0.3.0 # via -r requirements/edx/testing.in pylti1p3==1.11.0 # via -r requirements/edx/base.txt -pymongo==3.10.1 +pymongo==3.12.3 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-opaque-keys # event-tracking