From a489b8cad583a526613265225711788e4b640bfb Mon Sep 17 00:00:00 2001 From: Greg Meyer Date: Wed, 12 Dec 2018 17:33:04 -0500 Subject: [PATCH 1/3] moves gearmand to python3 --- gearmand/datadog_checks/gearmand/gearmand.py | 11 ++++++++--- gearmand/requirements.in | 1 + gearmand/requirements.txt | 7 ++++++- gearmand/tox.ini | 4 +--- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/gearmand/datadog_checks/gearmand/gearmand.py b/gearmand/datadog_checks/gearmand/gearmand.py index b3c8745b41735..d79c8ef246df3 100644 --- a/gearmand/datadog_checks/gearmand/gearmand.py +++ b/gearmand/datadog_checks/gearmand/gearmand.py @@ -3,12 +3,17 @@ # All rights reserved # Licensed under Simplified BSD License (see LICENSE) -# 3rd party -import gearman +from six import PY2 -# project from datadog_checks.checks import AgentCheck +# Python 3 compatability is a different library +# It's a drop in replacement but has a different name +# This will enable the check to use the new library +if PY2: + import gearman +else: + import python3_gearman as gearman MAX_NUM_TASKS = 200 diff --git a/gearmand/requirements.in b/gearmand/requirements.in index f323667bf9bee..6070830a4ddb1 100644 --- a/gearmand/requirements.in +++ b/gearmand/requirements.in @@ -1 +1,2 @@ gearman==2.0.2; sys_platform != 'win32' and python_version < '3.0' +python3-gearman==0.1.0; sys_platform != 'win32' and python_version > '3.0' diff --git a/gearmand/requirements.txt b/gearmand/requirements.txt index e6d91ece25ce6..52336414c84df 100644 --- a/gearmand/requirements.txt +++ b/gearmand/requirements.txt @@ -4,5 +4,10 @@ # # pip-compile --generate-hashes --output-file requirements.txt requirements.in # -gearman==2.0.2 \ + +gearman==2.0.2 ; sys_platform != "win32" and python_version < "3.0" \ --hash=sha256:2b1876a60e32e24bed4c6d187898274de6409bbfa942bcbe3512efdf2aed0ec9 + +python3-gearman==0.1.0 ; sys_platform != "win32" and python_version > "3.0" \ + --hash=sha256:3ee44df221587c76ff13f0bebf4923b02b31b1b069ffda07416658be0614865c \ + --hash=sha256:4a5808d3a0bfc6c243548ad57e7aab4bee62c9cba2b1c3a860fdd292d46a112d diff --git a/gearmand/tox.ini b/gearmand/tox.ini index 7a0bd914e16bd..0b9cd442eaafd 100644 --- a/gearmand/tox.ini +++ b/gearmand/tox.ini @@ -2,7 +2,7 @@ minversion = 2.0 basepython = py27 envlist = - gearmand + {py27,py36}-gearmand flake8 [testenv] @@ -14,8 +14,6 @@ deps = passenv = COMPOSE* DOCKER* - -[testenv:gearmand] commands = pip install --require-hashes -r requirements.txt pytest -v From 87ee466e07af90962558f92dd3e35b47be1e5016 Mon Sep 17 00:00:00 2001 From: Greg Meyer Date: Wed, 12 Dec 2018 17:37:08 -0500 Subject: [PATCH 2/3] adds python3 to travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e370e7709d7b6..83b85ff3f4ca7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -119,7 +119,7 @@ jobs: - stage: test env: CHECK=fluentd - stage: test - env: CHECK=gearmand + env: CHECK=gearmand PYTHON3=true - stage: test env: CHECK=gitlab - stage: test From 569248b1512e3328443c4ed1165ceefdb098de5b Mon Sep 17 00:00:00 2001 From: Greg Meyer Date: Thu, 13 Dec 2018 12:14:44 -0500 Subject: [PATCH 3/3] bumps agent reqs file --- .../datadog_checks/base/data/agent_requirements.in | 1 + 1 file changed, 1 insertion(+) 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 aeca39b764fc3..5d6c9a1989e84 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -10,6 +10,7 @@ dnspython==1.12.0 enum34==1.1.6 flup==1.0.3.dev-20110405; python_version < '3.0' gearman==2.0.2; sys_platform != 'win32' and python_version < '3.0' +python3-gearman==0.1.0; sys_platform != 'win32' and python_version > '3.0' google-compute-engine==2.8.3 httplib2==0.10.3 ipaddress==1.0.22