Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Old Pymongo pin #30569

Merged
merged 9 commits into from
Jun 27, 2022
Merged

Remove Old Pymongo pin #30569

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ca55b45
chore: unpin pymongo
aht007 Jun 10, 2022
ba4a995
fix: ran make upgrade
aht007 Jun 15, 2022
315c1cd
fix: add devstack configurations
aht007 Jun 16, 2022
2e53adf
fix: ran make upgrade
aht007 Jun 16, 2022
b2cc7fc
Merge branch 'master' into aht007/PYMONGO-CONSTRAINT-INVESTIGATION
aht007 Jun 16, 2022
004ab51
fix: add major version pin
aht007 Jun 20, 2022
357e1cc
Merge branch 'master' into aht007/PYMONGO-CONSTRAINT-INVESTIGATION
aht007 Jun 22, 2022
9153f97
fix: fix keys issue
aht007 Jun 23, 2022
ee3a082
Merge branch 'master' into aht007/PYMONGO-CONSTRAINT-INVESTIGATION
aht007 Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions cms/envs/devstack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 10 additions & 0 deletions lms/envs/devstack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 3 additions & 2 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add new pin here to avoid any major release.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

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
Expand Down
11 changes: 4 additions & 7 deletions requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,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
Expand Down Expand Up @@ -744,10 +744,8 @@ oauthlib==3.0.1
# social-auth-core
openedx-calc==3.0.1
# via -r requirements/edx/base.in
openedx-events==0.9.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.in
openedx-events==0.10.0
# via -r requirements/edx/base.in
openedx-filters==0.7.0
# via
# -r requirements/edx/base.in
Expand Down Expand Up @@ -836,9 +834,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
Expand Down
11 changes: 4 additions & 7 deletions requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ attrs==21.4.0
# jsonschema
# openedx-events
# pytest
babel==2.10.2
babel==2.10.3
# via
# -r requirements/edx/testing.txt
# enmerkar
Expand Down Expand Up @@ -972,10 +972,8 @@ oauthlib==3.0.1
# social-auth-core
openedx-calc==3.0.1
# via -r requirements/edx/testing.txt
openedx-events==0.9.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/testing.txt
openedx-events==0.10.0
# via -r requirements/edx/testing.txt
openedx-filters==0.7.0
# via
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -1142,9 +1140,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
Expand Down
4 changes: 2 additions & 2 deletions requirements/edx/doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
alabaster==0.7.12
# via sphinx
babel==2.10.2
babel==2.10.3
# via sphinx
certifi==2022.6.15
# via requests
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/paver.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 4 additions & 7 deletions requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ attrs==21.4.0
# openedx-events
# outcome
# pytest
babel==2.10.2
babel==2.10.3
# via
# -r requirements/edx/base.txt
# enmerkar
Expand Down Expand Up @@ -923,10 +923,8 @@ oauthlib==3.0.1
# social-auth-core
openedx-calc==3.0.1
# via -r requirements/edx/base.txt
openedx-events==0.9.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
openedx-events==0.10.0
# via -r requirements/edx/base.txt
openedx-filters==0.7.0
# via
# -r requirements/edx/base.txt
Expand Down Expand Up @@ -1077,9 +1075,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
Expand Down