From 8ff2e5a22b7bba56c95f1cc587ecdb4e98a7dc68 Mon Sep 17 00:00:00 2001 From: sinwar Date: Wed, 21 Jun 2017 00:19:51 +0530 Subject: [PATCH] requirements: Upgrade moto to latest version. Fixes #5454 --- requirements/moto.txt | 5 ++++- zerver/tests/test_upload.py | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/requirements/moto.txt b/requirements/moto.txt index 66c57b2520..74f7792da1 100644 --- a/requirements/moto.txt +++ b/requirements/moto.txt @@ -4,6 +4,9 @@ Werkzeug==0.12.2 click==6.7 httpretty==0.8.10 itsdangerous==0.24 -moto==0.4.31 +moto==1.0.1 xmltodict==0.11.0 python-dateutil==2.6.0 +cookies==2.2.1 +PyYAML==3.12 +botocore==1.5.72 diff --git a/zerver/tests/test_upload.py b/zerver/tests/test_upload.py index 8b00219f40..558ed2c2c8 100644 --- a/zerver/tests/test_upload.py +++ b/zerver/tests/test_upload.py @@ -44,7 +44,7 @@ import base64 from datetime import timedelta from django.utils.timezone import now as timezone_now -from moto import mock_s3 +from moto import mock_s3_deprecated from typing import Any, Callable, TypeVar, Text @@ -972,7 +972,7 @@ FuncT = TypeVar('FuncT', bound=Callable[..., None]) def use_s3_backend(method): # type: (FuncT) -> FuncT - @mock_s3 + @mock_s3_deprecated @override_settings(LOCAL_UPLOADS_DIR=None) def new_method(*args, **kwargs): # type: (*Any, **Any) -> Any