From 0c1c98a5a77ff05abb05b47c02d54ac0c36fdb52 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Mon, 13 Nov 2023 08:59:08 +0000 Subject: [PATCH 1/3] Fix for dev_guide --- otc_metadata/templates/tox.ini.j2 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/otc_metadata/templates/tox.ini.j2 b/otc_metadata/templates/tox.ini.j2 index bf20f477..30988aa4 100644 --- a/otc_metadata/templates/tox.ini.j2 +++ b/otc_metadata/templates/tox.ini.j2 @@ -69,8 +69,13 @@ allowlist_externals = commands = sphinx-build -W --keep-going -b html {{ loc }}/source doc/build/html_temp/{{ doc.type }} sphinx-minify --input-directory doc/build/html_temp/{{ doc.type }} --output-directory doc/build/html/{{ doc.type }} +{%- if doc.type == 'dev-guide' %} + mkdir -p dev_guide/build/html + cp -av doc/build/html/dev-guide dev_guide/build/html +{%- else %} mkdir -p {{ doc.type }}/build/html cp -av doc/build/html/{{ doc.type }} {{ doc.type }}/build/html +{%- endif %} # Json version (for search) [testenv:json-{{ doc.type }}] @@ -84,8 +89,13 @@ commands = # Drop data useless for the search - wrap it also with sh/xargs due to bugs # in tox sh -c "find doc/build/json -type d -and '(' -name '_images' -or -name '_static' -or -name '_sources' ')' -print0 | xargs -0 rm -rf" +{%- if doc.type == 'dev-guide' %} + mkdir -p dev_guide/build/json + cp -av doc/build/json/dev-guide dev_guide/build/json +{%- else %} mkdir -p {{ doc.type }}/build/json cp -av doc/build/json/{{ doc.type }} {{ doc.type }}/build/json +{%- endif %} {% if doc.pdf_name -%} # PDF version -- 2.34.1 From 51954e7257893e1fe81133daa16a3dad869f0335 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Mon, 13 Nov 2023 11:00:25 +0000 Subject: [PATCH 2/3] Removed empty space --- otc_metadata/templates/tox.ini.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/otc_metadata/templates/tox.ini.j2 b/otc_metadata/templates/tox.ini.j2 index 30988aa4..8f60a5d8 100644 --- a/otc_metadata/templates/tox.ini.j2 +++ b/otc_metadata/templates/tox.ini.j2 @@ -69,10 +69,10 @@ allowlist_externals = commands = sphinx-build -W --keep-going -b html {{ loc }}/source doc/build/html_temp/{{ doc.type }} sphinx-minify --input-directory doc/build/html_temp/{{ doc.type }} --output-directory doc/build/html/{{ doc.type }} -{%- if doc.type == 'dev-guide' %} +{%- if doc.type == 'dev-guide' %} mkdir -p dev_guide/build/html cp -av doc/build/html/dev-guide dev_guide/build/html -{%- else %} +{%- else %} mkdir -p {{ doc.type }}/build/html cp -av doc/build/html/{{ doc.type }} {{ doc.type }}/build/html {%- endif %} @@ -89,10 +89,10 @@ commands = # Drop data useless for the search - wrap it also with sh/xargs due to bugs # in tox sh -c "find doc/build/json -type d -and '(' -name '_images' -or -name '_static' -or -name '_sources' ')' -print0 | xargs -0 rm -rf" -{%- if doc.type == 'dev-guide' %} +{%- if doc.type == 'dev-guide' %} mkdir -p dev_guide/build/json cp -av doc/build/json/dev-guide dev_guide/build/json -{%- else %} +{%- else %} mkdir -p {{ doc.type }}/build/json cp -av doc/build/json/{{ doc.type }} {{ doc.type }}/build/json {%- endif %} -- 2.34.1 From 6a891d48eee5125d24cf39942ef13495522e8ee4 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Mon, 13 Nov 2023 13:02:13 +0000 Subject: [PATCH 3/3] Less spaces --- otc_metadata/templates/tox.ini.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/otc_metadata/templates/tox.ini.j2 b/otc_metadata/templates/tox.ini.j2 index 8f60a5d8..2bf9af6a 100644 --- a/otc_metadata/templates/tox.ini.j2 +++ b/otc_metadata/templates/tox.ini.j2 @@ -70,7 +70,7 @@ commands = sphinx-build -W --keep-going -b html {{ loc }}/source doc/build/html_temp/{{ doc.type }} sphinx-minify --input-directory doc/build/html_temp/{{ doc.type }} --output-directory doc/build/html/{{ doc.type }} {%- if doc.type == 'dev-guide' %} - mkdir -p dev_guide/build/html + mkdir -p dev_guide/build/html cp -av doc/build/html/dev-guide dev_guide/build/html {%- else %} mkdir -p {{ doc.type }}/build/html @@ -90,7 +90,7 @@ commands = # in tox sh -c "find doc/build/json -type d -and '(' -name '_images' -or -name '_static' -or -name '_sources' ')' -print0 | xargs -0 rm -rf" {%- if doc.type == 'dev-guide' %} - mkdir -p dev_guide/build/json + mkdir -p dev_guide/build/json cp -av doc/build/json/dev-guide dev_guide/build/json {%- else %} mkdir -p {{ doc.type }}/build/json -- 2.34.1