Merge pull request #719 from efiop/master

Misc build fixes

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):

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

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",