From f65995ac0d0a79799e43140186fef0fcb291a17e Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Fri, 25 Jan 2019 02:32:04 -0500 Subject: [PATCH] Properly sync dependencies --- .travis.yml | 2 + .../base/data/agent_requirements.in | 3 +- riakcs/requirements.in | 4 +- riakcs/requirements.txt | 59 ------------------- riakcs/tox.ini | 8 +-- 5 files changed, 8 insertions(+), 68 deletions(-) delete mode 100644 riakcs/requirements.txt diff --git a/.travis.yml b/.travis.yml index 561bb97b95490..ea74c49d84156 100644 --- 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 index f767941c7aefd..7fdd508e15ad9 100644 --- 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 index 0f56edf9bcef8..951fdd53f4226 100644 --- 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 deleted file mode 100644 index 6e79e733c7405..0000000000000 --- a/riakcs/requirements.txt +++ /dev/null @@ -1,59 +0,0 @@ -# -# This file is autogenerated by pip-compile -# To update, run: -# -# pip-compile --generate-hashes --output-file requirements.txt requirements.in -# -boto==2.46.1; python_version < '3.0' \ - --hash=sha256:d24a68d97276445d1b5baee6537bc565ab7070afcd449a72f2541b1da1328ed4 \ - --hash=sha256:d6c7046a1a199fad87ae95edeecb8e5a900b70c854199d3949d1dbb9f3385fcb \ - # via google-compute-engine -distro==1.3.0; python_version < '3.0' \ - --hash=sha256:224041cef9600e72d19ae41ba006e71c05c4dc802516da715d7fda55ba3d8742 \ - --hash=sha256:6ec8e539cf412830e5ccf521aecf879f2c7fcf60ce446e33cd16eef1ed8a0158 \ - # via google-compute-engine -google-compute-engine==2.8.3; python_version < '3.0' \ - --hash=sha256:14947a0cfc20e1d64d1184bbd137b9f3b66d7c94efcbe1b73e21c090e7002af4 - -boto3==1.9.67; python_version > '3.0' \ - --hash=sha256:a2f8c0cbb63abd5f1908f9b95a00916eba45144b13871c6b6cbd0ed365277077 \ - --hash=sha256:c5d14d88c220c71490687905bd192c452e1131b4519bf0cf8a0c552cf1d40015 -boto==2.46.1; python_version > '3.0' \ - --hash=sha256:d24a68d97276445d1b5baee6537bc565ab7070afcd449a72f2541b1da1328ed4 \ - --hash=sha256:d6c7046a1a199fad87ae95edeecb8e5a900b70c854199d3949d1dbb9f3385fcb \ - # via google-compute-engine -botocore==1.12.67; python_version > '3.0' \ - --hash=sha256:033efb6ea10d06404431f5f5fe86ecb3bccb17458960740da661b981f09359c7 \ - --hash=sha256:4a091f5296da00e4e552637101d5fa4f4c87fa888ee88e99e09127fe15176aec \ - # via boto3, s3transfer -distro==1.3.0; python_version > '3.0' \ - --hash=sha256:224041cef9600e72d19ae41ba006e71c05c4dc802516da715d7fda55ba3d8742 \ - --hash=sha256:6ec8e539cf412830e5ccf521aecf879f2c7fcf60ce446e33cd16eef1ed8a0158 \ - # via google-compute-engine -docutils==0.14; python_version > '3.0' \ - --hash=sha256:02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6 \ - --hash=sha256:51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274 \ - --hash=sha256:7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6 \ - # via botocore -google-compute-engine==2.8.3; python_version > '3.0' \ - --hash=sha256:14947a0cfc20e1d64d1184bbd137b9f3b66d7c94efcbe1b73e21c090e7002af4 -jmespath==0.9.3; python_version > '3.0' \ - --hash=sha256:6a81d4c9aa62caf061cb517b4d9ad1dd300374cd4706997aff9cd6aedd61fc64 \ - --hash=sha256:f11b4461f425740a1d908e9a3f7365c3d2e569f6ca68a2ff8bc5bcd9676edd63 \ - # via boto3, botocore -python-dateutil==2.7.5; python_version > '3.0' \ - --hash=sha256:063df5763652e21de43de7d9e00ccf239f953a832941e37be541614732cdfc93 \ - --hash=sha256:88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02 \ - # via botocore -s3transfer==0.1.13; python_version > '3.0' \ - --hash=sha256:90dc18e028989c609146e241ea153250be451e05ecc0c2832565231dacdf59c1 \ - --hash=sha256:c7a9ec356982d5e9ab2d4b46391a7d6a950e2b04c472419f5fdec70cc0ada72f \ - # via boto3 -six==1.12.0; python_version > '3.0' \ - --hash=sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c \ - --hash=sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73 \ - # via python-dateutil -urllib3==1.24.1; python_version > '3.0' \ - --hash=sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39 \ - --hash=sha256:de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22 \ - # via botocore diff --git a/riakcs/tox.ini b/riakcs/tox.ini index e6586bde66d7e..d0498bf999d14 100644 --- 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