Properly sync dependencies (#3033)

DataDog · Jan 28, 2019 · bc81fbb · bc81fbb
1 parent 4519fd9
commit bc81fbb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 68 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,6 +24,8 @@ env:
     # if the c include path doesn't have the proper path pymqi will not compile
     - C_INCLUDE_PATH="/opt/mqm/inc:$C_INCLUDE_PATH"
     - LD_LIBRARY_PATH="/opt/mqm/lib64:/opt/mqm/lib:$LD_LIBRARY_PATH"
+    # https://github.com/travis-ci/travis-ci/issues/7940
+    - BOTO_CONFIG=/dev/null
 
 stages:
   - name: test_changed

diff --git a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in
@@ -1,8 +1,7 @@
 adodbapi==2.6.0.7; sys_platform == 'win32'
 asn1crypto==0.24.0
 beautifulsoup4==4.5.1
-boto==2.46.1; python_version < '3.0'
-boto3==1.9.67; python_version > '3.0'
+boto==2.46.1
 cffi==1.11.5
 cryptography==2.3.1
 cx_oracle==6.0.1

diff --git a/riakcs/requirements.in b/riakcs/requirements.in
@@ -1,3 +1 @@
-boto==2.46.1; python_version < '3.0'
-# boto3==1.9.67; python_version > '3.0'
-google-compute-engine==2.8.3
+boto==2.46.1
diff --git a/riakcs/requirements.txt b/riakcs/requirements.txt
diff --git a/riakcs/tox.ini b/riakcs/tox.ini
@@ -2,18 +2,18 @@
 minversion = 2.0
 basepython = py27
 envlist =
-  {py27,py36}-unit
+  py{27,36}-unit
   flake8
 
 [testenv]
 usedevelop = true
 platform = linux|darwin|win32
+passenv = BOTO_CONFIG
 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 +22,5 @@ deps = flake8
 commands = flake8 .
 
 [flake8]
-exclude = .eggs,.tox
+exclude = .eggs,.tox,build
 max-line-length = 120