summaryrefslogtreecommitdiff
path: root/lib/ansible/modules/packaging/language
diff options
context:
space:
mode:
authorMatt Martz <matt@sivel.net>2017-02-02 13:45:22 -0600
committerMatt Clay <matt@mystile.com>2017-02-02 11:45:22 -0800
commit829c0b8f6284ec37e36f1454d7d3640415239cb2 (patch)
tree16e03a45026881df4c30c0a8a18e1451dbfd601e /lib/ansible/modules/packaging/language
parent1718719d779038751b96ffc7300efe6e5c9cee37 (diff)
downloadansible-829c0b8f6284ec37e36f1454d7d3640415239cb2.tar.gz
Update validate-modules (#20932)
* Update validate-modules * Validates ANSIBLE_METADATA * Ensures imports happen after documentation vars * Some pep8 cleanup * Clean up some left over unneeded code * Update modules for new module guidelines and validate-modules checks * Update imports for ec2_vpc_route_table and ec2_vpc_nat_gateway
Diffstat (limited to 'lib/ansible/modules/packaging/language')
-rw-r--r--lib/ansible/modules/packaging/language/easy_install.py6
-rw-r--r--lib/ansible/modules/packaging/language/maven_artifact.py31
2 files changed, 18 insertions, 19 deletions
diff --git a/lib/ansible/modules/packaging/language/easy_install.py b/lib/ansible/modules/packaging/language/easy_install.py
index e84ed37fe1..1f633c6b9d 100644
--- a/lib/ansible/modules/packaging/language/easy_install.py
+++ b/lib/ansible/modules/packaging/language/easy_install.py
@@ -19,9 +19,6 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
#
-import tempfile
-import os.path
-
ANSIBLE_METADATA = {'status': ['preview'],
'supported_by': 'community',
'version': '1.0'}
@@ -104,6 +101,9 @@ EXAMPLES = '''
virtualenv: /webapps/myapp/venv
'''
+import tempfile
+import os.path
+
def _is_package_installed(module, name, easy_install, executable_arguments):
executable_arguments = executable_arguments + ['--dry-run']
cmd = '%s %s %s' % (easy_install, ' '.join(executable_arguments), name)
diff --git a/lib/ansible/modules/packaging/language/maven_artifact.py b/lib/ansible/modules/packaging/language/maven_artifact.py
index 727c171117..09e891af55 100644
--- a/lib/ansible/modules/packaging/language/maven_artifact.py
+++ b/lib/ansible/modules/packaging/language/maven_artifact.py
@@ -19,22 +19,6 @@
# You should have received a copy of the GNU General Public License
# along with this software. If not, see <http://www.gnu.org/licenses/>.
-__author__ = 'cschmidt'
-
-from lxml import etree
-import os
-import hashlib
-import sys
-import posixpath
-import urlparse
-from ansible.module_utils.basic import *
-from ansible.module_utils.urls import *
-try:
- import boto3
- HAS_BOTO = True
-except ImportError:
- HAS_BOTO = False
-
ANSIBLE_METADATA = {'status': ['preview'],
'supported_by': 'community',
'version': '1.0'}
@@ -153,6 +137,21 @@ EXAMPLES = '''
dest: /var/lib/tomcat7/webapps/web-app.war
'''
+from lxml import etree
+import os
+import hashlib
+import sys
+import posixpath
+import urlparse
+from ansible.module_utils.basic import *
+from ansible.module_utils.urls import *
+try:
+ import boto3
+ HAS_BOTO = True
+except ImportError:
+ HAS_BOTO = False
+
+
class Artifact(object):
def __init__(self, group_id, artifact_id, version, classifier=None, extension='jar'):
if not group_id: