diff --git a/lms/djangoapps/dashboard/git_import.py b/lms/djangoapps/dashboard/git_import.py index 59ceee1d24..547e645dc5 100644 --- a/lms/djangoapps/dashboard/git_import.py +++ b/lms/djangoapps/dashboard/git_import.py @@ -335,7 +335,7 @@ def add_repo(repo, rdir_in, branch=None): mdb = mongoengine.connect(mongo_db['db'], host=mongouri) else: mdb = mongoengine.connect(mongo_db['db'], host=mongo_db['host'], port=mongo_db['port']) - except mongoengine.connection.ConnectionError: + except mongoengine.connection.ConnectionFailure: log.exception('Unable to connect to mongodb to save log, please ' 'check MONGODB_LOG settings') cil = CourseImportLog( diff --git a/lms/djangoapps/dashboard/tests/test_sysadmin.py b/lms/djangoapps/dashboard/tests/test_sysadmin.py index d969063f0f..f89aca55bb 100644 --- a/lms/djangoapps/dashboard/tests/test_sysadmin.py +++ b/lms/djangoapps/dashboard/tests/test_sysadmin.py @@ -128,7 +128,7 @@ class TestSysAdminMongoCourseImport(SysadminBaseTestCase): try: mongoengine.connect(TEST_MONGODB_LOG['db']) CourseImportLog.objects.all().delete() - except mongoengine.connection.ConnectionError: + except mongoengine.connection.ConnectionFailure: pass def _setstaff_login(self): diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 95cd240a82..ff532c7bef 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -108,7 +108,7 @@ lti-consumer-xblock mailsnake # Needed for mailchimp (mailing djangoapp) mako # Primary template language used for server-side page rendering Markdown # Convert text markup to HTML; used in capa problems, forums, and course wikis -mongoengine==0.10.0 # Object-document mapper for MongoDB, used in the LMS dashboard +mongoengine # Object-document mapper for MongoDB, used in the LMS dashboard mysqlclient # Driver for the default production relational database newrelic # New Relic agent for performance monitoring nodeenv # Utility for managing Node.js environments; we use this for deployments and testing diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 820398f334..1c9815d2eb 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -156,7 +156,7 @@ markupsafe==1.1.1 # via -r requirements/edx/paver.txt, chem, jinja2, mak maxminddb==1.5.4 # via geoip2 mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, xblock-drag-and-drop-v2, xblock-poll git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 # via -r requirements/edx/github.in -mongoengine==0.10.0 # via -r requirements/edx/base.in +mongoengine==0.20.0 # via -r requirements/edx/base.in more-itertools==8.4.0 # via -r requirements/edx/paver.txt, zipp mpmath==1.1.0 # via sympy mysqlclient==1.4.6 # via -r requirements/edx/base.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 44c6272b3e..72e3a36c73 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -191,7 +191,7 @@ mccabe==0.6.1 # via -r requirements/edx/testing.txt, flake8, pylint mistune==0.8.4 # via m2r mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, xblock-drag-and-drop-v2, xblock-poll git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 # via -r requirements/edx/testing.txt -mongoengine==0.10.0 # via -r requirements/edx/testing.txt +mongoengine==0.20.0 # via -r requirements/edx/testing.txt more-itertools==8.4.0 # via -r requirements/edx/testing.txt, pytest, zipp mpmath==1.1.0 # via -r requirements/edx/testing.txt, sympy mysqlclient==1.4.6 # via -r requirements/edx/testing.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 223242258e..4bf5667503 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -183,7 +183,7 @@ maxminddb==1.5.4 # via -r requirements/edx/base.txt, geoip2 mccabe==0.6.1 # via flake8, pylint mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, xblock-drag-and-drop-v2, xblock-poll git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 # via -r requirements/edx/base.txt -mongoengine==0.10.0 # via -r requirements/edx/base.txt +mongoengine==0.20.0 # via -r requirements/edx/base.txt more-itertools==8.4.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, pytest, zipp mpmath==1.1.0 # via -r requirements/edx/base.txt, sympy mysqlclient==1.4.6 # via -r requirements/edx/base.txt