From 29461694c38935444482aee55fcfe6ba8f59085a Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Fri, 7 Feb 2025 14:32:51 +0000 Subject: [PATCH] Update tox.ini && conf.py file Reviewed-by: tischrei Co-authored-by: Sebastian Gode Co-committed-by: Sebastian Gode --- tox.ini | 15 +++++++++------ zuul.yaml | 7 ++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tox.ini b/tox.ini index 3bafcee..4d0ccb3 100644 --- a/tox.ini +++ b/tox.ini @@ -44,6 +44,7 @@ commands = {[testenv:api-ref]commands} {[testenv:json-api-ref]commands} + [testenv:pdf-docs] deps = {[testenv:docs]deps} @@ -57,6 +58,7 @@ allowlist_externals = cp commands = mkdir -p doc/build/pdf + mkdir -p doc/build/html {[testenv:bindeps]commands} mkdir -p {toxinidir}/_templates wget -O {toxinidir}/_templates/longtable.tex.jinja https://gitea.eco.tsi-dev.otc-service.com/infra/docs-templates/raw/branch/main/templates/longtable.tex.jinja @@ -66,6 +68,7 @@ commands = {[testenv:api-ref-pdf-docs]commands} + # HTML version [testenv:umn] deps = {[testenv:docs]deps} @@ -106,12 +109,12 @@ commands = rm -rf umn/build/pdf cp -r {toxinidir}/_templates umn/source/_templates/ sphinx-build -W --keep-going -b latex umn/source umn/build/pdf/ - bash -c "for f in umn/build/pdf/*.gif; do convert $f $\{f/%gif/png\}; done || true" + bash -c "for f in umn/build/pdf/*.gif; do convert $f[0] $\{f/%gif/png\}; done || true" bash -c "for f in umn/build/pdf/*.tex; do sed -iorig 's/\.gif//g' $f; done" - make -C umn/build/pdf + make -C umn/build/pdf LATEXMKOPTS="-interaction=nonstopmode" mkdir -p doc/build/pdf cp umn/build/pdf/ccn-umn.pdf doc/build/pdf/ - + cp umn/build/pdf/ccn-umn.pdf doc/build/html/ # HTML version [testenv:api-ref] @@ -153,12 +156,12 @@ commands = rm -rf api-ref/build/pdf cp -r {toxinidir}/_templates api-ref/source/_templates/ sphinx-build -W --keep-going -b latex api-ref/source api-ref/build/pdf/ - bash -c "for f in api-ref/build/pdf/*.gif; do convert $f $\{f/%gif/png\}; done || true" + bash -c "for f in api-ref/build/pdf/*.gif; do convert $f[0] $\{f/%gif/png\}; done || true" bash -c "for f in api-ref/build/pdf/*.tex; do sed -iorig 's/\.gif//g' $f; done" - make -C api-ref/build/pdf + make -C api-ref/build/pdf LATEXMKOPTS="-interaction=nonstopmode" mkdir -p doc/build/pdf cp api-ref/build/pdf/ccn-api-ref.pdf doc/build/pdf/ - + cp api-ref/build/pdf/ccn-api-ref.pdf doc/build/html/ [testenv:bindeps] diff --git a/zuul.yaml b/zuul.yaml index e5d7b03..2ea77e6 100644 --- a/zuul.yaml +++ b/zuul.yaml @@ -1,3 +1,4 @@ +--- - project: merge-mode: squash-merge default-branch: main @@ -5,11 +6,11 @@ - helpcenter-base-jobs vars: sphinx_pdf_files: - - deh-api-ref.pdf - - deh-umn.pdf + - ccn-umn.pdf + - ccn-api-ref.pdf check: jobs: - noop gate: jobs: - - noop + - noop \ No newline at end of file