diff --git a/action/config_template.py b/action/config_template.py index c7fcfc1..95aa27b 100644 --- a/action/config_template.py +++ b/action/config_template.py @@ -16,13 +16,11 @@ # along with Ansible. If not, see . from __future__ import (absolute_import, division, print_function) -__metaclass__ = type try: import ConfigParser except ImportError: import configparser as ConfigParser - import datetime try: from StringIO import StringIO @@ -35,14 +33,14 @@ import re import time import yaml import tempfile as tmpfilelib - - from ansible.plugins.action import ActionBase from ansible.module_utils._text import to_bytes, to_text from ansible import constants as C from ansible import errors from ansible.parsing.yaml.dumper import AnsibleDumper +__metaclass__ = type + CONFIG_TYPES = { 'ini': 'return_config_overrides_ini', @@ -427,7 +425,8 @@ class ActionModule(ActionBase): new_items=value, list_extend=list_extend ) - elif not isinstance(value, int) and (',' in value or '\n' in value): + elif (not isinstance(value, int) and + (',' in value or '\n' in value)): base_items[key] = re.split(',|\n', value) base_items[key] = [i.strip() for i in base_items[key] if i] elif isinstance(value, list): diff --git a/doc/requirements.txt b/doc/requirements.txt new file mode 100644 index 0000000..b3abbc3 --- /dev/null +++ b/doc/requirements.txt @@ -0,0 +1,10 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. + +# this is required for the docs build jobs +sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +openstackdocstheme>=1.18.1 # Apache-2.0 +reno>=2.5.0 # Apache-2.0 +sphinxmark>=0.1.14 # Apache-2.0 +doc8>=0.6.0 # Apache-2.0 diff --git a/doc/source/conf.py b/doc/source/conf.py index 96aa85b..5bf55cc 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -52,7 +52,7 @@ master_doc = 'index' author = 'OpenStack-Ansible Contributors' category = 'Miscellaneous' copyright = '2014-2018, OpenStack-Ansible Contributors' -description = 'Config Template allow flexible .yaml, .ini, .json modifications.' +description = 'Config Template allow flexible .yaml, .ini, .json modification.' project = 'Config Template' target_name = 'ansible-config_template' title = 'Config Template Documentation' diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index a47399f..5386645 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -221,7 +221,8 @@ latex_elements = { # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('index', 'OpenStackAnsibleReleaseNotes.tex', u'OpenStack-Ansible Release Notes Documentation', + ('index', 'OpenStackAnsibleReleaseNotes.tex', + u'OpenStack-Ansible Release Notes Documentation', u'OpenStack-Ansible Developers', 'manual'), ] @@ -251,7 +252,8 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'openstackansiblereleasenotes', u'OpenStack-Ansible Release Notes Documentation', + ('index', 'openstackansiblereleasenotes', + u'OpenStack-Ansible Release Notes Documentation', [u'OpenStack-Ansible Developers'], 1) ] @@ -265,7 +267,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'OpenStackAnsibleReleaseNotes', u'OpenStack-Ansible Release Notes Documentation', + ('index', 'OpenStackAnsibleReleaseNotes', + u'OpenStack-Ansible Release Notes Documentation', u'OpenStack-Ansible Developers', 'OpenStackAnsibleReleaseNotes', 'One line description of project.', 'Miscellaneous'), diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 02ebc74..71f7357 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -6,8 +6,3 @@ :maxdepth: 1 unreleased - queens - pike - ocata - newton - mitaka diff --git a/releasenotes/source/mitaka.rst b/releasenotes/source/mitaka.rst deleted file mode 100644 index 0dc585c..0000000 --- a/releasenotes/source/mitaka.rst +++ /dev/null @@ -1,6 +0,0 @@ -============================= - Mitaka Series Release Notes -============================= - -.. release-notes:: - :branch: origin/stable/mitaka diff --git a/releasenotes/source/newton.rst b/releasenotes/source/newton.rst deleted file mode 100644 index 97036ed..0000000 --- a/releasenotes/source/newton.rst +++ /dev/null @@ -1,6 +0,0 @@ -=================================== - Newton Series Release Notes -=================================== - -.. release-notes:: - :branch: origin/stable/newton diff --git a/releasenotes/source/ocata.rst b/releasenotes/source/ocata.rst deleted file mode 100644 index ebe62f4..0000000 --- a/releasenotes/source/ocata.rst +++ /dev/null @@ -1,6 +0,0 @@ -=================================== - Ocata Series Release Notes -=================================== - -.. release-notes:: - :branch: origin/stable/ocata diff --git a/releasenotes/source/pike.rst b/releasenotes/source/pike.rst deleted file mode 100644 index e43bfc0..0000000 --- a/releasenotes/source/pike.rst +++ /dev/null @@ -1,6 +0,0 @@ -=================================== - Pike Series Release Notes -=================================== - -.. release-notes:: - :branch: stable/pike diff --git a/releasenotes/source/queens.rst b/releasenotes/source/queens.rst deleted file mode 100644 index 36ac616..0000000 --- a/releasenotes/source/queens.rst +++ /dev/null @@ -1,6 +0,0 @@ -=================================== - Queens Series Release Notes -=================================== - -.. release-notes:: - :branch: stable/queens diff --git a/tox.ini b/tox.ini index 263e9a5..da8fe2f 100644 --- a/tox.ini +++ b/tox.ini @@ -37,10 +37,11 @@ setenv = [testenv:docs] +deps = -r{toxinidir}/doc/requirements.txt commands= bash -c "rm -rf doc/build" doc8 doc - python setup.py build_sphinx + sphinx-build -b html doc/source doc/build/html [doc8] @@ -49,6 +50,7 @@ extensions = .rst [testenv:releasenotes] +deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 131e7c1..dce8eb8 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -15,7 +15,7 @@ - project: check: jobs: - #- openstack-ansible-linters + - openstack-ansible-linters - openstack-ansible-functional-centos-7 - openstack-ansible-functional-opensuse-423 - openstack-ansible-functional-ubuntu-xenial @@ -25,7 +25,7 @@ - openstack-ansible-integrated-deploy-aio gate: jobs: - #- openstack-ansible-linters + - openstack-ansible-linters - openstack-ansible-functional-centos-7 - openstack-ansible-functional-opensuse-423 - openstack-ansible-functional-ubuntu-xenial