From 62c43f6c4f2c94dd0ff63f4537506002b29ad577 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Thu, 17 May 2018 18:21:59 +0300 Subject: [PATCH 1/2] aws: remove unneeded botocore dependency Signed-off-by: Ruslan Kuprieiev --- dvc/cloud/aws.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dvc/cloud/aws.py b/dvc/cloud/aws.py index b2d942524..8dd1b2d4a 100644 --- a/dvc/cloud/aws.py +++ b/dvc/cloud/aws.py @@ -3,7 +3,6 @@ import math import threading import boto3 -import botocore from dvc.config import Config from dvc.logger import Logger @@ -118,7 +117,7 @@ class DataCloudAWS(DataCloudBase): try: self.s3.Object(self.storage_bucket, key_name).get() return AWSKey(self.storage_bucket, key_name) - except botocore.errorfactory.ClientError: + except Exception: return None def _new_key(self, path): From 7709f57f0b5d8e3554cf4110df55aef2da09a6cc Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Thu, 17 May 2018 18:30:15 +0300 Subject: [PATCH 2/2] reqs: add pytest(required by setuptools on some systems) Signed-off-by: Ruslan Kuprieiev --- requirements.txt | 1 + setup.py | 1 + 2 files changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index 8a13e1a22..04cd94023 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,6 +12,7 @@ pyyaml>=3.12 gitpython>=2.1.8 ntfsutils>=0.1.4 setuptools>=34.0.0 +pytest>=3.3.1 nanotime>=0.5.2 pyasn1>=0.4.1 schema>=0.6.7 diff --git a/setup.py b/setup.py index 118f0d910..77b683deb 100644 --- a/setup.py +++ b/setup.py @@ -18,6 +18,7 @@ install_requires = [ "gitpython>=2.1.8", "ntfsutils>=0.1.4", "setuptools>=34.0.0", + "pytest>=3.3.1", "nanotime>=0.5.2", "pyasn1>=0.4.1", "schema>=0.6.7",