From 4139deaa1f6e766f5c3465f9e90092d02ea53ab8 Mon Sep 17 00:00:00 2001 From: Muhammad Umar Khan Date: Thu, 2 May 2024 17:13:30 +0500 Subject: [PATCH] feat!: upgrade pymongo --- requirements/constraints.txt | 7 +- requirements/edx-sandbox/base.txt | 18 +- requirements/edx/base.txt | 132 ++++++------ requirements/edx/coverage.txt | 4 +- requirements/edx/development.txt | 202 +++++++++--------- requirements/edx/doc.txt | 138 ++++++------ requirements/edx/github.in | 3 + requirements/edx/kernel.in | 2 - requirements/edx/paver.txt | 10 +- requirements/edx/semgrep.txt | 18 +- requirements/edx/testing.txt | 170 ++++++++------- requirements/pip-tools.txt | 11 +- requirements/pip.txt | 4 +- .../structures_pruning/requirements/base.txt | 8 +- .../requirements/testing.txt | 16 +- scripts/user_retirement/requirements/base.txt | 81 ++++--- .../user_retirement/requirements/testing.txt | 110 ++++------ scripts/xblock/requirements.txt | 2 +- xmodule/contentstore/mongo.py | 12 +- .../tests/test_mixed_modulestore.py | 16 +- 20 files changed, 493 insertions(+), 471 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index ad17ea9f3c3d..4252ed46f5a6 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -35,9 +35,8 @@ django-oauth-toolkit==1.7.1 # incremental upgrade django-simple-history==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 +# to upgrade mongo to 6.0 or greater need to update this driver. +pymongo<4.4.1 # greater version has breaking changes and requires some migration steps. django-webpack-loader==0.7.0 @@ -117,7 +116,7 @@ openai<=0.28.1 optimizely-sdk<5.0 # lxml>=5.0 introduced breaking changes related to system dependencies -# lxml==5.2.1 introduced new extra so we'll nee to rename lxml --> lxml[html-clean] +# lxml==5.2.1 introduced new extra so we'll nee to rename lxml --> lxml[html-clean] # This constraint can be removed once we upgrade to Python 3.11 lxml<5.0 diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index fbc05dac94a8..3f6ebe7f88e0 100644 --- a/requirements/edx-sandbox/base.txt +++ b/requirements/edx-sandbox/base.txt @@ -22,11 +22,11 @@ cryptography==38.0.4 # -r requirements/edx-sandbox/base.in cycler==0.12.1 # via matplotlib -fonttools==4.49.0 +fonttools==4.51.0 # via matplotlib -importlib-resources==6.1.1 +importlib-resources==6.4.0 # via matplotlib -joblib==1.3.2 +joblib==1.4.2 # via nltk kiwisolver==1.4.5 # via matplotlib @@ -60,21 +60,21 @@ openedx-calc==3.1.0 # via -r requirements/edx-sandbox/base.in packaging==24.0 # via matplotlib -pillow==10.2.0 +pillow==10.3.0 # via matplotlib -pycparser==2.21 +pycparser==2.22 # via cffi -pyparsing==3.1.1 +pyparsing==3.1.2 # via # -r requirements/edx-sandbox/base.in # chem # matplotlib # openedx-calc -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via matplotlib random2==1.0.2 # via -r requirements/edx-sandbox/base.in -regex==2024.4.16 +regex==2024.4.28 # via nltk scipy==1.10.1 # via @@ -91,5 +91,5 @@ sympy==1.12 # openedx-calc tqdm==4.66.2 # via nltk -zipp==3.17.0 +zipp==3.18.1 # via importlib-resources diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 4e027596a0c3..6671a6beba44 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -6,9 +6,17 @@ # -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/github.in -acid-xblock==0.3.0 +-e git+https://github.com/openedx/event-tracking.git@umar/upgrade-pymongo#egg=event-tracking==2.4.1 + # via + # -r requirements/edx/github.in + # edx-completion + # edx-proctoring + # edx-search +-e git+https://github.com/awais786/MongoDBProxy.git@fixing-pymongo4.0-#egg=openedx-mongodbproxy==0.2.1 + # via -r requirements/edx/github.in +acid-xblock==0.3.1 # via -r requirements/edx/kernel.in -aiohttp==3.9.3 +aiohttp==3.9.5 # via # geoip2 # openai @@ -26,7 +34,7 @@ annotated-types==0.6.0 # via pydantic appdirs==1.4.4 # via fs -asgiref==3.7.2 +asgiref==3.8.1 # via # django # django-cors-headers @@ -78,20 +86,20 @@ bleach[css]==6.1.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/kernel.in -boto3==1.34.45 +boto3==1.34.96 # via # -r requirements/edx/kernel.in # django-ses # fs-s3fs # ora2 -botocore==1.34.45 +botocore==1.34.96 # via # -r requirements/edx/kernel.in # boto3 # s3transfer bridgekeeper==0.9 # via -r requirements/edx/kernel.in -camel-converter[pydantic]==3.1.1 +camel-converter[pydantic]==3.1.2 # via meilisearch celery==5.3.6 # via @@ -136,7 +144,7 @@ click==8.1.6 # edx-django-utils # nltk # user-util -click-didyoumean==0.3.0 +click-didyoumean==0.3.1 # via celery click-plugins==1.1.1 # via celery @@ -169,7 +177,7 @@ cryptography==38.0.4 # pyopenssl # snowflake-connector-python # social-auth-core -cssutils==2.9.0 +cssutils==2.10.2 # via pynliner defusedxml==0.7.1 # via @@ -178,7 +186,7 @@ defusedxml==0.7.1 # ora2 # python3-openid # social-auth-core -django==4.2.10 +django==4.2.11 # via # -c requirements/edx/../common_constraints.txt # -c requirements/edx/../constraints.txt @@ -289,7 +297,7 @@ django-filter==24.2 # edx-enterprise # lti-consumer-xblock # openedx-blockstore -django-ipware==6.0.4 +django-ipware==7.0.1 # via # -r requirements/edx/kernel.in # edx-enterprise @@ -322,7 +330,7 @@ django-mptt==0.14.0 # openedx-django-wiki django-multi-email-field==0.7.0 # via edx-enterprise -django-mysql==4.12.0 +django-mysql==4.13.0 # via -r requirements/edx/kernel.in django-oauth-toolkit==1.7.1 # via @@ -350,7 +358,7 @@ django-simple-history==3.4.0 # edx-organizations # edx-proctoring # ora2 -django-statici18n==2.4.0 +django-statici18n==2.5.0 # via # -r requirements/edx/kernel.in # lti-consumer-xblock @@ -399,13 +407,17 @@ djangorestframework==3.14.0 # super-csv djangorestframework-xml==2.0.0 # via edx-enterprise +dnspython==2.6.1 + # via + # -r requirements/edx/paver.txt + # pymongo done-xblock==2.3.0 # via -r requirements/edx/bundled.in drf-jwt==1.19.2 # via edx-drf-extensions drf-nested-routers==0.93.5 # via openedx-blockstore -drf-spectacular==0.27.1 +drf-spectacular==0.27.2 # via -r requirements/edx/kernel.in drf-yasg==1.21.5 # via @@ -423,7 +435,7 @@ edx-auth-backends==4.3.0 # via # -r requirements/edx/kernel.in # openedx-blockstore -edx-braze-client==0.2.2 +edx-braze-client==0.2.5 # via # -r requirements/edx/bundled.in # edx-enterprise @@ -440,7 +452,7 @@ edx-celeryutils==1.3.0 # -r requirements/edx/kernel.in # edx-name-affirmation # super-csv -edx-codejail==3.4.0 +edx-codejail==3.4.1 # via -r requirements/edx/kernel.in edx-completion==4.6.0 # via -r requirements/edx/kernel.in @@ -488,7 +500,7 @@ edx-event-bus-kafka==5.7.0 # via -r requirements/edx/kernel.in edx-event-bus-redis==0.5.0 # via -r requirements/edx/kernel.in -edx-i18n-tools==1.5.0 +edx-i18n-tools==1.6.0 # via # -r requirements/edx/bundled.in # ora2 @@ -527,7 +539,7 @@ edx-rest-api-client==5.7.0 # edx-proctoring edx-search==3.9.1 # via -r requirements/edx/kernel.in -edx-sga==0.24.1 +edx-sga==0.25.0 # via -r requirements/edx/bundled.in edx-submissions==3.7.0 # via @@ -563,15 +575,9 @@ enmerkar==0.7.1 # via enmerkar-underscore enmerkar-underscore==2.3.0 # via -r requirements/edx/kernel.in -event-tracking==2.4.0 - # via - # -r requirements/edx/kernel.in - # edx-completion - # edx-proctoring - # edx-search fastavro==1.9.4 # via openedx-events -filelock==3.13.1 +filelock==3.14.0 # via snowflake-connector-python frozenlist==1.4.1 # via @@ -601,9 +607,9 @@ html5lib==1.1 # via # -r requirements/edx/kernel.in # ora2 -icalendar==5.0.11 +icalendar==5.0.12 # via -r requirements/edx/kernel.in -idna==3.6 +idna==3.7 # via # -r requirements/edx/paver.txt # optimizely-sdk @@ -639,7 +645,7 @@ jmespath==1.0.1 # via # boto3 # botocore -joblib==1.3.2 +joblib==1.4.2 # via nltk jsondiff==2.0.0 # via edx-enterprise @@ -652,17 +658,17 @@ jsonfield==3.1.0 # edx-submissions # lti-consumer-xblock # ora2 -jsonschema==4.21.1 +jsonschema==4.22.0 # via # drf-spectacular # optimizely-sdk jsonschema-specifications==2023.12.1 # via jsonschema -jwcrypto==1.5.4 +jwcrypto==1.5.6 # via # django-oauth-toolkit # pylti1p3 -kombu==5.3.5 +kombu==5.3.7 # via celery laboratory==1.0.2 # via -r requirements/edx/kernel.in @@ -679,9 +685,9 @@ libsass==0.10.0 # -r requirements/edx/paver.txt loremipsum==1.0.5 # via ora2 -lti-consumer-xblock==9.10.0 +lti-consumer-xblock==9.11.0 # via -r requirements/edx/kernel.in -lxml==4.9.4 +lxml[html-clean]==4.9.4 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in @@ -696,7 +702,7 @@ lxml==4.9.4 # xmlsec mailsnake==1.6.4 # via -r requirements/edx/bundled.in -mako==1.3.2 +mako==1.3.3 # via # -r requirements/edx/kernel.in # acid-xblock @@ -718,13 +724,13 @@ markupsafe==2.1.5 # mako # openedx-calc # xblock -maxminddb==2.5.2 +maxminddb==2.6.1 # via geoip2 -meilisearch==0.30.0 +meilisearch==0.31.0 # via -r requirements/edx/kernel.in mock==5.1.0 # via -r requirements/edx/paver.txt -mongoengine==0.27.0 +mongoengine==0.28.2 # via -r requirements/edx/kernel.in monotonic==1.6 # via @@ -740,7 +746,7 @@ mysqlclient==2.2.4 # via # -r requirements/edx/kernel.in # openedx-blockstore -newrelic==9.6.0 +newrelic==9.9.0 # via # -r requirements/edx/bundled.in # edx-django-utils @@ -797,8 +803,6 @@ openedx-learning==0.9.2 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in -openedx-mongodbproxy==0.2.0 - # via -r requirements/edx/kernel.in optimizely-sdk==4.1.1 # via # -c requirements/edx/../constraints.txt @@ -835,7 +839,7 @@ pgpy==0.6.0 # via edx-enterprise piexif==1.1.3 # via -r requirements/edx/kernel.in -pillow==10.2.0 +pillow==10.3.0 # via # -r requirements/edx/kernel.in # edx-enterprise @@ -843,7 +847,7 @@ pillow==10.2.0 # edxval pkgutil-resolve-name==1.3.10 # via jsonschema -platformdirs==3.11.0 +platformdirs==4.2.1 # via snowflake-connector-python polib==1.2.0 # via edx-i18n-tools @@ -857,11 +861,11 @@ py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo- # via # -c requirements/edx/../constraints.txt # -r requirements/edx/bundled.in -pyasn1==0.5.1 +pyasn1==0.6.0 # via pgpy pycountry==23.12.11 # via -r requirements/edx/kernel.in -pycparser==2.21 +pycparser==2.22 # via cffi pycryptodomex==3.20.0 # via @@ -869,9 +873,9 @@ pycryptodomex==3.20.0 # edx-proctoring # lti-consumer-xblock # pyjwkest -pydantic==2.6.3 +pydantic==2.7.1 # via camel-converter -pydantic-core==2.16.3 +pydantic-core==2.18.2 # via pydantic pygments==2.17.2 # via @@ -899,7 +903,7 @@ pylti1p3==2.0.0 # via -r requirements/edx/kernel.in pymemcache==4.0.0 # via -r requirements/edx/paver.txt -pymongo==3.13.0 +pymongo==4.4.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in @@ -917,7 +921,7 @@ pyopenssl==22.0.0 # -c requirements/edx/../constraints.txt # optimizely-sdk # snowflake-connector-python -pyparsing==3.1.1 +pyparsing==3.1.2 # via # chem # openedx-calc @@ -927,7 +931,7 @@ pysrt==1.1.2 # via # -r requirements/edx/kernel.in # edxval -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/edx/kernel.in # analytics-python @@ -940,13 +944,13 @@ python-dateutil==2.8.2 # olxcleaner # ora2 # xblock -python-ipware==2.0.1 +python-ipware==3.0.0 # via django-ipware python-memcached==1.62 # via -r requirements/edx/paver.txt python-slugify==8.0.4 # via code-annotations -python-swiftclient==4.4.0 +python-swiftclient==4.5.0 # via ora2 python3-openid==3.2.0 ; python_version >= "3" # via @@ -989,15 +993,15 @@ random2==1.0.2 # via -r requirements/edx/kernel.in recommender-xblock==2.2.0 # via -r requirements/edx/bundled.in -redis==5.0.1 +redis==5.0.4 # via # -r requirements/edx/kernel.in # walrus -referencing==0.33.0 +referencing==0.35.1 # via # jsonschema # jsonschema-specifications -regex==2024.4.16 +regex==2024.4.28 # via nltk requests==2.31.0 # via @@ -1042,7 +1046,7 @@ rules==3.3 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.10.0 +s3transfer==0.10.1 # via boto3 sailthru-client==2.2.3 # via edx-ace @@ -1052,7 +1056,7 @@ scipy==1.10.1 # openedx-calc semantic-version==2.10.0 # via edx-drf-extensions -shapely==2.0.3 +shapely==2.0.4 # via -r requirements/edx/kernel.in simplejson==3.19.2 # via @@ -1095,7 +1099,7 @@ slumber==0.7.1 # edx-bulk-grades # edx-enterprise # edx-rest-api-client -snowflake-connector-python==3.7.0 +snowflake-connector-python==3.10.0 # via edx-enterprise social-auth-app-django==5.0.0 # via @@ -1118,14 +1122,14 @@ sortedcontainers==2.4.0 # snowflake-connector-python soupsieve==2.5 # via beautifulsoup4 -sqlparse==0.4.4 +sqlparse==0.5.0 # via # -r requirements/edx/kernel.in # django # openedx-blockstore staff-graded-xblock==2.3.0 # via -r requirements/edx/bundled.in -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/edx/kernel.in # -r requirements/edx/paver.txt @@ -1138,19 +1142,19 @@ super-csv==3.2.0 # via edx-bulk-grades sympy==1.12 # via openedx-calc -testfixtures==8.0.0 +testfixtures==8.2.0 # via edx-enterprise text-unidecode==1.3 # via python-slugify tinycss2==1.2.1 # via bleach -tomlkit==0.12.3 +tomlkit==0.12.4 # via snowflake-connector-python tqdm==4.66.2 # via # nltk # openai -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via # -r requirements/edx/paver.txt # annotated-types @@ -1220,7 +1224,7 @@ webob==1.8.7 # xblock wrapt==1.16.0 # via -r requirements/edx/paver.txt -xblock[django]==4.0.0 +xblock[django]==4.0.1 # via # -r requirements/edx/kernel.in # acid-xblock @@ -1238,7 +1242,7 @@ xblock[django]==4.0.0 # xblock-utils xblock-drag-and-drop-v2==4.0.2 # via -r requirements/edx/bundled.in -xblock-google-drive==0.6.1 +xblock-google-drive==0.7.0 # via -r requirements/edx/bundled.in xblock-poll==1.13.0 # via -r requirements/edx/bundled.in @@ -1252,7 +1256,7 @@ xss-utils==0.6.0 # via -r requirements/edx/kernel.in yarl==1.9.4 # via aiohttp -zipp==3.17.0 +zipp==3.18.1 # via # importlib-metadata # importlib-resources diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index bd2cbf10d012..132aed6325ff 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -6,7 +6,7 @@ # chardet==5.2.0 # via diff-cover -coverage==7.4.1 +coverage==7.5.0 # via -r requirements/edx/coverage.in diff-cover==9.0.0 # via -r requirements/edx/coverage.in @@ -14,7 +14,7 @@ jinja2==3.1.3 # via diff-cover markupsafe==2.1.5 # via jinja2 -pluggy==1.4.0 +pluggy==1.5.0 # via diff-cover pygments==2.17.2 # via diff-cover diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 10b88b4afd9f..15e3c2b5c2d0 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -8,15 +8,26 @@ # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt +-e git+https://github.com/openedx/event-tracking.git@umar/upgrade-pymongo#egg=event-tracking==2.4.1 + # via + # -r requirements/edx/doc.txt + # -r requirements/edx/testing.txt + # edx-completion + # edx-proctoring + # edx-search +-e git+https://github.com/awais786/MongoDBProxy.git@fixing-pymongo4.0-#egg=openedx-mongodbproxy==0.2.1 + # via + # -r requirements/edx/doc.txt + # -r requirements/edx/testing.txt accessible-pygments==0.0.4 # via # -r requirements/edx/doc.txt # pydata-sphinx-theme -acid-xblock==0.3.0 +acid-xblock==0.3.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -aiohttp==3.9.3 +aiohttp==3.9.5 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -63,7 +74,7 @@ appdirs==1.4.4 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # fs -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -146,14 +157,14 @@ boto==2.49.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -boto3==1.34.45 +boto3==1.34.96 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # django-ses # fs-s3fs # ora2 -botocore==1.34.45 +botocore==1.34.96 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -163,15 +174,15 @@ bridgekeeper==0.9 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -build==1.0.3 +build==1.2.1 # via # -r requirements/edx/../pip-tools.txt # pip-tools -cachetools==5.3.2 +cachetools==5.3.3 # via # -r requirements/edx/testing.txt # tox -camel-converter[pydantic]==3.1.1 +camel-converter[pydantic]==3.1.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -200,6 +211,7 @@ cffi==1.16.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # cryptography + # pact-python # pynacl # snowflake-connector-python chardet==5.2.0 @@ -242,7 +254,7 @@ click==8.1.6 # pip-tools # user-util # uvicorn -click-didyoumean==0.3.0 +click-didyoumean==0.3.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -287,7 +299,7 @@ coreschema==0.0.4 # -r requirements/edx/testing.txt # coreapi # drf-yasg -coverage[toml]==7.4.1 +coverage[toml]==7.5.0 # via # -r requirements/edx/testing.txt # pytest-cov @@ -313,12 +325,12 @@ cssselect==1.2.0 # via # -r requirements/edx/testing.txt # pyquery -cssutils==2.9.0 +cssutils==2.10.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # pynliner -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/edx/testing.txt deepmerge==1.1.1 # via @@ -342,7 +354,7 @@ distlib==0.3.8 # via # -r requirements/edx/testing.txt # virtualenv -django==4.2.10 +django==4.2.11 # via # -c requirements/edx/../common_constraints.txt # -c requirements/edx/../constraints.txt @@ -482,7 +494,7 @@ django-filter==24.2 # edx-enterprise # lti-consumer-xblock # openedx-blockstore -django-ipware==6.0.4 +django-ipware==7.0.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -526,7 +538,7 @@ django-multi-email-field==0.7.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-enterprise -django-mysql==4.12.0 +django-mysql==4.13.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -568,7 +580,7 @@ django-simple-history==3.4.0 # edx-organizations # edx-proctoring # ora2 -django-statici18n==2.4.0 +django-statici18n==2.5.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -584,7 +596,7 @@ django-stubs==1.16.0 # -c requirements/edx/../constraints.txt # -r requirements/edx/development.in # djangorestframework-stubs -django-stubs-ext==4.2.7 +django-stubs-ext==5.0.0 # via django-stubs django-user-tasks==3.2.0 # via @@ -638,6 +650,11 @@ djangorestframework-xml==2.0.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-enterprise +dnspython==2.6.1 + # via + # -r requirements/edx/doc.txt + # -r requirements/edx/testing.txt + # pymongo docutils==0.19 # via # -r requirements/edx/doc.txt @@ -658,7 +675,7 @@ drf-nested-routers==0.93.5 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # openedx-blockstore -drf-spectacular==0.27.1 +drf-spectacular==0.27.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -684,7 +701,7 @@ edx-auth-backends==4.3.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # openedx-blockstore -edx-braze-client==0.2.2 +edx-braze-client==0.2.5 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -705,7 +722,7 @@ edx-celeryutils==1.3.0 # -r requirements/edx/testing.txt # edx-name-affirmation # super-csv -edx-codejail==3.4.0 +edx-codejail==3.4.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -767,7 +784,7 @@ edx-event-bus-redis==0.5.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-i18n-tools==1.5.0 +edx-i18n-tools==1.6.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -822,7 +839,7 @@ edx-search==3.9.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-sga==0.24.1 +edx-sga==0.25.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -877,29 +894,22 @@ enmerkar-underscore==2.3.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -event-tracking==2.4.0 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # edx-completion - # edx-proctoring - # edx-search -exceptiongroup==1.2.0 +exceptiongroup==1.2.1 # via # -r requirements/edx/testing.txt # anyio # pytest -execnet==2.0.2 +execnet==2.1.1 # via # -r requirements/edx/testing.txt # pytest-xdist factory-boy==3.3.0 # via -r requirements/edx/testing.txt -faker==24.14.0 +faker==25.0.0 # via # -r requirements/edx/testing.txt # factory-boy -fastapi==0.109.2 +fastapi==0.110.3 # via # -r requirements/edx/testing.txt # pact-python @@ -908,14 +918,14 @@ fastavro==1.9.4 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # openedx-events -filelock==3.13.1 +filelock==3.14.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # snowflake-connector-python # tox # virtualenv -freezegun==1.4.0 +freezegun==1.5.0 # via -r requirements/edx/testing.txt frozenlist==1.4.1 # via @@ -948,7 +958,7 @@ gitdb==4.0.11 # via # -r requirements/edx/doc.txt # gitpython -gitpython==3.1.42 +gitpython==3.1.43 # via -r requirements/edx/doc.txt glob2==0.7 # via @@ -977,11 +987,11 @@ html5lib==1.1 # ora2 httpretty==1.1.4 # via -r requirements/edx/testing.txt -icalendar==5.0.11 +icalendar==5.0.12 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -idna==3.6 +idna==3.7 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1060,7 +1070,7 @@ jmespath==1.0.1 # -r requirements/edx/testing.txt # boto3 # botocore -joblib==1.3.2 +joblib==1.4.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1080,7 +1090,7 @@ jsonfield==3.1.0 # edx-submissions # lti-consumer-xblock # ora2 -jsonschema==4.21.1 +jsonschema==4.22.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1092,13 +1102,13 @@ jsonschema-specifications==2023.12.1 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # jsonschema -jwcrypto==1.5.4 +jwcrypto==1.5.6 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # django-oauth-toolkit # pylti1p3 -kombu==5.3.5 +kombu==5.3.7 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1130,11 +1140,11 @@ loremipsum==1.0.5 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # ora2 -lti-consumer-xblock==9.10.0 +lti-consumer-xblock==9.11.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -lxml==4.9.4 +lxml[html-clean]==4.9.4 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt @@ -1153,7 +1163,7 @@ mailsnake==1.6.4 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -mako==1.3.2 +mako==1.3.3 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1178,7 +1188,7 @@ markupsafe==2.1.5 # mako # openedx-calc # xblock -maxminddb==2.5.2 +maxminddb==2.6.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1187,11 +1197,11 @@ mccabe==0.7.0 # via # -r requirements/edx/testing.txt # pylint -meilisearch==0.30.0 +meilisearch==0.31.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -mistune==2.0.5 +mistune==3.0.2 # via # -r requirements/edx/doc.txt # sphinx-mdinclude @@ -1199,7 +1209,7 @@ mock==5.1.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -mongoengine==0.27.0 +mongoengine==0.28.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1220,7 +1230,7 @@ multidict==6.0.5 # -r requirements/edx/testing.txt # aiohttp # yarl -mypy==1.8.0 +mypy==1.10.0 # via # -r requirements/edx/development.in # django-stubs @@ -1232,7 +1242,7 @@ mysqlclient==2.2.4 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # openedx-blockstore -newrelic==9.6.0 +newrelic==9.9.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1318,10 +1328,6 @@ openedx-learning==0.9.2 # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -openedx-mongodbproxy==0.2.0 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt optimizely-sdk==4.1.1 # via # -c requirements/edx/../constraints.txt @@ -1346,7 +1352,7 @@ packaging==24.0 # snowflake-connector-python # sphinx # tox -pact-python==2.1.1 +pact-python==2.2.0 # via -r requirements/edx/testing.txt pansi==2020.7.3 # via @@ -1389,21 +1395,21 @@ piexif==1.1.3 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -pillow==10.2.0 +pillow==10.3.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-enterprise # edx-organizations # edxval -pip-tools==7.4.0 +pip-tools==7.4.1 # via -r requirements/edx/../pip-tools.txt pkgutil-resolve-name==1.3.10 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # jsonschema -platformdirs==3.11.0 +platformdirs==4.2.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1411,7 +1417,7 @@ platformdirs==3.11.0 # snowflake-connector-python # tox # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via # -r requirements/edx/testing.txt # diff-cover @@ -1441,7 +1447,7 @@ py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo- # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -pyasn1==0.5.1 +pyasn1==0.6.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1454,7 +1460,7 @@ pycountry==23.12.11 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -pycparser==2.21 +pycparser==2.22 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1466,13 +1472,13 @@ pycryptodomex==3.20.0 # edx-proctoring # lti-consumer-xblock # pyjwkest -pydantic==2.6.3 +pydantic==2.7.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # camel-converter # fastapi -pydantic-core==2.16.3 +pydantic-core==2.18.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1546,7 +1552,7 @@ pymemcache==4.0.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -pymongo==3.13.0 +pymongo==4.4.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt @@ -1571,7 +1577,7 @@ pyopenssl==22.0.0 # -r requirements/edx/testing.txt # optimizely-sdk # snowflake-connector-python -pyparsing==3.1.1 +pyparsing==3.1.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1581,7 +1587,7 @@ pyproject-api==1.6.1 # via # -r requirements/edx/testing.txt # tox -pyproject-hooks==1.0.0 +pyproject-hooks==1.1.0 # via # -r requirements/edx/../pip-tools.txt # build @@ -1598,7 +1604,7 @@ pysrt==1.1.2 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edxval -pytest==8.1.2 +pytest==8.2.0 # via # -r requirements/edx/testing.txt # pylint-pytest @@ -1623,9 +1629,9 @@ pytest-metadata==1.8.0 # pytest-json-report pytest-randomly==3.15.0 # via -r requirements/edx/testing.txt -pytest-xdist[psutil]==3.5.0 +pytest-xdist[psutil]==3.6.1 # via -r requirements/edx/testing.txt -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1641,7 +1647,7 @@ python-dateutil==2.8.2 # olxcleaner # ora2 # xblock -python-ipware==2.0.1 +python-ipware==3.0.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1655,7 +1661,7 @@ python-slugify==8.0.4 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # code-annotations -python-swiftclient==4.4.0 +python-swiftclient==4.5.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1695,7 +1701,7 @@ pyuca==1.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -pywatchman==1.4.1 +pywatchman==2.0.0 # via -r requirements/edx/development.in pyyaml==6.0.1 # via @@ -1715,18 +1721,18 @@ recommender-xblock==2.2.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -redis==5.0.1 +redis==5.0.4 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # walrus -referencing==0.33.0 +referencing==0.35.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # jsonschema # jsonschema-specifications -regex==2024.4.16 +regex==2024.4.28 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1788,7 +1794,7 @@ rules==3.3 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.10.0 +s3transfer==0.10.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1809,7 +1815,7 @@ semantic-version==2.10.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-drf-extensions -shapely==2.0.3 +shapely==2.0.4 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1866,7 +1872,7 @@ smmap==5.0.1 # via # -r requirements/edx/doc.txt # gitdb -sniffio==1.3.0 +sniffio==1.3.1 # via # -r requirements/edx/testing.txt # anyio @@ -1874,7 +1880,7 @@ snowballstemmer==2.2.0 # via # -r requirements/edx/doc.txt # sphinx -snowflake-connector-python==3.7.0 +snowflake-connector-python==3.10.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1921,7 +1927,7 @@ sphinx-book-theme==1.0.1 # via -r requirements/edx/doc.txt sphinx-design==0.5.0 # via -r requirements/edx/doc.txt -sphinx-mdinclude==0.5.3 +sphinx-mdinclude==0.6.0 # via # -r requirements/edx/doc.txt # sphinxcontrib-openapi @@ -1959,7 +1965,7 @@ sphinxcontrib-serializinghtml==1.1.5 # sphinx sphinxext-rediraffe==0.2.7 # via -r requirements/edx/doc.txt -sqlparse==0.4.4 +sqlparse==0.5.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1970,11 +1976,11 @@ staff-graded-xblock==2.3.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -starlette==0.36.3 +starlette==0.37.2 # via # -r requirements/edx/testing.txt # fastapi -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1993,7 +1999,7 @@ sympy==1.12 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # openedx-calc -testfixtures==8.0.0 +testfixtures==8.2.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -2020,17 +2026,16 @@ tomli==2.0.1 # pip-tools # pylint # pyproject-api - # pyproject-hooks # pytest # tox # vulture -tomlkit==0.12.3 +tomlkit==0.12.4 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # pylint # snowflake-connector-python -tox==4.11.4 +tox==4.15.0 # via -r requirements/edx/testing.txt tqdm==4.66.2 # via @@ -2038,9 +2043,9 @@ tqdm==4.66.2 # -r requirements/edx/testing.txt # nltk # openai -types-pytz==2024.1.0.20240203 +types-pytz==2024.1.0.20240417 # via django-stubs -types-pyyaml==6.0.12.12 +types-pyyaml==6.0.12.20240311 # via # django-stubs # djangorestframework-stubs @@ -2048,7 +2053,7 @@ types-requests==2.31.0.6 # via djangorestframework-stubs types-urllib3==1.26.25.14 # via types-requests -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -2062,13 +2067,13 @@ typing-extensions==4.9.0 # djangorestframework-stubs # drf-spectacular # edx-opaque-keys - # faker # fastapi # grimp # import-linter # jwcrypto # kombu # mypy + # pact-python # pydantic # pydantic-core # pydata-sphinx-theme @@ -2111,7 +2116,7 @@ user-util==1.1.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -uvicorn==0.27.1 +uvicorn==0.29.0 # via # -r requirements/edx/testing.txt # pact-python @@ -2122,7 +2127,7 @@ vine==5.1.0 # amqp # celery # kombu -virtualenv==20.25.0 +virtualenv==20.26.1 # via # -r requirements/edx/testing.txt # tox @@ -2169,7 +2174,7 @@ webob==1.8.7 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # xblock -wheel==0.42.0 +wheel==0.43.0 # via # -r requirements/edx/../pip-tools.txt # pip-tools @@ -2178,7 +2183,7 @@ wrapt==1.16.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # astroid -xblock[django]==4.0.0 +xblock[django]==4.0.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -2199,7 +2204,7 @@ xblock-drag-and-drop-v2==4.0.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -xblock-google-drive==0.6.1 +xblock-google-drive==0.7.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -2227,7 +2232,8 @@ yarl==1.9.4 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # aiohttp -zipp==3.17.0 + # pact-python +zipp==3.18.1 # via # -r requirements/edx/../pip-tools.txt # -r requirements/edx/doc.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 1a63a42e57de..a576fcbf24df 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -6,11 +6,19 @@ # -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/base.txt +-e git+https://github.com/openedx/event-tracking.git@umar/upgrade-pymongo#egg=event-tracking==2.4.1 + # via + # -r requirements/edx/base.txt + # edx-completion + # edx-proctoring + # edx-search +-e git+https://github.com/awais786/MongoDBProxy.git@fixing-pymongo4.0-#egg=openedx-mongodbproxy==0.2.1 + # via -r requirements/edx/base.txt accessible-pygments==0.0.4 # via pydata-sphinx-theme -acid-xblock==0.3.0 +acid-xblock==0.3.1 # via -r requirements/edx/base.txt -aiohttp==3.9.3 +aiohttp==3.9.5 # via # -r requirements/edx/base.txt # geoip2 @@ -41,7 +49,7 @@ appdirs==1.4.4 # via # -r requirements/edx/base.txt # fs -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/edx/base.txt # django @@ -107,20 +115,20 @@ bleach[css]==6.1.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -boto3==1.34.45 +boto3==1.34.96 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 -botocore==1.34.45 +botocore==1.34.96 # via # -r requirements/edx/base.txt # boto3 # s3transfer bridgekeeper==0.9 # via -r requirements/edx/base.txt -camel-converter[pydantic]==3.1.1 +camel-converter[pydantic]==3.1.2 # via # -r requirements/edx/base.txt # meilisearch @@ -171,7 +179,7 @@ click==8.1.6 # edx-django-utils # nltk # user-util -click-didyoumean==0.3.0 +click-didyoumean==0.3.1 # via # -r requirements/edx/base.txt # celery @@ -215,7 +223,7 @@ cryptography==38.0.4 # pyopenssl # snowflake-connector-python # social-auth-core -cssutils==2.9.0 +cssutils==2.10.2 # via # -r requirements/edx/base.txt # pynliner @@ -228,7 +236,7 @@ defusedxml==0.7.1 # ora2 # python3-openid # social-auth-core -django==4.2.10 +django==4.2.11 # via # -c requirements/edx/../common_constraints.txt # -c requirements/edx/../constraints.txt @@ -349,7 +357,7 @@ django-filter==24.2 # edx-enterprise # lti-consumer-xblock # openedx-blockstore -django-ipware==6.0.4 +django-ipware==7.0.1 # via # -r requirements/edx/base.txt # edx-enterprise @@ -386,7 +394,7 @@ django-multi-email-field==0.7.0 # via # -r requirements/edx/base.txt # edx-enterprise -django-mysql==4.12.0 +django-mysql==4.13.0 # via -r requirements/edx/base.txt django-oauth-toolkit==1.7.1 # via @@ -416,7 +424,7 @@ django-simple-history==3.4.0 # edx-organizations # edx-proctoring # ora2 -django-statici18n==2.4.0 +django-statici18n==2.5.0 # via # -r requirements/edx/base.txt # lti-consumer-xblock @@ -467,6 +475,10 @@ djangorestframework-xml==2.0.0 # via # -r requirements/edx/base.txt # edx-enterprise +dnspython==2.6.1 + # via + # -r requirements/edx/base.txt + # pymongo docutils==0.19 # via # pydata-sphinx-theme @@ -482,7 +494,7 @@ drf-nested-routers==0.93.5 # via # -r requirements/edx/base.txt # openedx-blockstore -drf-spectacular==0.27.1 +drf-spectacular==0.27.2 # via -r requirements/edx/base.txt drf-yasg==1.21.5 # via @@ -501,7 +513,7 @@ edx-auth-backends==4.3.0 # via # -r requirements/edx/base.txt # openedx-blockstore -edx-braze-client==0.2.2 +edx-braze-client==0.2.5 # via # -r requirements/edx/base.txt # edx-enterprise @@ -518,7 +530,7 @@ edx-celeryutils==1.3.0 # -r requirements/edx/base.txt # edx-name-affirmation # super-csv -edx-codejail==3.4.0 +edx-codejail==3.4.1 # via -r requirements/edx/base.txt edx-completion==4.6.0 # via -r requirements/edx/base.txt @@ -566,7 +578,7 @@ edx-event-bus-kafka==5.7.0 # via -r requirements/edx/base.txt edx-event-bus-redis==0.5.0 # via -r requirements/edx/base.txt -edx-i18n-tools==1.5.0 +edx-i18n-tools==1.6.0 # via # -r requirements/edx/base.txt # ora2 @@ -606,7 +618,7 @@ edx-rest-api-client==5.7.0 # edx-proctoring edx-search==3.9.1 # via -r requirements/edx/base.txt -edx-sga==0.24.1 +edx-sga==0.25.0 # via -r requirements/edx/base.txt edx-submissions==3.7.0 # via @@ -647,17 +659,11 @@ enmerkar==0.7.1 # enmerkar-underscore enmerkar-underscore==2.3.0 # via -r requirements/edx/base.txt -event-tracking==2.4.0 - # via - # -r requirements/edx/base.txt - # edx-completion - # edx-proctoring - # edx-search fastavro==1.9.4 # via # -r requirements/edx/base.txt # openedx-events -filelock==3.13.1 +filelock==3.14.0 # via # -r requirements/edx/base.txt # snowflake-connector-python @@ -684,7 +690,7 @@ geoip2==4.8.0 # via -r requirements/edx/base.txt gitdb==4.0.11 # via gitpython -gitpython==3.1.42 +gitpython==3.1.43 # via -r requirements/edx/doc.in glob2==0.7 # via -r requirements/edx/base.txt @@ -696,9 +702,9 @@ html5lib==1.1 # via # -r requirements/edx/base.txt # ora2 -icalendar==5.0.11 +icalendar==5.0.12 # via -r requirements/edx/base.txt -idna==3.6 +idna==3.7 # via # -r requirements/edx/base.txt # optimizely-sdk @@ -749,7 +755,7 @@ jmespath==1.0.1 # -r requirements/edx/base.txt # boto3 # botocore -joblib==1.3.2 +joblib==1.4.2 # via # -r requirements/edx/base.txt # nltk @@ -766,7 +772,7 @@ jsonfield==3.1.0 # edx-submissions # lti-consumer-xblock # ora2 -jsonschema==4.21.1 +jsonschema==4.22.0 # via # -r requirements/edx/base.txt # drf-spectacular @@ -776,12 +782,12 @@ jsonschema-specifications==2023.12.1 # via # -r requirements/edx/base.txt # jsonschema -jwcrypto==1.5.4 +jwcrypto==1.5.6 # via # -r requirements/edx/base.txt # django-oauth-toolkit # pylti1p3 -kombu==5.3.5 +kombu==5.3.7 # via # -r requirements/edx/base.txt # celery @@ -802,9 +808,9 @@ loremipsum==1.0.5 # via # -r requirements/edx/base.txt # ora2 -lti-consumer-xblock==9.10.0 +lti-consumer-xblock==9.11.0 # via -r requirements/edx/base.txt -lxml==4.9.4 +lxml[html-clean]==4.9.4 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt @@ -819,7 +825,7 @@ lxml==4.9.4 # xmlsec mailsnake==1.6.4 # via -r requirements/edx/base.txt -mako==1.3.2 +mako==1.3.3 # via # -r requirements/edx/base.txt # acid-xblock @@ -841,17 +847,17 @@ markupsafe==2.1.5 # mako # openedx-calc # xblock -maxminddb==2.5.2 +maxminddb==2.6.1 # via # -r requirements/edx/base.txt # geoip2 -meilisearch==0.30.0 +meilisearch==0.31.0 # via -r requirements/edx/base.txt -mistune==2.0.5 +mistune==3.0.2 # via sphinx-mdinclude mock==5.1.0 # via -r requirements/edx/base.txt -mongoengine==0.27.0 +mongoengine==0.28.2 # via -r requirements/edx/base.txt monotonic==1.6 # via @@ -871,7 +877,7 @@ mysqlclient==2.2.4 # via # -r requirements/edx/base.txt # openedx-blockstore -newrelic==9.6.0 +newrelic==9.9.0 # via # -r requirements/edx/base.txt # edx-django-utils @@ -933,8 +939,6 @@ openedx-learning==0.9.2 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt -openedx-mongodbproxy==0.2.0 - # via -r requirements/edx/base.txt optimizely-sdk==4.1.1 # via # -c requirements/edx/../constraints.txt @@ -980,7 +984,7 @@ picobox==4.0.0 # via sphinxcontrib-openapi piexif==1.1.3 # via -r requirements/edx/base.txt -pillow==10.2.0 +pillow==10.3.0 # via # -r requirements/edx/base.txt # edx-enterprise @@ -990,7 +994,7 @@ pkgutil-resolve-name==1.3.10 # via # -r requirements/edx/base.txt # jsonschema -platformdirs==3.11.0 +platformdirs==4.2.1 # via # -r requirements/edx/base.txt # snowflake-connector-python @@ -1010,13 +1014,13 @@ py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo- # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt -pyasn1==0.5.1 +pyasn1==0.6.0 # via # -r requirements/edx/base.txt # pgpy pycountry==23.12.11 # via -r requirements/edx/base.txt -pycparser==2.21 +pycparser==2.22 # via # -r requirements/edx/base.txt # cffi @@ -1026,11 +1030,11 @@ pycryptodomex==3.20.0 # edx-proctoring # lti-consumer-xblock # pyjwkest -pydantic==2.6.3 +pydantic==2.7.1 # via # -r requirements/edx/base.txt # camel-converter -pydantic-core==2.16.3 +pydantic-core==2.18.2 # via # -r requirements/edx/base.txt # pydantic @@ -1068,7 +1072,7 @@ pylti1p3==2.0.0 # via -r requirements/edx/base.txt pymemcache==4.0.0 # via -r requirements/edx/base.txt -pymongo==3.13.0 +pymongo==4.4.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt @@ -1088,7 +1092,7 @@ pyopenssl==22.0.0 # -r requirements/edx/base.txt # optimizely-sdk # snowflake-connector-python -pyparsing==3.1.1 +pyparsing==3.1.2 # via # -r requirements/edx/base.txt # chem @@ -1101,7 +1105,7 @@ pysrt==1.1.2 # via # -r requirements/edx/base.txt # edxval -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/edx/base.txt # analytics-python @@ -1114,7 +1118,7 @@ python-dateutil==2.8.2 # olxcleaner # ora2 # xblock -python-ipware==2.0.1 +python-ipware==3.0.0 # via # -r requirements/edx/base.txt # django-ipware @@ -1124,7 +1128,7 @@ python-slugify==8.0.4 # via # -r requirements/edx/base.txt # code-annotations -python-swiftclient==4.4.0 +python-swiftclient==4.5.0 # via # -r requirements/edx/base.txt # ora2 @@ -1170,16 +1174,16 @@ random2==1.0.2 # via -r requirements/edx/base.txt recommender-xblock==2.2.0 # via -r requirements/edx/base.txt -redis==5.0.1 +redis==5.0.4 # via # -r requirements/edx/base.txt # walrus -referencing==0.33.0 +referencing==0.35.1 # via # -r requirements/edx/base.txt # jsonschema # jsonschema-specifications -regex==2024.4.16 +regex==2024.4.28 # via # -r requirements/edx/base.txt # nltk @@ -1232,7 +1236,7 @@ rules==3.3 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.10.0 +s3transfer==0.10.1 # via # -r requirements/edx/base.txt # boto3 @@ -1249,7 +1253,7 @@ semantic-version==2.10.0 # via # -r requirements/edx/base.txt # edx-drf-extensions -shapely==2.0.3 +shapely==2.0.4 # via -r requirements/edx/base.txt simplejson==3.19.2 # via @@ -1296,7 +1300,7 @@ smmap==5.0.1 # via gitdb snowballstemmer==2.2.0 # via sphinx -snowflake-connector-python==3.7.0 +snowflake-connector-python==3.10.0 # via # -r requirements/edx/base.txt # edx-enterprise @@ -1337,7 +1341,7 @@ sphinx-book-theme==1.0.1 # via -r requirements/edx/doc.in sphinx-design==0.5.0 # via -r requirements/edx/doc.in -sphinx-mdinclude==0.5.3 +sphinx-mdinclude==0.6.0 # via sphinxcontrib-openapi sphinx-reredirects==0.1.3 # via -r requirements/edx/doc.in @@ -1359,14 +1363,14 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx sphinxext-rediraffe==0.2.7 # via -r requirements/edx/doc.in -sqlparse==0.4.4 +sqlparse==0.5.0 # via # -r requirements/edx/base.txt # django # openedx-blockstore staff-graded-xblock==2.3.0 # via -r requirements/edx/base.txt -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/edx/base.txt # code-annotations @@ -1382,7 +1386,7 @@ sympy==1.12 # via # -r requirements/edx/base.txt # openedx-calc -testfixtures==8.0.0 +testfixtures==8.2.0 # via # -r requirements/edx/base.txt # edx-enterprise @@ -1394,7 +1398,7 @@ tinycss2==1.2.1 # via # -r requirements/edx/base.txt # bleach -tomlkit==0.12.3 +tomlkit==0.12.4 # via # -r requirements/edx/base.txt # snowflake-connector-python @@ -1403,7 +1407,7 @@ tqdm==4.66.2 # -r requirements/edx/base.txt # nltk # openai -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via # -r requirements/edx/base.txt # annotated-types @@ -1484,7 +1488,7 @@ webob==1.8.7 # xblock wrapt==1.16.0 # via -r requirements/edx/base.txt -xblock[django]==4.0.0 +xblock[django]==4.0.1 # via # -r requirements/edx/base.txt # acid-xblock @@ -1502,7 +1506,7 @@ xblock[django]==4.0.0 # xblock-utils xblock-drag-and-drop-v2==4.0.2 # via -r requirements/edx/base.txt -xblock-google-drive==0.6.1 +xblock-google-drive==0.7.0 # via -r requirements/edx/base.txt xblock-poll==1.13.0 # via -r requirements/edx/base.txt @@ -1521,7 +1525,7 @@ yarl==1.9.4 # via # -r requirements/edx/base.txt # aiohttp -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/edx/base.txt # importlib-metadata diff --git a/requirements/edx/github.in b/requirements/edx/github.in index ea6d47eec8a0..950cd0ae91ac 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -90,3 +90,6 @@ # django42 support PR merged but new release is pending. # https://github.com/openedx/edx-platform/issues/33431 -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack + +-e git+https://github.com/openedx/event-tracking.git@umar/upgrade-pymongo#egg=event-tracking==2.4.1 +-e git+https://github.com/awais786/MongoDBProxy.git@fixing-pymongo4.0-#egg=openedx-mongodbproxy==0.2.1 diff --git a/requirements/edx/kernel.in b/requirements/edx/kernel.in index 253926e2b385..5b22894b2d5a 100644 --- a/requirements/edx/kernel.in +++ b/requirements/edx/kernel.in @@ -89,7 +89,6 @@ edx-toggles # Feature toggles management edx-token-utils # Validate exam access tokens edx-when edxval -event-tracking enmerkar-underscore # Implements a underscore extractor for django-babel. fs fs-s3fs==0.1.8 @@ -118,7 +117,6 @@ openedx-django-require openedx-events # Open edX Events from Hooks Extension Framework (OEP-50) openedx-filters # Open edX Filters from Hooks Extension Framework (OEP-50) openedx-learning # Open edX Learning core (experimental) -openedx-mongodbproxy openedx-django-wiki openedx-blockstore path diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index a9f602252d08..90d27397581e 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -10,9 +10,11 @@ charset-normalizer==2.0.12 # via # -c requirements/edx/../constraints.txt # requests +dnspython==2.6.1 + # via pymongo edx-opaque-keys==2.9.0 # via -r requirements/edx/paver.in -idna==3.6 +idna==3.7 # via requests lazy==1.6 # via -r requirements/edx/paver.in @@ -36,7 +38,7 @@ psutil==5.9.8 # via -r requirements/edx/paver.in pymemcache==4.0.0 # via -r requirements/edx/paver.in -pymongo==3.13.0 +pymongo==4.4.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/paver.in @@ -49,11 +51,11 @@ six==1.16.0 # via # libsass # paver -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/edx/paver.in # edx-opaque-keys -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via edx-opaque-keys urllib3==1.26.18 # via diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt index 7dfa710cf95b..b41d26e4dcb0 100644 --- a/requirements/edx/semgrep.txt +++ b/requirements/edx/semgrep.txt @@ -38,13 +38,13 @@ face==22.0.0 # via glom glom==22.1.0 # via semgrep -idna==3.6 +idna==3.7 # via requests -importlib-resources==6.1.1 +importlib-resources==6.4.0 # via # jsonschema # jsonschema-specifications -jsonschema==4.21.1 +jsonschema==4.22.0 # via semgrep jsonschema-specifications==2023.12.1 # via jsonschema @@ -54,19 +54,19 @@ mdurl==0.1.2 # via markdown-it-py packaging==24.0 # via semgrep -peewee==3.17.1 +peewee==3.17.3 # via semgrep pkgutil-resolve-name==1.3.10 # via jsonschema pygments==2.17.2 # via rich -referencing==0.33.0 +referencing==0.35.1 # via # jsonschema # jsonschema-specifications requests==2.31.0 # via semgrep -rich==13.7.0 +rich==13.7.1 # via semgrep rpds-py==0.18.0 # via @@ -80,7 +80,7 @@ semgrep==1.52.0 # via -r requirements/edx/semgrep.in tomli==2.0.1 # via semgrep -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via # rich # semgrep @@ -89,7 +89,7 @@ urllib3==1.26.18 # -c requirements/edx/../constraints.txt # requests # semgrep -wcmatch==8.5 +wcmatch==8.5.1 # via semgrep -zipp==3.17.0 +zipp==3.18.1 # via importlib-resources diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 7dd6f913e9c0..0f839c4bbe4d 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -6,9 +6,17 @@ # -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/base.txt -acid-xblock==0.3.0 +-e git+https://github.com/openedx/event-tracking.git@umar/upgrade-pymongo#egg=event-tracking==2.4.1 + # via + # -r requirements/edx/base.txt + # edx-completion + # edx-proctoring + # edx-search +-e git+https://github.com/awais786/MongoDBProxy.git@fixing-pymongo4.0-#egg=openedx-mongodbproxy==0.2.1 # via -r requirements/edx/base.txt -aiohttp==3.9.3 +acid-xblock==0.3.1 + # via -r requirements/edx/base.txt +aiohttp==3.9.5 # via # -r requirements/edx/base.txt # geoip2 @@ -39,7 +47,7 @@ appdirs==1.4.4 # via # -r requirements/edx/base.txt # fs -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/edx/base.txt # django @@ -107,22 +115,22 @@ bleach[css]==6.1.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -boto3==1.34.45 +boto3==1.34.96 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 -botocore==1.34.45 +botocore==1.34.96 # via # -r requirements/edx/base.txt # boto3 # s3transfer bridgekeeper==0.9 # via -r requirements/edx/base.txt -cachetools==5.3.2 +cachetools==5.3.3 # via tox -camel-converter[pydantic]==3.1.1 +camel-converter[pydantic]==3.1.2 # via # -r requirements/edx/base.txt # meilisearch @@ -147,6 +155,7 @@ cffi==1.16.0 # via # -r requirements/edx/base.txt # cryptography + # pact-python # pynacl # snowflake-connector-python chardet==5.2.0 @@ -181,7 +190,7 @@ click==8.1.6 # pact-python # user-util # uvicorn -click-didyoumean==0.3.0 +click-didyoumean==0.3.1 # via # -r requirements/edx/base.txt # celery @@ -215,7 +224,7 @@ coreschema==0.0.4 # -r requirements/edx/base.txt # coreapi # drf-yasg -coverage[toml]==7.4.1 +coverage[toml]==7.5.0 # via # -r requirements/edx/coverage.txt # pytest-cov @@ -238,11 +247,11 @@ cssselect==1.2.0 # via # -r requirements/edx/testing.in # pyquery -cssutils==2.9.0 +cssutils==2.10.2 # via # -r requirements/edx/base.txt # pynliner -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/edx/testing.in defusedxml==0.7.1 # via @@ -257,7 +266,7 @@ dill==0.3.8 # via pylint distlib==0.3.8 # via virtualenv -django==4.2.10 +django==4.2.11 # via # -c requirements/edx/../common_constraints.txt # -c requirements/edx/../constraints.txt @@ -378,7 +387,7 @@ django-filter==24.2 # edx-enterprise # lti-consumer-xblock # openedx-blockstore -django-ipware==6.0.4 +django-ipware==7.0.1 # via # -r requirements/edx/base.txt # edx-enterprise @@ -415,7 +424,7 @@ django-multi-email-field==0.7.0 # via # -r requirements/edx/base.txt # edx-enterprise -django-mysql==4.12.0 +django-mysql==4.13.0 # via -r requirements/edx/base.txt django-oauth-toolkit==1.7.1 # via @@ -445,7 +454,7 @@ django-simple-history==3.4.0 # edx-organizations # edx-proctoring # ora2 -django-statici18n==2.4.0 +django-statici18n==2.5.0 # via # -r requirements/edx/base.txt # lti-consumer-xblock @@ -496,6 +505,10 @@ djangorestframework-xml==2.0.0 # via # -r requirements/edx/base.txt # edx-enterprise +dnspython==2.6.1 + # via + # -r requirements/edx/base.txt + # pymongo done-xblock==2.3.0 # via -r requirements/edx/base.txt drf-jwt==1.19.2 @@ -506,7 +519,7 @@ drf-nested-routers==0.93.5 # via # -r requirements/edx/base.txt # openedx-blockstore -drf-spectacular==0.27.1 +drf-spectacular==0.27.2 # via -r requirements/edx/base.txt drf-yasg==1.21.5 # via @@ -525,7 +538,7 @@ edx-auth-backends==4.3.0 # via # -r requirements/edx/base.txt # openedx-blockstore -edx-braze-client==0.2.2 +edx-braze-client==0.2.5 # via # -r requirements/edx/base.txt # edx-enterprise @@ -542,7 +555,7 @@ edx-celeryutils==1.3.0 # -r requirements/edx/base.txt # edx-name-affirmation # super-csv -edx-codejail==3.4.0 +edx-codejail==3.4.1 # via -r requirements/edx/base.txt edx-completion==4.6.0 # via -r requirements/edx/base.txt @@ -590,7 +603,7 @@ edx-event-bus-kafka==5.7.0 # via -r requirements/edx/base.txt edx-event-bus-redis==0.5.0 # via -r requirements/edx/base.txt -edx-i18n-tools==1.5.0 +edx-i18n-tools==1.6.0 # via # -r requirements/edx/base.txt # ora2 @@ -632,7 +645,7 @@ edx-rest-api-client==5.7.0 # edx-proctoring edx-search==3.9.1 # via -r requirements/edx/base.txt -edx-sga==0.24.1 +edx-sga==0.25.0 # via -r requirements/edx/base.txt edx-submissions==3.7.0 # via @@ -673,35 +686,29 @@ enmerkar==0.7.1 # enmerkar-underscore enmerkar-underscore==2.3.0 # via -r requirements/edx/base.txt -event-tracking==2.4.0 - # via - # -r requirements/edx/base.txt - # edx-completion - # edx-proctoring - # edx-search -exceptiongroup==1.2.0 +exceptiongroup==1.2.1 # via # anyio # pytest -execnet==2.0.2 +execnet==2.1.1 # via pytest-xdist factory-boy==3.3.0 # via -r requirements/edx/testing.in -faker==24.14.0 +faker==25.0.0 # via factory-boy -fastapi==0.109.2 +fastapi==0.110.3 # via pact-python fastavro==1.9.4 # via # -r requirements/edx/base.txt # openedx-events -filelock==3.13.1 +filelock==3.14.0 # via # -r requirements/edx/base.txt # snowflake-connector-python # tox # virtualenv -freezegun==1.4.0 +freezegun==1.5.0 # via -r requirements/edx/testing.in frozenlist==1.4.1 # via @@ -740,9 +747,9 @@ html5lib==1.1 # ora2 httpretty==1.1.4 # via -r requirements/edx/testing.in -icalendar==5.0.11 +icalendar==5.0.12 # via -r requirements/edx/base.txt -idna==3.6 +idna==3.7 # via # -r requirements/edx/base.txt # anyio @@ -801,7 +808,7 @@ jmespath==1.0.1 # -r requirements/edx/base.txt # boto3 # botocore -joblib==1.3.2 +joblib==1.4.2 # via # -r requirements/edx/base.txt # nltk @@ -818,7 +825,7 @@ jsonfield==3.1.0 # edx-submissions # lti-consumer-xblock # ora2 -jsonschema==4.21.1 +jsonschema==4.22.0 # via # -r requirements/edx/base.txt # drf-spectacular @@ -827,12 +834,12 @@ jsonschema-specifications==2023.12.1 # via # -r requirements/edx/base.txt # jsonschema -jwcrypto==1.5.4 +jwcrypto==1.5.6 # via # -r requirements/edx/base.txt # django-oauth-toolkit # pylti1p3 -kombu==5.3.5 +kombu==5.3.7 # via # -r requirements/edx/base.txt # celery @@ -855,9 +862,9 @@ loremipsum==1.0.5 # via # -r requirements/edx/base.txt # ora2 -lti-consumer-xblock==9.10.0 +lti-consumer-xblock==9.11.0 # via -r requirements/edx/base.txt -lxml==4.9.4 +lxml[html-clean]==4.9.4 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt @@ -873,7 +880,7 @@ lxml==4.9.4 # xmlsec mailsnake==1.6.4 # via -r requirements/edx/base.txt -mako==1.3.2 +mako==1.3.3 # via # -r requirements/edx/base.txt # acid-xblock @@ -896,17 +903,17 @@ markupsafe==2.1.5 # mako # openedx-calc # xblock -maxminddb==2.5.2 +maxminddb==2.6.1 # via # -r requirements/edx/base.txt # geoip2 mccabe==0.7.0 # via pylint -meilisearch==0.30.0 +meilisearch==0.31.0 # via -r requirements/edx/base.txt mock==5.1.0 # via -r requirements/edx/base.txt -mongoengine==0.27.0 +mongoengine==0.28.2 # via -r requirements/edx/base.txt monotonic==1.6 # via @@ -926,7 +933,7 @@ mysqlclient==2.2.4 # via # -r requirements/edx/base.txt # openedx-blockstore -newrelic==9.6.0 +newrelic==9.9.0 # via # -r requirements/edx/base.txt # edx-django-utils @@ -988,8 +995,6 @@ openedx-learning==0.9.2 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt -openedx-mongodbproxy==0.2.0 - # via -r requirements/edx/base.txt optimizely-sdk==4.1.1 # via # -c requirements/edx/../constraints.txt @@ -1006,7 +1011,7 @@ packaging==24.0 # pytest # snowflake-connector-python # tox -pact-python==2.1.1 +pact-python==2.2.0 # via -r requirements/edx/testing.in pansi==2020.7.3 # via @@ -1036,7 +1041,7 @@ pgpy==0.6.0 # edx-enterprise piexif==1.1.3 # via -r requirements/edx/base.txt -pillow==10.2.0 +pillow==10.3.0 # via # -r requirements/edx/base.txt # edx-enterprise @@ -1046,14 +1051,14 @@ pkgutil-resolve-name==1.3.10 # via # -r requirements/edx/base.txt # jsonschema -platformdirs==3.11.0 +platformdirs==4.2.1 # via # -r requirements/edx/base.txt # pylint # snowflake-connector-python # tox # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via # -r requirements/edx/coverage.txt # diff-cover @@ -1080,7 +1085,7 @@ py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo- # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt -pyasn1==0.5.1 +pyasn1==0.6.0 # via # -r requirements/edx/base.txt # pgpy @@ -1090,7 +1095,7 @@ pycodestyle==2.8.0 # -r requirements/edx/testing.in pycountry==23.12.11 # via -r requirements/edx/base.txt -pycparser==2.21 +pycparser==2.22 # via # -r requirements/edx/base.txt # cffi @@ -1100,12 +1105,12 @@ pycryptodomex==3.20.0 # edx-proctoring # lti-consumer-xblock # pyjwkest -pydantic==2.6.3 +pydantic==2.7.1 # via # -r requirements/edx/base.txt # camel-converter # fastapi -pydantic-core==2.16.3 +pydantic-core==2.18.2 # via # -r requirements/edx/base.txt # pydantic @@ -1157,7 +1162,7 @@ pylti1p3==2.0.0 # via -r requirements/edx/base.txt pymemcache==4.0.0 # via -r requirements/edx/base.txt -pymongo==3.13.0 +pymongo==4.4.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt @@ -1177,7 +1182,7 @@ pyopenssl==22.0.0 # -r requirements/edx/base.txt # optimizely-sdk # snowflake-connector-python -pyparsing==3.1.1 +pyparsing==3.1.2 # via # -r requirements/edx/base.txt # chem @@ -1194,7 +1199,7 @@ pysrt==1.1.2 # via # -r requirements/edx/base.txt # edxval -pytest==8.1.2 +pytest==8.2.0 # via # -r requirements/edx/testing.in # pylint-pytest @@ -1219,9 +1224,9 @@ pytest-metadata==1.8.0 # pytest-json-report pytest-randomly==3.15.0 # via -r requirements/edx/testing.in -pytest-xdist[psutil]==3.5.0 +pytest-xdist[psutil]==3.6.1 # via -r requirements/edx/testing.in -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/edx/base.txt # analytics-python @@ -1236,7 +1241,7 @@ python-dateutil==2.8.2 # olxcleaner # ora2 # xblock -python-ipware==2.0.1 +python-ipware==3.0.0 # via # -r requirements/edx/base.txt # django-ipware @@ -1246,7 +1251,7 @@ python-slugify==8.0.4 # via # -r requirements/edx/base.txt # code-annotations -python-swiftclient==4.4.0 +python-swiftclient==4.5.0 # via # -r requirements/edx/base.txt # ora2 @@ -1291,16 +1296,16 @@ random2==1.0.2 # via -r requirements/edx/base.txt recommender-xblock==2.2.0 # via -r requirements/edx/base.txt -redis==5.0.1 +redis==5.0.4 # via # -r requirements/edx/base.txt # walrus -referencing==0.33.0 +referencing==0.35.1 # via # -r requirements/edx/base.txt # jsonschema # jsonschema-specifications -regex==2024.4.16 +regex==2024.4.28 # via # -r requirements/edx/base.txt # nltk @@ -1353,7 +1358,7 @@ rules==3.3 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.10.0 +s3transfer==0.10.1 # via # -r requirements/edx/base.txt # boto3 @@ -1370,7 +1375,7 @@ semantic-version==2.10.0 # via # -r requirements/edx/base.txt # edx-drf-extensions -shapely==2.0.3 +shapely==2.0.4 # via -r requirements/edx/base.txt simplejson==3.19.2 # via @@ -1416,9 +1421,9 @@ slumber==0.7.1 # edx-bulk-grades # edx-enterprise # edx-rest-api-client -sniffio==1.3.0 +sniffio==1.3.1 # via anyio -snowflake-connector-python==3.7.0 +snowflake-connector-python==3.10.0 # via # -r requirements/edx/base.txt # edx-enterprise @@ -1445,16 +1450,16 @@ soupsieve==2.5 # via # -r requirements/edx/base.txt # beautifulsoup4 -sqlparse==0.4.4 +sqlparse==0.5.0 # via # -r requirements/edx/base.txt # django # openedx-blockstore staff-graded-xblock==2.3.0 # via -r requirements/edx/base.txt -starlette==0.36.3 +starlette==0.37.2 # via fastapi -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/edx/base.txt # code-annotations @@ -1470,7 +1475,7 @@ sympy==1.12 # via # -r requirements/edx/base.txt # openedx-calc -testfixtures==8.0.0 +testfixtures==8.2.0 # via # -r requirements/edx/base.txt # -r requirements/edx/testing.in @@ -1491,19 +1496,19 @@ tomli==2.0.1 # pyproject-api # pytest # tox -tomlkit==0.12.3 +tomlkit==0.12.4 # via # -r requirements/edx/base.txt # pylint # snowflake-connector-python -tox==4.11.4 +tox==4.15.0 # via -r requirements/edx/testing.in tqdm==4.66.2 # via # -r requirements/edx/base.txt # nltk # openai -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via # -r requirements/edx/base.txt # annotated-types @@ -1513,12 +1518,12 @@ typing-extensions==4.9.0 # django-countries # drf-spectacular # edx-opaque-keys - # faker # fastapi # grimp # import-linter # jwcrypto # kombu + # pact-python # pydantic # pydantic-core # pylint @@ -1554,7 +1559,7 @@ urllib3==1.26.18 # snowflake-connector-python user-util==1.1.0 # via -r requirements/edx/base.txt -uvicorn==0.27.1 +uvicorn==0.29.0 # via pact-python vine==5.1.0 # via @@ -1562,7 +1567,7 @@ vine==5.1.0 # amqp # celery # kombu -virtualenv==20.25.0 +virtualenv==20.26.1 # via tox voluptuous==0.14.2 # via @@ -1600,7 +1605,7 @@ wrapt==1.16.0 # via # -r requirements/edx/base.txt # astroid -xblock[django]==4.0.0 +xblock[django]==4.0.1 # via # -r requirements/edx/base.txt # acid-xblock @@ -1618,7 +1623,7 @@ xblock[django]==4.0.0 # xblock-utils xblock-drag-and-drop-v2==4.0.2 # via -r requirements/edx/base.txt -xblock-google-drive==0.6.1 +xblock-google-drive==0.7.0 # via -r requirements/edx/base.txt xblock-poll==1.13.0 # via -r requirements/edx/base.txt @@ -1637,7 +1642,8 @@ yarl==1.9.4 # via # -r requirements/edx/base.txt # aiohttp -zipp==3.17.0 + # pact-python +zipp==3.18.1 # via # -r requirements/edx/base.txt # importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 06c75582c9b6..4b631a73d780 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,7 +4,7 @@ # # make upgrade # -build==1.0.3 +build==1.2.1 # via pip-tools click==8.1.6 # via @@ -16,9 +16,9 @@ importlib-metadata==6.11.0 # build packaging==24.0 # via build -pip-tools==7.4.0 +pip-tools==7.4.1 # via -r requirements/pip-tools.in -pyproject-hooks==1.0.0 +pyproject-hooks==1.1.0 # via # build # pip-tools @@ -26,10 +26,9 @@ tomli==2.0.1 # via # build # pip-tools - # pyproject-hooks -wheel==0.42.0 +wheel==0.43.0 # via pip-tools -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 71954cc66a6f..e3ffcc7b6daf 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.42.0 +wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: pip==24.0 # via -r requirements/pip.in -setuptools==69.1.0 +setuptools==69.5.1 # via -r requirements/pip.in diff --git a/scripts/structures_pruning/requirements/base.txt b/scripts/structures_pruning/requirements/base.txt index 1f6d52e8c309..d7b4f8795d49 100644 --- a/scripts/structures_pruning/requirements/base.txt +++ b/scripts/structures_pruning/requirements/base.txt @@ -11,16 +11,18 @@ click==8.1.6 # click-log click-log==0.4.0 # via -r scripts/structures_pruning/requirements/base.in -edx-opaque-keys==2.5.1 +dnspython==2.6.1 + # via pymongo +edx-opaque-keys==2.9.0 # via -r scripts/structures_pruning/requirements/base.in pbr==6.0.0 # via stevedore -pymongo==3.13.0 +pymongo==4.4.0 # via # -c scripts/structures_pruning/requirements/../../../requirements/constraints.txt # -r scripts/structures_pruning/requirements/base.in # edx-opaque-keys stevedore==5.2.0 # via edx-opaque-keys -typing-extensions==4.10.0 +typing-extensions==4.11.0 # via edx-opaque-keys diff --git a/scripts/structures_pruning/requirements/testing.txt b/scripts/structures_pruning/requirements/testing.txt index 0fc423b1b3cc..226228ebf2ab 100644 --- a/scripts/structures_pruning/requirements/testing.txt +++ b/scripts/structures_pruning/requirements/testing.txt @@ -12,9 +12,13 @@ click-log==0.4.0 # via -r scripts/structures_pruning/requirements/base.txt ddt==1.7.2 # via -r scripts/structures_pruning/requirements/testing.in -edx-opaque-keys==2.5.1 +dnspython==2.6.1 + # via + # -r scripts/structures_pruning/requirements/base.txt + # pymongo +edx-opaque-keys==2.9.0 # via -r scripts/structures_pruning/requirements/base.txt -exceptiongroup==1.2.0 +exceptiongroup==1.2.1 # via pytest iniconfig==2.0.0 # via pytest @@ -24,13 +28,13 @@ pbr==6.0.0 # via # -r scripts/structures_pruning/requirements/base.txt # stevedore -pluggy==1.4.0 +pluggy==1.5.0 # via pytest -pymongo==3.13.0 +pymongo==4.4.0 # via # -r scripts/structures_pruning/requirements/base.txt # edx-opaque-keys -pytest==8.1.1 +pytest==8.2.0 # via -r scripts/structures_pruning/requirements/testing.in stevedore==5.2.0 # via @@ -38,7 +42,7 @@ stevedore==5.2.0 # edx-opaque-keys tomli==2.0.1 # via pytest -typing-extensions==4.10.0 +typing-extensions==4.11.0 # via # -r scripts/structures_pruning/requirements/base.txt # edx-opaque-keys diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt index bd3fc4848f4f..8a8043033d96 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -4,7 +4,7 @@ # # make upgrade # -asgiref==3.7.2 +asgiref==3.8.1 # via django attrs==23.2.0 # via zeep @@ -17,13 +17,13 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # pendulum boto3==1.34.26 # via -r scripts/user_retirement/requirements/base.in -botocore==1.34.26 +botocore==1.34.96 # via # boto3 # s3transfer -cachetools==5.3.2 +cachetools==5.3.3 # via google-auth -certifi==2023.11.17 +certifi==2024.2.2 # via requests cffi==1.16.0 # via @@ -41,8 +41,8 @@ click==8.1.6 cryptography==38.0.4 # via # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt - # simple-salesforce -django==4.2.9 + # pyjwt +django==4.2.11 # via # -c scripts/user_retirement/requirements/../../../requirements/common_constraints.txt # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt @@ -53,31 +53,29 @@ django-crum==0.7.9 # via edx-django-utils django-waffle==4.1.0 # via edx-django-utils -edx-django-utils==5.12.0 +edx-django-utils==5.13.0 # via edx-rest-api-client edx-rest-api-client==5.7.0 # via -r scripts/user_retirement/requirements/base.in -google-api-core==2.15.0 +google-api-core==2.19.0 # via google-api-python-client -google-api-python-client==2.115.0 +google-api-python-client==2.127.0 # via -r scripts/user_retirement/requirements/base.in -google-auth==2.26.2 +google-auth==2.29.0 # via # google-api-core # google-api-python-client # google-auth-httplib2 google-auth-httplib2==0.2.0 # via google-api-python-client -googleapis-common-protos==1.62.0 +googleapis-common-protos==1.63.0 # via google-api-core httplib2==0.22.0 # via # google-api-python-client # google-auth-httplib2 -idna==3.6 +idna==3.7 # via requests -importlib-resources==6.1.1 - # via pendulum isodate==0.6.1 # via zeep jenkinsapi==0.3.13 @@ -86,48 +84,46 @@ jmespath==1.0.1 # via # boto3 # botocore -lxml==4.9.3 +lxml==4.9.4 # via # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt # zeep more-itertools==10.2.0 # via simple-salesforce -newrelic==9.5.0 +newrelic==9.9.0 # via edx-django-utils pbr==6.0.0 # via stevedore -pendulum==3.0.0 - # via simple-salesforce -platformdirs==4.1.0 +platformdirs==4.2.1 # via zeep -protobuf==4.25.2 +proto-plus==1.23.0 + # via google-api-core +protobuf==4.25.3 # via # google-api-core # googleapis-common-protos + # proto-plus psutil==5.9.8 # via edx-django-utils -pyasn1==0.5.1 +pyasn1==0.6.0 # via # pyasn1-modules # rsa -pyasn1-modules==0.3.0 +pyasn1-modules==0.4.0 # via google-auth -pycparser==2.21 +pycparser==2.22 # via cffi -pyjwt==2.8.0 +pyjwt[crypto]==2.8.0 # via # edx-rest-api-client # simple-salesforce pynacl==1.5.0 # via edx-django-utils -pyparsing==3.1.1 +pyparsing==3.1.2 # via httplib2 -python-dateutil==2.8.2 - # via - # botocore - # pendulum - # time-machine -pytz==2023.3.post1 +python-dateutil==2.9.0.post0 + # via botocore +pytz==2024.1 # via # jenkinsapi # zeep @@ -144,15 +140,15 @@ requests==2.31.0 # simple-salesforce # slumber # zeep -requests-file==1.5.1 +requests-file==2.0.0 # via zeep requests-toolbelt==1.0.0 # via zeep rsa==4.9 # via google-auth -s3transfer==0.10.0 +s3transfer==0.10.1 # via boto3 -simple-salesforce==1.12.5 +simple-salesforce==1.12.6 # via -r scripts/user_retirement/requirements/base.in simplejson==3.19.2 # via -r scripts/user_retirement/requirements/base.in @@ -161,19 +157,16 @@ six==1.16.0 # isodate # jenkinsapi # python-dateutil - # requests-file slumber==0.7.1 # via edx-rest-api-client -sqlparse==0.4.4 +sqlparse==0.5.0 # via django -stevedore==5.1.0 +stevedore==5.2.0 # via edx-django-utils -time-machine==2.13.0 - # via pendulum -typing-extensions==4.9.0 - # via asgiref -tzdata==2023.4 - # via pendulum +typing-extensions==4.11.0 + # via + # asgiref + # simple-salesforce unicodecsv==0.14.1 # via -r scripts/user_retirement/requirements/base.in uritemplate==4.1.1 @@ -185,5 +178,3 @@ urllib3==1.26.18 # requests zeep==4.2.1 # via simple-salesforce -zipp==3.17.0 - # via importlib-resources diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt index 37444f469465..3aa606957cfd 100644 --- a/scripts/user_retirement/requirements/testing.txt +++ b/scripts/user_retirement/requirements/testing.txt @@ -4,7 +4,7 @@ # # make upgrade # -asgiref==3.7.2 +asgiref==3.8.1 # via # -r scripts/user_retirement/requirements/base.txt # django @@ -19,21 +19,21 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # -r scripts/user_retirement/requirements/base.txt # django # pendulum -boto3==1.34.26 +boto3==1.34.96 # via # -r scripts/user_retirement/requirements/base.txt # moto -botocore==1.34.26 +botocore==1.34.96 # via # -r scripts/user_retirement/requirements/base.txt # boto3 # moto # s3transfer -cachetools==5.3.2 +cachetools==5.3.3 # via # -r scripts/user_retirement/requirements/base.txt # google-auth -certifi==2023.11.17 +certifi==2024.2.2 # via # -r scripts/user_retirement/requirements/base.txt # requests @@ -54,10 +54,10 @@ cryptography==38.0.4 # via # -r scripts/user_retirement/requirements/base.txt # moto - # simple-salesforce -ddt==1.7.1 + # pyjwt +ddt==1.7.2 # via -r scripts/user_retirement/requirements/testing.in -django==4.2.9 +django==4.2.11 # via # -r scripts/user_retirement/requirements/base.txt # django-crum @@ -71,21 +71,21 @@ django-waffle==4.1.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -edx-django-utils==5.12.0 +edx-django-utils==5.13.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-rest-api-client edx-rest-api-client==5.7.0 # via -r scripts/user_retirement/requirements/base.txt -exceptiongroup==1.2.0 +exceptiongroup==1.2.1 # via pytest -google-api-core==2.15.0 +google-api-core==2.19.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-python-client -google-api-python-client==2.115.0 +google-api-python-client==2.127.0 # via -r scripts/user_retirement/requirements/base.txt -google-auth==2.26.2 +google-auth==2.29.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-core @@ -95,7 +95,7 @@ google-auth-httplib2==0.2.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-python-client -googleapis-common-protos==1.62.0 +googleapis-common-protos==1.63.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-core @@ -104,14 +104,10 @@ httplib2==0.22.0 # -r scripts/user_retirement/requirements/base.txt # google-api-python-client # google-auth-httplib2 -idna==3.6 +idna==3.7 # via # -r scripts/user_retirement/requirements/base.txt # requests -importlib-resources==6.1.1 - # via - # -r scripts/user_retirement/requirements/base.txt - # pendulum iniconfig==2.0.0 # via pytest isodate==0.6.1 @@ -127,11 +123,11 @@ jmespath==1.0.1 # -r scripts/user_retirement/requirements/base.txt # boto3 # botocore -lxml==4.9.3 +lxml==4.9.4 # via # -r scripts/user_retirement/requirements/base.txt # zeep -markupsafe==2.1.4 +markupsafe==2.1.5 # via # jinja2 # werkzeug @@ -141,51 +137,52 @@ more-itertools==10.2.0 # via # -r scripts/user_retirement/requirements/base.txt # simple-salesforce -moto==4.2.13 +moto==4.2.14 # via -r scripts/user_retirement/requirements/testing.in -newrelic==9.5.0 +newrelic==9.9.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -packaging==23.2 +packaging==24.0 # via pytest pbr==6.0.0 # via # -r scripts/user_retirement/requirements/base.txt # stevedore -pendulum==3.0.0 - # via - # -r scripts/user_retirement/requirements/base.txt - # simple-salesforce -platformdirs==4.1.0 +platformdirs==4.2.1 # via # -r scripts/user_retirement/requirements/base.txt # zeep -pluggy==1.3.0 +pluggy==1.5.0 # via pytest -protobuf==4.25.2 +proto-plus==1.23.0 + # via + # -r scripts/user_retirement/requirements/base.txt + # google-api-core +protobuf==4.25.3 # via # -r scripts/user_retirement/requirements/base.txt # google-api-core # googleapis-common-protos + # proto-plus psutil==5.9.8 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -pyasn1==0.5.1 +pyasn1==0.6.0 # via # -r scripts/user_retirement/requirements/base.txt # pyasn1-modules # rsa -pyasn1-modules==0.3.0 +pyasn1-modules==0.4.0 # via # -r scripts/user_retirement/requirements/base.txt # google-auth -pycparser==2.21 +pycparser==2.22 # via # -r scripts/user_retirement/requirements/base.txt # cffi -pyjwt==2.8.0 +pyjwt[crypto]==2.8.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-rest-api-client @@ -194,20 +191,18 @@ pynacl==1.5.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -pyparsing==3.1.1 +pyparsing==3.1.2 # via # -r scripts/user_retirement/requirements/base.txt # httplib2 -pytest==7.4.4 +pytest==8.2.0 # via -r scripts/user_retirement/requirements/testing.in -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r scripts/user_retirement/requirements/base.txt # botocore # moto - # pendulum - # time-machine -pytz==2023.3.post1 +pytz==2024.1 # via # -r scripts/user_retirement/requirements/base.txt # jenkinsapi @@ -230,17 +225,17 @@ requests==2.31.0 # simple-salesforce # slumber # zeep -requests-file==1.5.1 +requests-file==2.0.0 # via # -r scripts/user_retirement/requirements/base.txt # zeep -requests-mock==1.11.0 +requests-mock==1.12.1 # via -r scripts/user_retirement/requirements/testing.in requests-toolbelt==1.0.0 # via # -r scripts/user_retirement/requirements/base.txt # zeep -responses==0.24.1 +responses==0.25.0 # via # -r scripts/user_retirement/requirements/testing.in # moto @@ -248,11 +243,11 @@ rsa==4.9 # via # -r scripts/user_retirement/requirements/base.txt # google-auth -s3transfer==0.10.0 +s3transfer==0.10.1 # via # -r scripts/user_retirement/requirements/base.txt # boto3 -simple-salesforce==1.12.5 +simple-salesforce==1.12.6 # via -r scripts/user_retirement/requirements/base.txt simplejson==3.19.2 # via -r scripts/user_retirement/requirements/base.txt @@ -262,34 +257,25 @@ six==1.16.0 # isodate # jenkinsapi # python-dateutil - # requests-file - # requests-mock slumber==0.7.1 # via # -r scripts/user_retirement/requirements/base.txt # edx-rest-api-client -sqlparse==0.4.4 +sqlparse==0.5.0 # via # -r scripts/user_retirement/requirements/base.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -time-machine==2.13.0 - # via - # -r scripts/user_retirement/requirements/base.txt - # pendulum tomli==2.0.1 # via pytest -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via # -r scripts/user_retirement/requirements/base.txt # asgiref -tzdata==2023.4 - # via - # -r scripts/user_retirement/requirements/base.txt - # pendulum + # simple-salesforce unicodecsv==0.14.1 # via -r scripts/user_retirement/requirements/base.txt uritemplate==4.1.1 @@ -302,7 +288,7 @@ urllib3==1.26.18 # botocore # requests # responses -werkzeug==3.0.1 +werkzeug==3.0.2 # via moto xmltodict==0.13.0 # via moto @@ -310,7 +296,3 @@ zeep==4.2.1 # via # -r scripts/user_retirement/requirements/base.txt # simple-salesforce -zipp==3.17.0 - # via - # -r scripts/user_retirement/requirements/base.txt - # importlib-resources diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index 7a5f64224cb7..241676ac91fd 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -10,7 +10,7 @@ charset-normalizer==2.0.12 # via # -c scripts/xblock/../../requirements/constraints.txt # requests -idna==3.6 +idna==3.7 # via requests requests==2.31.0 # via -r scripts/xblock/requirements.in diff --git a/xmodule/contentstore/mongo.py b/xmodule/contentstore/mongo.py index 66d9474cde7c..a0acb13a2e4b 100644 --- a/xmodule/contentstore/mongo.py +++ b/xmodule/contentstore/mongo.py @@ -57,6 +57,14 @@ def close_connections(self): """ self.fs_files.database.client.close() + def check_connection(self): + connection = self.fs_files.database.client + try: + connection.admin.command("ping") + return True + except pymongo.errors.InvalidOperation: + return False + def _drop_database(self, database=True, collections=True, connections=True): """ A destructive operation to drop the underlying database and close all connections. @@ -69,8 +77,10 @@ def _drop_database(self, database=True, collections=True, connections=True): If connections is True, then close the connection to the database as well. """ - connection = self.fs_files.database.client + if not self.check_connection(): + return + connection = self.fs_files.database.client if database: connection.drop_database(self.fs_files.database.name) elif collections: diff --git a/xmodule/modulestore/tests/test_mixed_modulestore.py b/xmodule/modulestore/tests/test_mixed_modulestore.py index 91292cd88d71..5a4d82e4588e 100644 --- a/xmodule/modulestore/tests/test_mixed_modulestore.py +++ b/xmodule/modulestore/tests/test_mixed_modulestore.py @@ -156,8 +156,8 @@ def setUp(self): tz_aware=True, ) self.connection.drop_database(self.DB) - self.addCleanup(self.connection.drop_database, self.DB) - self.addCleanup(self.connection.close) + self.addCleanup(self._drop_database) + self.addCleanup(self._close_connection) # define attrs which get set in initdb to quell pylint self.writable_chapter_location = self.store = self.fake_location = None @@ -165,6 +165,18 @@ def setUp(self): self.user_id = ModuleStoreEnum.UserID.test + def _drop_database(self): + try: + self.connection.drop_database(self.DB) + except pymongo.errors.InvalidOperation: + pass + + def _close_connection(self): + try: + self.connection.close() + except pymongo.errors.InvalidOperation: + pass + def _create_course(self, course_key, asides=None): """ Create a course w/ one item in the persistence store using the given course & item location.