From 55af6e76c3c2258dca11141d49852745361a5855 Mon Sep 17 00:00:00 2001
From: Dan Callaghan <dcallagh@redhat.com>
Date: Wed, 22 Jun 2016 14:13:12 +1000
Subject: [PATCH] backport to ansible-lint 2.x
---
lib/ansiblereview/__init__.py | 5 ++++-
lib/ansiblereview/playbook.py | 2 +-
setup.py | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lib/ansiblereview/__init__.py b/lib/ansiblereview/__init__.py
index dbf8d54..fc1aa07 100644
--- a/lib/ansiblereview/__init__.py
+++ b/lib/ansiblereview/__init__.py
@@ -1,4 +1,4 @@
-from ansiblelint import default_rulesdir, RulesCollection
+from ansiblelint import RulesCollection
import codecs
from functools import partial
import re
@@ -10,6 +10,9 @@
except ImportError:
from ansible.utils import module_finder as module_loader
+import pkg_resources
+default_rulesdir = pkg_resources.resource_filename('ansiblelint', 'rules')
+
class AnsibleReviewFormatter(object):
diff --git a/lib/ansiblereview/playbook.py b/lib/ansiblereview/playbook.py
index facf011..3c0d003 100644
--- a/lib/ansiblereview/playbook.py
+++ b/lib/ansiblereview/playbook.py
@@ -42,7 +42,7 @@ def review(playbook, settings):
def repeated_names(playbook, settings):
with codecs.open(playbook['path'], mode='rb', encoding='utf-8') as f:
- yaml = ansiblelint.utils.parse_yaml_linenumbers(f, playbook['path'])
+ yaml = ansiblelint.utils.parse_yaml_linenumbers(f)
namelines = defaultdict(list)
errors = []
if yaml:
diff --git a/setup.py b/setup.py
index 43aa3c3..97e3815 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@
package_dir={'': 'lib'},
packages=find_packages('lib'),
zip_safe=False,
- install_requires=['ansible-lint>=3.0.0rc11', 'pyyaml', 'appdirs', 'unidiff'],
+ install_requires=['ansible-lint<3', 'pyyaml', 'appdirs', 'unidiff'],
scripts=['bin/ansible-review'],
classifiers=[
'License :: OSI Approved :: MIT License',
--
2.4.11