From ca55b45c24cb62ac1e957b8dfdf0abeb45ecf6d9 Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan Date: Fri, 10 Jun 2022 18:01:46 +0500 Subject: [PATCH 1/6] chore: unpin pymongo --- requirements/constraints.txt | 3 --- requirements/edx-sandbox/py38.txt | 2 +- requirements/edx/base.txt | 24 ++++++++++++------------ requirements/edx/development.txt | 30 +++++++++++++++--------------- requirements/edx/doc.txt | 2 +- requirements/edx/paver.txt | 7 +++---- requirements/edx/testing.txt | 28 ++++++++++++++-------------- scripts/xblock/requirements.txt | 2 +- 8 files changed, 47 insertions(+), 51 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 63a65cfee187..560bb58e1a76 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -36,9 +36,6 @@ 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 - # python3-saml==1.10.0 version started breaking a11y tests python3-saml<1.10.0 diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt index fb7f568eb18a..7d06a26e9a91 100644 --- a/requirements/edx-sandbox/py38.txt +++ b/requirements/edx-sandbox/py38.txt @@ -36,7 +36,7 @@ matplotlib==3.3.4 # -r requirements/edx-sandbox/py38.in mpmath==1.2.1 # via sympy -networkx==2.8.2 +networkx==2.8.3 # via -r requirements/edx-sandbox/py38.in nltk==3.7 # via diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 3da22da3ddf6..21ffcbaf3f6f 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -161,7 +161,7 @@ cryptography==37.0.2 # jwcrypto # pyjwt # social-auth-core -cssutils==2.4.1 +cssutils==2.4.2 # via pynliner ddt==1.5.0 # via @@ -175,6 +175,7 @@ defusedxml==0.7.1 # python3-openid # python3-saml # social-auth-core + # tableauserverclient deprecated==1.2.13 # via # jwcrypto @@ -258,7 +259,7 @@ django-config-models==2.3.0 # edx-enterprise # edx-name-affirmation # lti-consumer-xblock -django-cors-headers==3.12.0 +django-cors-headers==3.13.0 # via -r requirements/edx/base.in django-countries==7.3.2 # via @@ -319,7 +320,7 @@ django-mptt==0.13.4 # django-wiki django-multi-email-field==0.6.2 # via edx-enterprise -django-mysql==4.6.0 +django-mysql==4.7.0 # via -r requirements/edx/base.in django-oauth-toolkit==1.3.2 # via @@ -339,7 +340,7 @@ django-sekizai==3.0.1 # via # -r requirements/edx/base.in # django-wiki -django-ses==3.0.1 +django-ses==3.1.0 # via -r requirements/edx/base.in django-simple-history==3.0.0 # via @@ -361,7 +362,7 @@ django-storages==1.8 # edxval django-user-tasks==3.0.0 # via -r requirements/edx/base.in -django-waffle==2.4.1 +django-waffle==2.5.0 # via # -r requirements/edx/base.in # blockstore @@ -549,7 +550,7 @@ event-tracking==2.1.0 # -r requirements/edx/base.in # edx-proctoring # edx-search -fastavro==1.4.12 +fastavro==1.5.1 # via openedx-events frozenlist==1.3.0 # via @@ -701,7 +702,7 @@ mysqlclient==2.1.0 # via # -r requirements/edx/base.in # blockstore -newrelic==7.10.0.175 +newrelic==7.12.0.176 # via # -r requirements/edx/base.in # edx-django-utils @@ -812,9 +813,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 @@ -900,7 +900,7 @@ redis==4.3.3 # via -r requirements/edx/base.in regex==2022.6.2 # via nltk -requests==2.27.1 +requests==2.28.0 # via # -r requirements/edx/paver.txt # analytics-python @@ -1027,7 +1027,7 @@ super-csv==3.0.0 # edx-bulk-grades sympy==1.10.1 # via openedx-calc -tableauserverclient==0.18.0 +tableauserverclient==0.19.0 # via edx-enterprise testfixtures==6.18.5 # via edx-enterprise @@ -1063,7 +1063,7 @@ vine==5.0.0 # kombu voluptuous==0.13.1 # via ora2 -watchdog==2.1.8 +watchdog==2.1.9 # via -r requirements/edx/paver.txt wcwidth==0.2.5 # via prompt-toolkit diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index e80885ff996e..b2f342ccf303 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -232,7 +232,7 @@ cssselect==1.1.0 # via # -r requirements/edx/testing.txt # pyquery -cssutils==2.4.1 +cssutils==2.4.2 # via # -r requirements/edx/testing.txt # pynliner @@ -249,6 +249,7 @@ defusedxml==0.7.1 # python3-openid # python3-saml # social-auth-core + # tableauserverclient deprecated==1.2.13 # via # -r requirements/edx/testing.txt @@ -348,7 +349,7 @@ django-config-models==2.3.0 # edx-enterprise # edx-name-affirmation # lti-consumer-xblock -django-cors-headers==3.12.0 +django-cors-headers==3.13.0 # via -r requirements/edx/testing.txt django-countries==7.3.2 # via @@ -417,7 +418,7 @@ django-multi-email-field==0.6.2 # via # -r requirements/edx/testing.txt # edx-enterprise -django-mysql==4.6.0 +django-mysql==4.7.0 # via -r requirements/edx/testing.txt django-oauth-toolkit==1.3.2 # via @@ -439,7 +440,7 @@ django-sekizai==3.0.1 # via # -r requirements/edx/testing.txt # django-wiki -django-ses==3.0.1 +django-ses==3.1.0 # via -r requirements/edx/testing.txt django-simple-history==3.0.0 # via @@ -461,7 +462,7 @@ django-storages==1.8 # edxval django-user-tasks==3.0.0 # via -r requirements/edx/testing.txt -django-waffle==2.4.1 +django-waffle==2.5.0 # via # -r requirements/edx/testing.txt # blockstore @@ -588,7 +589,7 @@ edx-i18n-tools==0.9.1 # via # -r requirements/edx/testing.txt # ora2 -edx-lint==5.2.2 +edx-lint==5.2.3 # via -r requirements/edx/testing.txt edx-milestones==0.4.0 # via -r requirements/edx/testing.txt @@ -681,7 +682,7 @@ execnet==1.9.0 # pytest-xdist factory-boy==3.2.1 # via -r requirements/edx/testing.txt -faker==13.12.0 +faker==13.12.1 # via # -r requirements/edx/testing.txt # factory-boy @@ -689,7 +690,7 @@ fastapi==0.78.0 # via # -r requirements/edx/testing.txt # pact-python -fastavro==1.4.12 +fastavro==1.5.1 # via # -r requirements/edx/testing.txt # openedx-events @@ -919,7 +920,7 @@ multidict==6.0.2 # -r requirements/edx/testing.txt # aiohttp # yarl -mypy==0.960 +mypy==0.961 # via -r requirements/edx/development.in mypy-extensions==0.4.3 # via mypy @@ -927,7 +928,7 @@ mysqlclient==2.1.0 # via # -r requirements/edx/testing.txt # blockstore -newrelic==7.10.0.175 +newrelic==7.12.0.176 # via # -r requirements/edx/testing.txt # edx-django-utils @@ -1115,9 +1116,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 @@ -1252,7 +1252,7 @@ regex==2022.6.2 # via # -r requirements/edx/testing.txt # nltk -requests==2.27.1 +requests==2.28.0 # via # -r requirements/edx/testing.txt # analytics-python @@ -1440,7 +1440,7 @@ sympy==1.10.1 # via # -r requirements/edx/testing.txt # openedx-calc -tableauserverclient==0.18.0 +tableauserverclient==0.19.0 # via # -r requirements/edx/testing.txt # edx-enterprise @@ -1531,7 +1531,7 @@ voluptuous==0.13.1 # ora2 vulture==2.4 # via -r requirements/edx/development.in -watchdog==2.1.8 +watchdog==2.1.9 # via -r requirements/edx/testing.txt wcwidth==0.2.5 # via diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 89b8169eb4e5..efd98c167885 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -54,7 +54,7 @@ pytz==2022.1 # via babel pyyaml==6.0 # via code-annotations -requests==2.27.1 +requests==2.28.0 # via sphinx six==1.16.0 # via edx-sphinx-theme diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index a6c888df66b5..aca2687bc71d 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -28,14 +28,13 @@ 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 # edx-opaque-keys python-memcached==1.59 # via -r requirements/edx/paver.in -requests==2.27.1 +requests==2.28.0 # via -r requirements/edx/paver.in six==1.16.0 # via @@ -48,7 +47,7 @@ stevedore==3.5.0 # edx-opaque-keys urllib3==1.26.9 # via requests -watchdog==2.1.8 +watchdog==2.1.9 # via -r requirements/edx/paver.in wrapt==1.14.1 # via -r requirements/edx/paver.in diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 60477eb70a51..9549a0cba1e1 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -224,7 +224,7 @@ cssselect==1.1.0 # via # -r requirements/edx/testing.in # pyquery -cssutils==2.4.1 +cssutils==2.4.2 # via # -r requirements/edx/base.txt # pynliner @@ -242,6 +242,7 @@ defusedxml==0.7.1 # python3-openid # python3-saml # social-auth-core + # tableauserverclient deprecated==1.2.13 # via # -r requirements/edx/base.txt @@ -335,7 +336,7 @@ django-config-models==2.3.0 # edx-enterprise # edx-name-affirmation # lti-consumer-xblock -django-cors-headers==3.12.0 +django-cors-headers==3.13.0 # via -r requirements/edx/base.txt django-countries==7.3.2 # via @@ -402,7 +403,7 @@ django-multi-email-field==0.6.2 # via # -r requirements/edx/base.txt # edx-enterprise -django-mysql==4.6.0 +django-mysql==4.7.0 # via -r requirements/edx/base.txt django-oauth-toolkit==1.3.2 # via @@ -424,7 +425,7 @@ django-sekizai==3.0.1 # via # -r requirements/edx/base.txt # django-wiki -django-ses==3.0.1 +django-ses==3.1.0 # via -r requirements/edx/base.txt django-simple-history==3.0.0 # via @@ -446,7 +447,7 @@ django-storages==1.8 # edxval django-user-tasks==3.0.0 # via -r requirements/edx/base.txt -django-waffle==2.4.1 +django-waffle==2.5.0 # via # -r requirements/edx/base.txt # blockstore @@ -572,7 +573,7 @@ edx-i18n-tools==0.9.1 # -r requirements/edx/base.txt # -r requirements/edx/testing.in # ora2 -edx-lint==5.2.2 +edx-lint==5.2.3 # via -r requirements/edx/testing.in edx-milestones==0.4.0 # via -r requirements/edx/base.txt @@ -661,11 +662,11 @@ execnet==1.9.0 # via pytest-xdist factory-boy==3.2.1 # via -r requirements/edx/testing.in -faker==13.12.0 +faker==13.12.1 # via factory-boy fastapi==0.78.0 # via pact-python -fastavro==1.4.12 +fastavro==1.5.1 # via # -r requirements/edx/base.txt # openedx-events @@ -878,7 +879,7 @@ mysqlclient==2.1.0 # via # -r requirements/edx/base.txt # blockstore -newrelic==7.10.0.175 +newrelic==7.12.0.176 # via # -r requirements/edx/base.txt # edx-django-utils @@ -1050,9 +1051,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 @@ -1180,7 +1180,7 @@ regex==2022.6.2 # via # -r requirements/edx/base.txt # nltk -requests==2.27.1 +requests==2.28.0 # via # -r requirements/edx/base.txt # analytics-python @@ -1338,7 +1338,7 @@ sympy==1.10.1 # via # -r requirements/edx/base.txt # openedx-calc -tableauserverclient==0.18.0 +tableauserverclient==0.19.0 # via # -r requirements/edx/base.txt # edx-enterprise @@ -1416,7 +1416,7 @@ voluptuous==0.13.1 # via # -r requirements/edx/base.txt # ora2 -watchdog==2.1.8 +watchdog==2.1.9 # via -r requirements/edx/base.txt wcwidth==0.2.5 # via diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index 464507e0f8b3..285b676cc328 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -10,7 +10,7 @@ charset-normalizer==2.0.12 # via requests idna==3.3 # via requests -requests==2.27.1 +requests==2.28.0 # via -r scripts/xblock/requirements.in urllib3==1.26.9 # via requests From ba4a99519cc6b60fee11ca186df37a80c3bcddad Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan Date: Wed, 15 Jun 2022 17:48:19 +0500 Subject: [PATCH 2/6] fix: ran make upgrade --- requirements/edx-sandbox/py38.txt | 4 ++-- requirements/edx/base.txt | 6 +++--- requirements/edx/development.txt | 12 ++++++------ requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 12 ++++++------ 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt index 7d06a26e9a91..808482e7a3b1 100644 --- a/requirements/edx-sandbox/py38.txt +++ b/requirements/edx-sandbox/py38.txt @@ -20,7 +20,7 @@ cycler==0.11.0 # via matplotlib joblib==1.1.0 # via nltk -kiwisolver==1.4.2 +kiwisolver==1.4.3 # via matplotlib lxml==4.9.0 # via @@ -36,7 +36,7 @@ matplotlib==3.3.4 # -r requirements/edx-sandbox/py38.in mpmath==1.2.1 # via sympy -networkx==2.8.3 +networkx==2.8.4 # via -r requirements/edx-sandbox/py38.in nltk==3.7 # via diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 21ffcbaf3f6f..b9a29c7ecbc7 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -55,7 +55,7 @@ attrs==21.4.0 # blockstore # edx-ace # openedx-events -babel==2.10.1 +babel==2.10.2 # via # -r requirements/edx/base.in # enmerkar @@ -727,7 +727,7 @@ oauthlib==3.0.1 # social-auth-core openedx-calc==3.0.1 # via -r requirements/edx/base.in -openedx-events==0.9.1 +openedx-events==0.10.0 # via -r requirements/edx/base.in openedx-filters==0.7.0 # via @@ -992,7 +992,7 @@ social-auth-app-django==5.0.0 # via # -r requirements/edx/base.in # edx-auth-backends -social-auth-core==4.2.0 +social-auth-core==4.3.0 # via # -r requirements/edx/base.in # edx-auth-backends diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index b2f342ccf303..5a54d70cb39e 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -63,7 +63,7 @@ asgiref==3.5.2 # -r requirements/edx/testing.txt # django # uvicorn -astroid==2.11.5 +astroid==2.11.6 # via # -r requirements/edx/testing.txt # pylint @@ -82,7 +82,7 @@ attrs==21.4.0 # jsonschema # openedx-events # pytest -babel==2.10.1 +babel==2.10.2 # via # -r requirements/edx/testing.txt # enmerkar @@ -589,7 +589,7 @@ edx-i18n-tools==0.9.1 # via # -r requirements/edx/testing.txt # ora2 -edx-lint==5.2.3 +edx-lint==5.2.4 # via -r requirements/edx/testing.txt edx-milestones==0.4.0 # via -r requirements/edx/testing.txt @@ -682,7 +682,7 @@ execnet==1.9.0 # pytest-xdist factory-boy==3.2.1 # via -r requirements/edx/testing.txt -faker==13.12.1 +faker==13.13.0 # via # -r requirements/edx/testing.txt # factory-boy @@ -954,7 +954,7 @@ oauthlib==3.0.1 # social-auth-core openedx-calc==3.0.1 # via -r requirements/edx/testing.txt -openedx-events==0.9.1 +openedx-events==0.10.0 # via -r requirements/edx/testing.txt openedx-filters==0.7.0 # via @@ -1377,7 +1377,7 @@ social-auth-app-django==5.0.0 # via # -r requirements/edx/testing.txt # edx-auth-backends -social-auth-core==4.2.0 +social-auth-core==4.3.0 # via # -r requirements/edx/testing.txt # edx-auth-backends diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index efd98c167885..e2a875b30b05 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -6,7 +6,7 @@ # alabaster==0.7.12 # via sphinx -babel==2.10.1 +babel==2.10.2 # via sphinx certifi==2022.5.18.1 # via requests diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 9549a0cba1e1..968ea4771e1a 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -59,7 +59,7 @@ asgiref==3.5.2 # -r requirements/edx/base.txt # django # uvicorn -astroid==2.11.5 +astroid==2.11.6 # via # pylint # pylint-celery @@ -77,7 +77,7 @@ attrs==21.4.0 # openedx-events # outcome # pytest -babel==2.10.1 +babel==2.10.2 # via # -r requirements/edx/base.txt # enmerkar @@ -573,7 +573,7 @@ edx-i18n-tools==0.9.1 # -r requirements/edx/base.txt # -r requirements/edx/testing.in # ora2 -edx-lint==5.2.3 +edx-lint==5.2.4 # via -r requirements/edx/testing.in edx-milestones==0.4.0 # via -r requirements/edx/base.txt @@ -662,7 +662,7 @@ execnet==1.9.0 # via pytest-xdist factory-boy==3.2.1 # via -r requirements/edx/testing.in -faker==13.12.1 +faker==13.13.0 # via factory-boy fastapi==0.78.0 # via pact-python @@ -905,7 +905,7 @@ oauthlib==3.0.1 # social-auth-core openedx-calc==3.0.1 # via -r requirements/edx/base.txt -openedx-events==0.9.1 +openedx-events==0.10.0 # via -r requirements/edx/base.txt openedx-filters==0.7.0 # via @@ -1298,7 +1298,7 @@ social-auth-app-django==5.0.0 # via # -r requirements/edx/base.txt # edx-auth-backends -social-auth-core==4.2.0 +social-auth-core==4.3.0 # via # -r requirements/edx/base.txt # edx-auth-backends From 315c1cd187e94766b1f0b4dbbf9ba227ca46f132 Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan Date: Thu, 16 Jun 2022 16:45:13 +0500 Subject: [PATCH 3/6] fix: add devstack configurations --- cms/envs/devstack.py | 10 ++++++++++ lms/envs/devstack.py | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py index ee0e74f4331c..16260d6ecbee 100644 --- a/cms/envs/devstack.py +++ b/cms/envs/devstack.py @@ -230,6 +230,16 @@ def should_show_debug_toolbar(request): # lint-amnesty, pylint: disable=missing 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']: + 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 58d76aca271b..4a17c46561c8 100644 --- a/lms/envs/devstack.py +++ b/lms/envs/devstack.py @@ -323,10 +323,20 @@ def should_show_debug_toolbar(request): # lint-amnesty, pylint: disable=missing 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']: + 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' From 2e53adff0f998eeaa97d35875b84c9d1d9615ab5 Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan Date: Thu, 16 Jun 2022 18:10:21 +0500 Subject: [PATCH 4/6] fix: ran make upgrade --- requirements/edx/base.txt | 6 +++--- requirements/edx/development.txt | 8 ++++---- requirements/edx/doc.txt | 4 ++-- requirements/edx/paver.txt | 2 +- requirements/edx/testing.txt | 6 +++--- scripts/xblock/requirements.txt | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index b9a29c7ecbc7..e5316967e3c1 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -55,7 +55,7 @@ attrs==21.4.0 # blockstore # edx-ace # openedx-events -babel==2.10.2 +babel==2.10.3 # via # -r requirements/edx/base.in # enmerkar @@ -101,7 +101,7 @@ celery==5.2.7 # edx-celeryutils # edx-enterprise # event-tracking -certifi==2022.5.18.1 +certifi==2022.6.15 # via # -r requirements/edx/paver.txt # elasticsearch @@ -274,7 +274,7 @@ django-crum==0.7.9 # edx-rbac # edx-toggles # super-csv -django-environ==0.8.1 +django-environ==0.9.0 # via blockstore django-fernet-fields==0.6 # via diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 5a54d70cb39e..542e11788d32 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -82,7 +82,7 @@ attrs==21.4.0 # jsonschema # openedx-events # pytest -babel==2.10.2 +babel==2.10.3 # via # -r requirements/edx/testing.txt # enmerkar @@ -137,7 +137,7 @@ celery==5.2.7 # edx-celeryutils # edx-enterprise # event-tracking -certifi==2022.5.18.1 +certifi==2022.6.15 # via # -r requirements/edx/testing.txt # elasticsearch @@ -366,7 +366,7 @@ django-crum==0.7.9 # super-csv django-debug-toolbar==3.4.0 # via -r requirements/edx/development.in -django-environ==0.8.1 +django-environ==0.9.0 # via # -r requirements/edx/testing.txt # blockstore @@ -755,7 +755,7 @@ importlib-metadata==4.11.4 # markdown # pytest-randomly # sphinx -importlib-resources==5.7.1 +importlib-resources==5.8.0 # via jsonschema inflection==0.5.1 # via diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index e2a875b30b05..d9b2444e673b 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -6,9 +6,9 @@ # alabaster==0.7.12 # via sphinx -babel==2.10.2 +babel==2.10.3 # via sphinx -certifi==2022.5.18.1 +certifi==2022.6.15 # via requests charset-normalizer==2.0.12 # via requests diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index aca2687bc71d..d307279b34c4 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -4,7 +4,7 @@ # # make upgrade # -certifi==2022.5.18.1 +certifi==2022.6.15 # via requests charset-normalizer==2.0.12 # via requests diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 968ea4771e1a..b76c3a39552f 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -77,7 +77,7 @@ attrs==21.4.0 # openedx-events # outcome # pytest -babel==2.10.2 +babel==2.10.3 # via # -r requirements/edx/base.txt # enmerkar @@ -132,7 +132,7 @@ celery==5.2.7 # edx-celeryutils # edx-enterprise # event-tracking -certifi==2022.5.18.1 +certifi==2022.6.15 # via # -r requirements/edx/base.txt # elasticsearch @@ -351,7 +351,7 @@ django-crum==0.7.9 # edx-rbac # edx-toggles # super-csv -django-environ==0.8.1 +django-environ==0.9.0 # via # -r requirements/edx/base.txt # blockstore diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index 285b676cc328..11a89b5f6404 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -4,7 +4,7 @@ # # make upgrade # -certifi==2022.5.18.1 +certifi==2022.6.15 # via requests charset-normalizer==2.0.12 # via requests From 004ab51b66afbe74693af560ef17180b5dc9170a Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan Date: Mon, 20 Jun 2022 17:07:37 +0500 Subject: [PATCH 5/6] fix: add major version pin --- requirements/constraints.txt | 4 ++++ requirements/edx/doc.txt | 2 +- requirements/edx/paver.txt | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 7c22d1259b37..68de816f8ccc 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -36,6 +36,10 @@ django-oauth-toolkit<=1.3.2 # Will be updated once we update python-dateutil package matplotlib<3.4.0 +# 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/doc.txt b/requirements/edx/doc.txt index d9b2444e673b..de9bfe9d8b79 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -62,7 +62,7 @@ smmap==5.0.0 # via gitdb snowballstemmer==2.2.0 # via sphinx -sphinx==5.0.1 +sphinx==5.0.2 # via # -r requirements/edx/doc.in # edx-sphinx-theme diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index d307279b34c4..3f369a3ab97c 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -30,6 +30,7 @@ psutil==5.9.1 # via -r requirements/edx/paver.in pymongo==3.12.3 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/paver.in # edx-opaque-keys python-memcached==1.59 From 9153f97145e0935965e883a9b82f01932774a404 Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan Date: Thu, 23 Jun 2022 12:43:14 +0500 Subject: [PATCH 6/6] fix: fix keys issue --- cms/envs/devstack.py | 3 ++- lms/envs/devstack.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py index 16260d6ecbee..52e1acbfadeb 100644 --- a/cms/envs/devstack.py +++ b/cms/envs/devstack.py @@ -237,7 +237,8 @@ def should_show_debug_toolbar(request): # lint-amnesty, pylint: disable=missing ##################################################################### # set replica sets of moduelstore to none as we haven't setup any for cms in devstack for store in MODULESTORE['default']['OPTIONS']['stores']: - store['DOC_STORE_CONFIG']['replicaSet'] = None + if 'DOC_STORE_CONFIG' in store and 'replicaSet' in store['DOC_STORE_CONFIG']: + store['DOC_STORE_CONFIG']['replicaSet'] = None ##################################################################### diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py index e8d5f9ba3b0c..0a535278d69d 100644 --- a/lms/envs/devstack.py +++ b/lms/envs/devstack.py @@ -336,7 +336,9 @@ def should_show_debug_toolbar(request): # lint-amnesty, pylint: disable=missing ##################################################################### # set replica sets of moduelstore to none as we haven't setup any for lms in devstack for store in MODULESTORE['default']['OPTIONS']['stores']: - store['DOC_STORE_CONFIG']['replicaSet'] = None + 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.