Skip to content

Fix docs for Ansible 2.3 #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 24, 2017
Merged

Fix docs for Ansible 2.3 #230

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3a2f4a
Preparing for v.1.4.1 release.
stacywsmith Apr 21, 2017
13150b3
Merge remote-tracking branch 'upstream/master'
stacywsmith Apr 24, 2017
7cc0ae8
Fix documentation build for Ansible >= 2.3
stacywsmith Apr 24, 2017
849aef0
Removing Ansible 1.9.6 from travis until tests can be updated.
stacywsmith Apr 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions docs/ansible2rst.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@
import sys
import datetime
import cgi
from distutils.version import LooseVersion
from jinja2 import Environment, FileSystemLoader

import ansible.utils
from ansible.utils import module_docs
from ansible import __version__ as ansible_version

#####################################################################################
# constants and paths
Expand Down Expand Up @@ -131,7 +132,10 @@ def jinja2_environment(template_dir, typ):
def process_module(fname, template, outputname):

print MODULEDIR + fname
doc, examples, returndocs = module_docs.get_docstring(MODULEDIR + fname)
if LooseVersion(ansible_version) >= LooseVersion('2.3.0'):
doc, examples, returndocs, _metadata = module_docs.get_docstring(MODULEDIR + fname)
else:
doc, examples, returndocs = module_docs.get_docstring(MODULEDIR + fname)

all_keys = []

Expand Down