Merge pull request #719 from efiop/master

Misc build fixes
iterative · May 17, 2018 · 91c16e2 · 91c16e2
2 parents 03d4774 + 7709f57
commit 91c16e2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/dvc/cloud/aws.py b/dvc/cloud/aws.py
@@ -3,7 +3,6 @@
 import threading
 
 import boto3
-import botocore
 
 from dvc.config import Config
 from dvc.logger import Logger
@@ -118,7 +117,7 @@ def _get_key(self, path):
         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):

diff --git 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
@@ -18,6 +18,7 @@
     "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",