Properly sync dependencies

DataDog · Jan 25, 2019 · 3ae95d8 · 3ae95d8
1 parent 0622cd5
commit 3ae95d8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 66 deletions.
diff --git a/riakcs/datadog_checks/riakcs/riakcs.py b/riakcs/datadog_checks/riakcs/riakcs.py
@@ -8,9 +8,13 @@
 from copy import deepcopy
 
 # 3rd party
-from boto.s3.connection import S3Connection
 import simplejson as json
-from six import iteritems
+from six import PY3, iteritems
+
+if PY3:
+    from boto3.s3.connection import S3Connection
+else:
+    from boto.s3.connection import S3Connection
 
 # project
 from datadog_checks.checks import AgentCheck

diff --git a/riakcs/requirements.in b/riakcs/requirements.in
@@ -1,3 +1,3 @@
 boto==2.46.1; python_version < '3.0'
-# boto3==1.9.67; python_version > '3.0'
+boto3==1.9.67; python_version > '3.0'
 google-compute-engine==2.8.3
diff --git a/riakcs/requirements.txt b/riakcs/requirements.txt
diff --git a/riakcs/tox.ini b/riakcs/tox.ini
@@ -2,18 +2,17 @@
 minversion = 2.0
 basepython = py27
 envlist =
-  {py27,py36}-unit
+  py{27,36}-unit
   flake8
 
 [testenv]
 usedevelop = true
 platform = linux|darwin|win32
 deps =
     -e../datadog_checks_base[deps]
-    -rrequirements.in
     -rrequirements-dev.txt
 commands =
-    pip install --require-hashes -r requirements.txt
+    pip install -r requirements.in
     pytest -v
 
 [testenv:flake8]
@@ -22,5 +21,5 @@ deps = flake8
 commands = flake8 .
 
 [flake8]
-exclude = .eggs,.tox
+exclude = .eggs,.tox,build
 max-line-length = 120