From 269b34a198e0aca6aae730adb5559802ec3ed652 Mon Sep 17 00:00:00 2001 From: Awais Qureshi <awais.qureshi@arbisoft.com> Date: Thu, 16 Jan 2020 11:01:45 +0500 Subject: [PATCH] BOM-1126 Removing the moto. --- requirements/constraints.txt | 9 --------- requirements/edx-sandbox/py35.txt | 2 +- requirements/edx-sandbox/shared.txt | 2 +- requirements/edx/base.txt | 6 +++--- requirements/edx/coverage.txt | 2 +- requirements/edx/development.txt | 15 +++------------ requirements/edx/paver.txt | 2 +- requirements/edx/pip-tools.txt | 2 +- requirements/edx/testing.in | 1 - requirements/edx/testing.txt | 15 +++------------ 10 files changed, 14 insertions(+), 42 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 61b3289a986..3539b36731f 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -37,15 +37,6 @@ freezegun==0.3.12 # 4.0.0 dropped support for Python 3.5 inflect<4.0.0 -# Pinned by moto to this but since moto is only a test requirement, we don't -# see the constraint when generating base.txt -# -# There are incompatible versions in the resolved dependencies: -# jsondiff (from edx-enterprise==1.8.6->-r requirements/edx/base.txt (line 108)) -# jsondiff==1.1.1 (from moto==1.2.0->-r requirements/edx/testing.in (line 33)) -# jsondiff==1.2.0 (from -r requirements/edx/base.txt (line 146)) -jsondiff==1.1.1 - # Convert text markup to HTML; used in capa problems, forums, and course wikis; pin Markdown version as tests failed for its upgrade to the latest release Markdown==2.6.11 diff --git a/requirements/edx-sandbox/py35.txt b/requirements/edx-sandbox/py35.txt index 458f9b2e50e..151cf9b69b7 100644 --- a/requirements/edx-sandbox/py35.txt +++ b/requirements/edx-sandbox/py35.txt @@ -26,7 +26,7 @@ python-dateutil==2.8.1 # via matplotlib pytz==2019.3 # via matplotlib random2==1.0.1 scipy==1.2.1 -six==1.13.0 +six==1.14.0 sympy==1.4 # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/edx-sandbox/shared.txt b/requirements/edx-sandbox/shared.txt index a62f1c003aa..680b8bef42b 100644 --- a/requirements/edx-sandbox/shared.txt +++ b/requirements/edx-sandbox/shared.txt @@ -9,4 +9,4 @@ cryptography==2.8 lxml==4.4.2 nltk==3.4.5 pycparser==2.19 # via cffi -six==1.13.0 # via cryptography, nltk +six==1.14.0 # via cryptography, nltk diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 6b399f02500..343f970db81 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -103,7 +103,7 @@ edx-completion==3.0.2 edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.3 edx-django-sites-extensions==2.4.2 -edx-django-utils==2.0.2 +edx-django-utils==2.0.3 edx-drf-extensions==2.4.5 edx-enterprise==2.0.48 edx-i18n-tools==0.5.0 @@ -141,7 +141,7 @@ isodate==0.6.0 # via python3-saml itypes==1.1.0 # via coreapi jinja2==2.10.3 # via code-annotations, coreschema jmespath==0.9.4 # via boto3, botocore -jsondiff==1.1.1 # via edx-enterprise +jsondiff==1.2.0 # via edx-enterprise jsonfield==2.0.2 kombu==3.0.37 # via celery laboratory==1.0.2 @@ -219,7 +219,7 @@ semantic-version==2.8.4 # via edx-drf-extensions shapely==1.6.4.post2 shortuuid==0.5.0 # via edx-django-oauth2-provider simplejson==3.17.0 -six==1.13.0 +six==1.14.0 slumber==0.7.1 # via edx-bulk-grades, edx-enterprise, edx-rest-api-client social-auth-app-django==3.1.0 social-auth-core==3.2.0 diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index b87ed571ec3..eaf0208c7c4 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -18,5 +18,5 @@ pluggy==0.13.1 # via diff-cover pygments==2.5.2 # via diff-cover python-dateutil==2.4.0 # via pandas pytz==2019.3 # via pandas -six==1.13.0 # via diff-cover +six==1.14.0 # via diff-cover zipp==1.0.0 # via importlib-metadata diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 16f16556c48..0292af70038 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -29,7 +29,6 @@ appdirs==1.4.3 argh==0.26.2 astroid==1.5.3 attrs==19.3.0 -aws-xray-sdk==0.95 babel==2.8.0 beautifulsoup4==4.8.2 billiard==3.3.0.23 @@ -50,7 +49,6 @@ click==7.0 code-annotations==0.3.3 colorama==0.4.3 contextlib2==0.6.0.post1 -cookies==2.2.1 coreapi==2.3.3 coreschema==0.0.4 coverage==5.0.3 @@ -104,7 +102,6 @@ djangorestframework-jwt==1.11.0 git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1 djangorestframework-xml==1.4.0 djangorestframework==3.9.4 -docker==4.1.0 docopt==0.6.2 docutils==0.16 drf-yasg==1.16 @@ -117,7 +114,7 @@ edx-completion==3.0.2 edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.3 edx-django-sites-extensions==2.4.2 -edx-django-utils==2.0.2 +edx-django-utils==2.0.3 edx-drf-extensions==2.4.5 edx-enterprise==2.0.48 edx-i18n-tools==0.5.0 @@ -171,9 +168,8 @@ itypes==1.1.0 jinja2-pluralize==0.3.0 jinja2==2.10.3 jmespath==0.9.4 -jsondiff==1.1.1 +jsondiff==1.2.0 jsonfield==2.0.2 -jsonpickle==1.2 jsonschema==3.2.0 # via sphinxcontrib-openapi kombu==3.0.37 laboratory==1.0.2 @@ -198,7 +194,6 @@ mock==3.0.5 git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 mongoengine==0.10.0 more-itertools==8.1.0 -moto==1.3.1 mpmath==1.1.0 mysqlclient==1.4.6 newrelic==5.4.1.134 @@ -225,7 +220,6 @@ polib==1.1.0 psutil==1.2.1 py2neo==3.1.2 py==1.8.1 -pyaml==19.12.0 pycodestyle==2.5.0 pycontracts==1.7.1 pycountry==19.8.18 @@ -286,7 +280,7 @@ shapely==1.6.4.post2 shortuuid==0.5.0 simplejson==3.17.0 singledispatch==3.4.0.3 -six==1.13.0 +six==1.14.0 slumber==0.7.1 snowballstemmer==2.0.0 # via sphinx social-auth-app-django==3.1.0 @@ -327,15 +321,12 @@ wcwidth==0.1.8 web-fragments==0.3.1 webencodings==0.5.1 webob==1.8.5 -websocket-client==0.57.0 -werkzeug==0.16.0 wrapt==1.10.5 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.8#egg=xblock-drag-and-drop-v2==2.2.8 git+https://github.com/open-craft/xblock-poll@3c7dcaf6c933d914188f0740a60711603f948d26#egg=xblock-poll==1.9.1 xblock-utils==1.2.4 xblock==1.2.9 xmlsec==1.3.3 -xmltodict==0.12.0 xss-utils==0.1.2 zipp==1.0.0 diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 45fce7b6cb3..9d8afd6b6e3 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -22,7 +22,7 @@ pymongo==3.9.0 python-memcached==1.59 pyyaml==5.3 # via watchdog requests==2.22.0 -six==1.13.0 # via edx-opaque-keys, libsass, mock, paver, python-memcached, stevedore +six==1.14.0 # via edx-opaque-keys, libsass, mock, paver, python-memcached, stevedore stevedore==1.31.0 urllib3==1.25.7 # via requests watchdog==0.9.0 diff --git a/requirements/edx/pip-tools.txt b/requirements/edx/pip-tools.txt index 3744b16651f..ac0f961990f 100644 --- a/requirements/edx/pip-tools.txt +++ b/requirements/edx/pip-tools.txt @@ -6,4 +6,4 @@ # click==7.0 # via pip-tools pip-tools==4.3.0 -six==1.13.0 +six==1.14.0 diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in index 419461f20b2..82b5fb564a1 100644 --- a/requirements/edx/testing.in +++ b/requirements/edx/testing.in @@ -29,7 +29,6 @@ factory_boy==2.8.1 # Library for creating test fixtures, used in many tes freezegun==0.3.12 # Allows tests to mock the output of assorted datetime module functions httpretty # Library for mocking HTTP requests, used in many tests isort # For checking and fixing the order of imports -moto==1.3.1 # Lets tests mock AWS access via the boto library pycodestyle # Checker for compliance with the Python style guide (PEP 8) polib # Library for manipulating gettext translation files, used to test paver i18n commands pyquery # jQuery-like API for retrieving fragments of HTML and XML files in tests diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index bee679c609d..7f9a9ce71ac 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -28,7 +28,6 @@ appdirs==1.4.3 argh==0.26.2 astroid==1.5.3 # via pylint, pylint-celery attrs==19.3.0 -aws-xray-sdk==0.95 # via moto babel==2.8.0 beautifulsoup4==4.8.2 billiard==3.3.0.23 @@ -49,7 +48,6 @@ click==7.0 code-annotations==0.3.3 colorama==0.4.3 # via radon contextlib2==0.6.0.post1 -cookies==2.2.1 # via moto coreapi==2.3.3 coreschema==0.0.4 coverage==5.0.3 @@ -101,7 +99,6 @@ djangorestframework-jwt==1.11.0 git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1 djangorestframework-xml==1.4.0 djangorestframework==3.9.4 -docker==4.1.0 # via moto docopt==0.6.2 docutils==0.16 drf-yasg==1.16 @@ -114,7 +111,7 @@ edx-completion==3.0.2 edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.3 edx-django-sites-extensions==2.4.2 -edx-django-utils==2.0.2 +edx-django-utils==2.0.3 edx-drf-extensions==2.4.5 edx-enterprise==2.0.48 edx-i18n-tools==0.5.0 @@ -166,9 +163,8 @@ itypes==1.1.0 jinja2-pluralize==0.3.0 jinja2==2.10.3 jmespath==0.9.4 -jsondiff==1.1.1 +jsondiff==1.2.0 jsonfield==2.0.2 -jsonpickle==1.2 # via aws-xray-sdk kombu==3.0.37 laboratory==1.0.2 lazy-object-proxy==1.4.3 # via astroid @@ -190,7 +186,6 @@ mock==3.0.5 git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 mongoengine==0.10.0 more-itertools==8.1.0 -moto==1.3.1 mpmath==1.1.0 mysqlclient==1.4.6 newrelic==5.4.1.134 @@ -216,7 +211,6 @@ polib==1.1.0 psutil==1.2.1 py2neo==3.1.2 py==1.8.1 # via pytest, tox -pyaml==19.12.0 # via moto pycodestyle==2.5.0 pycontracts==1.7.1 pycountry==19.8.18 @@ -275,7 +269,7 @@ shapely==1.6.4.post2 shortuuid==0.5.0 simplejson==3.17.0 singledispatch==3.4.0.3 -six==1.13.0 +six==1.14.0 slumber==0.7.1 social-auth-app-django==3.1.0 social-auth-core==3.2.0 @@ -305,15 +299,12 @@ wcwidth==0.1.8 # via pytest web-fragments==0.3.1 webencodings==0.5.1 webob==1.8.5 -websocket-client==0.57.0 # via docker -werkzeug==0.16.0 # via moto wrapt==1.10.5 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.8#egg=xblock-drag-and-drop-v2==2.2.8 git+https://github.com/open-craft/xblock-poll@3c7dcaf6c933d914188f0740a60711603f948d26#egg=xblock-poll==1.9.1 xblock-utils==1.2.4 xblock==1.2.9 xmlsec==1.3.3 -xmltodict==0.12.0 # via moto xss-utils==0.1.2 zipp==1.0.0 -- GitLab