diff --git a/otc_metadata/templates/doc_requirements.txt.j2 b/otc_metadata/templates/doc_requirements.txt.j2 index 87daf92..0dd9e8f 100644 --- a/otc_metadata/templates/doc_requirements.txt.j2 +++ b/otc_metadata/templates/doc_requirements.txt.j2 @@ -4,4 +4,5 @@ otcdocstheme # Apache-2.0 reno>=3.1.0 # Apache-2.0 otc-sphinx-directives>=0.1.0 +sphinx-minify>=0.0.1 # Apache-2.0 git+https://gitea.eco.tsi-dev.otc-service.com/infra/otc-metadata-swiss.git#egg=otc_metadata diff --git a/otc_metadata/templates/tox.ini.j2 b/otc_metadata/templates/tox.ini.j2 index bfea2ac..7e2bb55 100644 --- a/otc_metadata/templates/tox.ini.j2 +++ b/otc_metadata/templates/tox.ini.j2 @@ -34,8 +34,9 @@ allowlist_externals = rm sphinx-build commands = - rm -rf doc/build/html doc/build/doctrees - sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html + rm -rf doc/build/html doc/build/html_temp doc/build/doctrees + sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html_temp + sphinx-minify --input-directory doc/build/html_temp/ --output-directory doc/build/html {%- for doc in docs %} {[testenv:{{ doc.type }}]commands} {[testenv:json-{{ doc.type }}]commands} @@ -66,16 +67,14 @@ allowlist_externals = cp mkdir commands = - sphinx-build -W --keep-going -b html {{ loc }}/source doc/build/html/{{ doc.type }} -{%- if doc.type == 'api-ref' %} - mkdir -p api-ref/build/html - cp -av doc/build/html/api-ref api-ref/build/html -{%- elif doc.type == 'umn' %} - mkdir -p umn/build/html - cp -av doc/build/html/umn umn/build/html -{%- elif doc.type == 'dev-guide' %} + 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) @@ -90,15 +89,12 @@ 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 == 'api-ref' %} - mkdir -p api-ref/build/json - cp -av doc/build/json/api-ref api-ref/build/json -{%- elif doc.type == 'umn' %} - mkdir -p umn/build/json - cp -av doc/build/json/umn umn/build/json -{%- elif 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 %} + mkdir -p {{ doc.type }}/build/json + cp -av doc/build/json/{{ doc.type }} {{ doc.type }}/build/json {%- endif %} {% if doc.pdf_name -%}