From 1ac58f69245aa7752c87fd1e06179fc787a73ed7 Mon Sep 17 00:00:00 2001 From: Nicholas Muesch Date: Thu, 19 Jul 2018 22:01:10 -0400 Subject: [PATCH] Update req.in files with platform specific env markers (#1919) * Update requirement with env markers based on manifests --- datadog_checks_base/agent_requirements.in | 20 ++++++++++---------- gearmand/requirements.in | 2 +- kafka_consumer/requirements.in | 4 ++-- mcache/requirements.in | 2 +- sqlserver/requirements.in | 10 +++++----- supervisord/requirements.in | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/datadog_checks_base/agent_requirements.in b/datadog_checks_base/agent_requirements.in index 78fc9b55ba503..be455c959e5af 100644 --- a/datadog_checks_base/agent_requirements.in +++ b/datadog_checks_base/agent_requirements.in @@ -1,4 +1,4 @@ -adodbapi==2.6.0.7 +adodbapi==2.6.0.7; sys_platform == 'win32' asn1crypto==0.24.0 beautifulsoup4==4.5.1 boto==2.46.1 @@ -7,13 +7,13 @@ cryptography==2.2.2 cx_oracle==6.0.1 dnspython==1.12.0 enum34==1.1.6 -gearman==2.0.2 +gearman==2.0.2; sys_platform != 'win32' and python_version < '3.0' httplib2==0.10.3 ipaddress==1.0.22 jaydebeapi==1.1.1 jpype1==0.6.3 -kafka-python==1.4.3 -kazoo==2.4.0 +kafka-python==1.4.3; sys_platform != 'win32' +kazoo==2.4.0; sys_platform != 'win32' meld3==1.0.2 ntplib==0.3.3 paramiko==2.1.5 @@ -28,21 +28,21 @@ pycparser==2.18 pycryptodomex==3.4.7 pymongo==3.5.1 pymysql==0.8.0 -pyodbc==4.0.13 -pyro4==4.36 +pyodbc==4.0.13; sys_platform == 'win32' +pyro4==4.36; sys_platform == 'win32' pysmi==0.2.2 pysnmp==4.4.3 pysnmp-mibs==0.1.6 -python-binary-memcached==0.26.1 +python-binary-memcached==0.26.1; sys_platform != 'win32' pyvmomi==6.0.0 redis==2.10.5 requests==2.19.1 requests_ntlm==1.1.0 scandir==1.5 -serpent==1.23 +serpent==1.23; sys_platform == 'win32' simplejson==3.6.5 six==1.11.0 -supervisor==3.3.3 -testfixtures==4.14.3 +supervisor==3.3.3; python_version < '3.0' +testfixtures==4.14.3; sys_platform == 'win32' uptime==3.0.1 uuid==1.30 diff --git a/gearmand/requirements.in b/gearmand/requirements.in index eedc2c0889eba..f323667bf9bee 100644 --- a/gearmand/requirements.in +++ b/gearmand/requirements.in @@ -1 +1 @@ -gearman==2.0.2 +gearman==2.0.2; sys_platform != 'win32' and python_version < '3.0' diff --git a/kafka_consumer/requirements.in b/kafka_consumer/requirements.in index 7efc306f34a0d..1b04cea0135e6 100644 --- a/kafka_consumer/requirements.in +++ b/kafka_consumer/requirements.in @@ -1,2 +1,2 @@ -kafka-python==1.4.3 -kazoo==2.4.0 +kafka-python==1.4.3; sys_platform != 'win32' +kazoo==2.4.0; sys_platform != 'win32' diff --git a/mcache/requirements.in b/mcache/requirements.in index c87d8c3db7da5..233127d1c97a5 100644 --- a/mcache/requirements.in +++ b/mcache/requirements.in @@ -1 +1 @@ -python-binary-memcached==0.26.1 +python-binary-memcached==0.26.1; sys_platform != 'win32' diff --git a/sqlserver/requirements.in b/sqlserver/requirements.in index e7d368ec2d035..19c00981f0297 100644 --- a/sqlserver/requirements.in +++ b/sqlserver/requirements.in @@ -1,5 +1,5 @@ -adodbapi==2.6.0.7 -pyro4==4.36 -testfixtures==4.14.3 -serpent==1.23 -pyodbc==4.0.13 +adodbapi==2.6.0.7; sys_platform == 'win32' +pyro4==4.36; sys_platform == 'win32' +testfixtures==4.14.3; sys_platform == 'win32' +serpent==1.23; sys_platform == 'win32' +pyodbc==4.0.13; sys_platform == 'win32' diff --git a/supervisord/requirements.in b/supervisord/requirements.in index 7f2d87e36b2c3..30e22fd331a1e 100644 --- a/supervisord/requirements.in +++ b/supervisord/requirements.in @@ -1,2 +1,2 @@ -supervisor==3.3.3 +supervisor==3.3.3; python_version < '3.0' meld3==1.0.2