diff --git a/requirements/constraints.txt b/requirements/constraints.txt index d2a97a143b..034ffdf013 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -67,9 +67,6 @@ matplotlib<3.1 # maxminddb 2.0.0 has dropped support for Python 3.5 maxminddb<2.0.0 -# mock version 4.0.0 drops support for python 3.5 -mock<4.0.0 - # oauthlib>3.0.1 causes test failures ( also remove the django-oauth-toolkit constraint when this is fixed ) oauthlib==3.0.1 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 555de4d11d..a280deede9 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -153,7 +153,7 @@ markdown==3.3.4 # via -r requirements/edx/base.in, django-wiki, staff- markey==0.8 # via enmerkar-underscore markupsafe==1.1.1 # via -r requirements/edx/paver.txt, chem, jinja2, mako, xblock maxminddb==1.5.4 # via -c requirements/edx/../constraints.txt, geoip2 -mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, xblock-drag-and-drop-v2, xblock-poll +mock==4.0.3 # via -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.22.1 # via -r requirements/edx/base.in mpmath==1.2.1 # via sympy @@ -212,7 +212,7 @@ scipy==1.6.1 # via chem, openedx-calc semantic-version==2.8.5 # via edx-drf-extensions shapely==1.7.1 # via -r requirements/edx/base.in simplejson==3.17.2 # via -r requirements/edx/base.in, sailthru-client, super-csv, xblock-utils -six==1.15.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, chem, codejail, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-rbac, event-tracking, fs, fs-s3fs, html5lib, isodate, libsass, mock, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock +six==1.15.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, chem, codejail, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-rbac, event-tracking, fs, fs-s3fs, html5lib, isodate, libsass, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock slumber==0.7.1 # via edx-bulk-grades, edx-enterprise, edx-rest-api-client social-auth-app-django==4.0.0 # via -r requirements/edx/base.in social-auth-core==4.0.2 # via -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt, -r requirements/edx/base.in, social-auth-app-django diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 5825223fb8..64b9c9ad18 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -185,7 +185,7 @@ markupsafe==1.1.1 # via -r requirements/edx/testing.txt, chem, jinja2, m maxminddb==1.5.4 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, geoip2 mccabe==0.6.1 # via -r requirements/edx/testing.txt, 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 +mock==4.0.3 # via -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.22.1 # via -r requirements/edx/testing.txt more-itertools==8.7.0 # via -r requirements/edx/testing.txt, zipp diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index e913682130..6aaaa8318a 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -11,7 +11,7 @@ idna==2.10 # via requests lazy==1.4 # via -r requirements/edx/paver.in libsass==0.10.0 # via -r requirements/edx/paver.in markupsafe==1.1.1 # via -r requirements/edx/paver.in -mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in +mock==4.0.3 # via -r requirements/edx/paver.in path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in paver==1.3.4 # via -r requirements/edx/paver.in pbr==5.5.1 # via stevedore @@ -19,7 +19,7 @@ psutil==5.8.0 # via -r requirements/edx/paver.in pymongo==3.10.1 # 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.25.1 # via -r requirements/edx/paver.in -six==1.15.0 # via libsass, mock, paver, python-memcached, stevedore +six==1.15.0 # via libsass, paver, python-memcached, stevedore stevedore==1.32.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in, edx-opaque-keys urllib3==1.26.3 # via requests watchdog==2.0.2 # via -r requirements/edx/paver.in diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 90e6296ae9..239470aa96 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -177,7 +177,7 @@ markey==0.8 # via -r requirements/edx/base.txt, enmerkar-underscor markupsafe==1.1.1 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, chem, jinja2, mako, xblock maxminddb==1.5.4 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, geoip2 mccabe==0.6.1 # via pylint -mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, xblock-drag-and-drop-v2, xblock-poll +mock==4.0.3 # via -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.22.1 # via -r requirements/edx/base.txt more-itertools==8.7.0 # via -r requirements/edx/coverage.txt, zipp