From e5022ba87b6c45488b7d4e140df7f098495dba67 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Mon, 11 May 2015 13:25:50 -0700
Subject: [PATCH] Add python >= 2.6 to documented deps
---
clustering/consul.py | 1 +
clustering/consul_acl.py | 1 +
clustering/consul_kv.py | 1 +
clustering/consul_session.py | 1 +
monitoring/zabbix_group.py | 4 +++-
monitoring/zabbix_host.py | 3 ++-
monitoring/zabbix_hostmacro.py | 3 ++-
monitoring/zabbix_maintenance.py | 3 ++-
monitoring/zabbix_screen.py | 3 ++-
packaging/language/maven_artifact.py | 4 ++--
packaging/os/layman.py | 3 +++
11 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/clustering/consul.py b/clustering/consul.py
index 5db79e20c40..27761094698 100644
--- a/clustering/consul.py
+++ b/clustering/consul.py
@@ -38,6 +38,7 @@ description:
changed occurred. An api method is planned to supply this metadata so at that
stage change management will be added.
requirements:
+ - "python >= 2.6"
- python-consul
- requests
version_added: "1.9"
diff --git a/clustering/consul_acl.py b/clustering/consul_acl.py
index c481b780a64..57ff795931f 100644
--- a/clustering/consul_acl.py
+++ b/clustering/consul_acl.py
@@ -25,6 +25,7 @@ description:
rules in a consul cluster via the agent. For more details on using and
configuring ACLs, see https://www.consul.io/docs/internals/acl.html.
requirements:
+ - "python >= 2.6"
- python-consul
- pyhcl
- requests
diff --git a/clustering/consul_kv.py b/clustering/consul_kv.py
index e5a010a8c18..02d06868946 100644
--- a/clustering/consul_kv.py
+++ b/clustering/consul_kv.py
@@ -28,6 +28,7 @@ description:
represents a prefix then Note that when a value is removed, the existing
value if any is returned as part of the results.
requirements:
+ - "python >= 2.6"
- python-consul
- requests
version_added: "1.9"
diff --git a/clustering/consul_session.py b/clustering/consul_session.py
index 8e6516891d2..6f3a611a642 100644
--- a/clustering/consul_session.py
+++ b/clustering/consul_session.py
@@ -26,6 +26,7 @@ description:
to implement distributed locks. In depth documentation for working with
sessions can be found here http://www.consul.io/docs/internals/sessions.html
requirements:
+ - "python >= 2.6"
- python-consul
- requests
version_added: "1.9"
diff --git a/monitoring/zabbix_group.py b/monitoring/zabbix_group.py
index 489a8617f54..d338267e370 100644
--- a/monitoring/zabbix_group.py
+++ b/monitoring/zabbix_group.py
@@ -26,7 +26,9 @@ short_description: Add or remove a host group to Zabbix.
description:
- This module uses the Zabbix API to add and remove host groups.
version_added: '1.8'
-requirements: [ 'zabbix-api' ]
+requirements:
+ - "python >= 2.6"
+ - zabbix-api
options:
state:
description:
diff --git a/monitoring/zabbix_host.py b/monitoring/zabbix_host.py
index c7b8e52b9e7..5798e663355 100644
--- a/monitoring/zabbix_host.py
+++ b/monitoring/zabbix_host.py
@@ -28,7 +28,8 @@ description:
version_added: "2.0"
author: Tony Minfei Ding, Harrison Gu
requirements:
- - zabbix-api python module
+ - "python >= 2.6"
+ - zabbix-api
options:
server_url:
description:
diff --git a/monitoring/zabbix_hostmacro.py b/monitoring/zabbix_hostmacro.py
index b41e114d760..7869d55c315 100644
--- a/monitoring/zabbix_hostmacro.py
+++ b/monitoring/zabbix_hostmacro.py
@@ -28,7 +28,8 @@ description:
version_added: "2.0"
author: Dean Hailin Song
requirements:
- - zabbix-api python module
+ - "python >= 2.6"
+ - zabbix-api
options:
server_url:
description:
diff --git a/monitoring/zabbix_maintenance.py b/monitoring/zabbix_maintenance.py
index 559f9e0e55a..f59149fd07a 100644
--- a/monitoring/zabbix_maintenance.py
+++ b/monitoring/zabbix_maintenance.py
@@ -28,7 +28,8 @@ description:
version_added: "1.8"
author: Alexander Bulimov
requirements:
- - zabbix-api python module
+ - "python >= 2.6"
+ - zabbix-api
options:
state:
description:
diff --git a/monitoring/zabbix_screen.py b/monitoring/zabbix_screen.py
index ada2b1c6ab0..aa895af0bbd 100644
--- a/monitoring/zabbix_screen.py
+++ b/monitoring/zabbix_screen.py
@@ -29,7 +29,8 @@ description:
version_added: "2.0"
author: Tony Minfei Ding, Harrison Gu
requirements:
- - zabbix-api python module
+ - "python >= 2.6"
+ - zabbix-api
options:
server_url:
description:
diff --git a/packaging/language/maven_artifact.py b/packaging/language/maven_artifact.py
index 2aeb158625b..f5d8f185a55 100644
--- a/packaging/language/maven_artifact.py
+++ b/packaging/language/maven_artifact.py
@@ -39,8 +39,8 @@ description:
- available.
author: Chris Schmidt <chris.schmidt () contrastsecurity.com>
requirements:
- - python libxml
- - python urllib2
+ - "python >= 2.6"
+ - lxml
options:
group_id:
description: The Maven groupId coordinate
diff --git a/packaging/os/layman.py b/packaging/os/layman.py
index 57c03528c9e..b4830f8ec2c 100644
--- a/packaging/os/layman.py
+++ b/packaging/os/layman.py
@@ -31,6 +31,9 @@ short_description: Manage Gentoo overlays
description:
- Uses Layman to manage an additional repositories for the Portage package manager on Gentoo Linux.
Please note that Layman must be installed on a managed node prior using this module.
+requirements:
+ - "python >= 2.6"
+ - layman python module
options:
name:
description: