From b0df4311481e2275a89d5c2774ff3d7e35e515f5 Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Tue, 12 Jul 2016 20:00:33 +0200 Subject: [PATCH] Fully support the DebOps fold format for yaml+rst files. Uses: https://github.com/htgoebel/yaml2rst/pull/6 Related to: https://github.com/debops/docs/issues/156 --- docs/conf.py | 1 + docs/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 2728f16..8d8dcce 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -24,6 +24,7 @@ 'ansible/roles/' + element + '/defaults/main.yml', 'ansible/roles/' + element + '/docs/defaults.rst', strip_regex=r'\s*(:?\[{3}|\]{3})\d?$', + yaml_strip_regex=r'^\s{66,67}#\s\]{3}\d?$', ) # If extensions (or modules to document with autodoc) are in another directory, diff --git a/docs/requirements.txt b/docs/requirements.txt index e6e7c52..012d350 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,4 +2,4 @@ sphinx==1.3.4 ## TODO: Install unreleased develop version until htgoebel makes a release. # yaml2rst -https://github.com/ypid/yaml2rst/archive/feature/expose-strip_regex.zip +https://github.com/ypid/yaml2rst/archive/feature/yaml-fold-strip.zip