From d0fbe9a83828b2ced0ae751df5edcd7895738439 Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Fri, 6 Jan 2023 14:31:14 +0100 Subject: [PATCH] Update tox template --- otc_metadata/templates/tox.ini.j2 | 12 +++++++++++- tools/generate_doc_confpy.py | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/otc_metadata/templates/tox.ini.j2 b/otc_metadata/templates/tox.ini.j2 index e909ce5a..191753a7 100644 --- a/otc_metadata/templates/tox.ini.j2 +++ b/otc_metadata/templates/tox.ini.j2 @@ -23,6 +23,10 @@ commands = {posargs} [testenv:docs] deps = -r{toxinidir}/doc/requirements.txt +allowlist_externals = + mkdir + cp + find commands = {%- for doc in docs %} {[testenv:{{ doc.type }}]commands} @@ -32,7 +36,11 @@ commands = [testenv:docs-pdf] deps = -r{toxinidir}/doc/requirements.txt allowlist_externals = + rm mkdir + make + bash + cp commands = mkdir -p doc/build/pdf {%- for doc in docs %} @@ -49,8 +57,10 @@ deps = -r{toxinidir}/doc/requirements.txt allowlist_externals = cp mkdir + find commands = sphinx-build -W --keep-going -b html {{ loc }}/source doc/build/html/{{ doc.type }} + find doc/build/html -type d -name '_sources' -exec rm -rf {:} ; {%- if doc.type == 'api-ref' %} mkdir -p api-ref/build/html cp -av doc/build/html/api-ref api-ref/build/html @@ -72,7 +82,7 @@ allowlist_externals = commands = sphinx-build -W --keep-going -b json {{ loc }}/source doc/build/json/{{ doc.type }} # Drop data useless for the search - find doc/build/json -type d -and ( -name '_images' -or -name '_static' -or -name '_sources' ) -exec rm {:} ; + find doc/build/json -type d -and ( -name '_images' -or -name '_static' -or -name '_sources' ) -exec rm -rf {:} ; {%- if doc.type == 'api-ref' %} mkdir -p api-ref/build/json cp -av doc/build/json/api-ref api-ref/build/json diff --git a/tools/generate_doc_confpy.py b/tools/generate_doc_confpy.py index 511e4750..58f657a1 100644 --- a/tools/generate_doc_confpy.py +++ b/tools/generate_doc_confpy.py @@ -201,7 +201,7 @@ def process_repositories(args, service): repo_to.git.push(*push_args) if "github" in url_to: subprocess.run( - args=["gh", "pr", "create", "-f"], cwd=copy_to, check=True + args=["gh", "pr", "create", "-f"], cwd=copy_to, check=False ) elif "gitea" in url_to and args.token: open_pr(