From 74132f8ed94518d57cb52d1a1c0e1de81d40d7bc Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Tue, 30 Jul 2019 11:19:04 -0400 Subject: [PATCH] Update moto to support python3. We had to pin json diff because of how we pull prod requirements into testing.txt --- requirements/constraints.txt | 9 +++++++++ requirements/edx/testing.in | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 88113b8a85..aa4e47c571 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -78,3 +78,12 @@ faulthandler; python_version == "2.7" # Numpy 1.17.0 only supports python >= 3.5 numpy<1.17.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 diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in index 742525f6ad..197c8abaca 100644 --- a/requirements/edx/testing.in +++ b/requirements/edx/testing.in @@ -30,7 +30,7 @@ factory_boy==2.8.1 # Library for creating test fixtures, used in many tes freezegun # 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==0.3.1 # Lets tests mock AWS access via the boto library +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