From 3b68cebc317ec1a3a99b6febc68d97ca6f60aa5d Mon Sep 17 00:00:00 2001 From: "Hasko, Vladimir" Date: Wed, 9 Aug 2023 09:29:54 +0000 Subject: [PATCH 1/4] adding global constraints --- otc_metadata/templates/tox.ini.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/otc_metadata/templates/tox.ini.j2 b/otc_metadata/templates/tox.ini.j2 index e6ecf9d4..87092f31 100644 --- a/otc_metadata/templates/tox.ini.j2 +++ b/otc_metadata/templates/tox.ini.j2 @@ -24,7 +24,9 @@ commands = {posargs} # This env is invoked in the periodic pipeline and is therefore responsible to # build all relevant docs at once. [testenv:docs] -deps = -r{toxinidir}/doc/requirements.txt +deps = + -r{toxinidir}/doc/requirements.txt + -c https://raw.githubusercontent.com/opentelekomcloud-docs-swiss/docs-constraints/main/constraints.txt allowlist_externals = mkdir cp @@ -59,7 +61,6 @@ commands = {% set loc = doc.rst_location | replace('/source', '') %} # HTML version [testenv:{{ doc.type }}] -deps = -r{toxinidir}/doc/requirements.txt allowlist_externals = cp mkdir @@ -78,7 +79,6 @@ commands = # Json version (for search) [testenv:json-{{ doc.type }}] -deps = -r{toxinidir}/doc/requirements.txt allowlist_externals = cp mkdir -- 2.34.1 From 566bc95021c9b9aa9a376337fb43ca8e835ea05f Mon Sep 17 00:00:00 2001 From: "Hasko, Vladimir" Date: Wed, 9 Aug 2023 09:55:06 +0000 Subject: [PATCH 2/4] Update 'otc_metadata/templates/tox.ini.j2' --- otc_metadata/templates/tox.ini.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/otc_metadata/templates/tox.ini.j2 b/otc_metadata/templates/tox.ini.j2 index 87092f31..babd9243 100644 --- a/otc_metadata/templates/tox.ini.j2 +++ b/otc_metadata/templates/tox.ini.j2 @@ -61,6 +61,7 @@ commands = {% set loc = doc.rst_location | replace('/source', '') %} # HTML version [testenv:{{ doc.type }}] +deps = {[testenv:docs]deps} allowlist_externals = cp mkdir @@ -79,6 +80,7 @@ commands = # Json version (for search) [testenv:json-{{ doc.type }}] +deps = {[testenv:docs]deps} allowlist_externals = cp mkdir -- 2.34.1 From 047028505ec923cfcf53875d27646e0291635a32 Mon Sep 17 00:00:00 2001 From: "Hasko, Vladimir" Date: Wed, 9 Aug 2023 10:00:40 +0000 Subject: [PATCH 3/4] Update 'otc_metadata/templates/tox.ini.j2' --- otc_metadata/templates/tox.ini.j2 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/otc_metadata/templates/tox.ini.j2 b/otc_metadata/templates/tox.ini.j2 index babd9243..8e7a437a 100644 --- a/otc_metadata/templates/tox.ini.j2 +++ b/otc_metadata/templates/tox.ini.j2 @@ -42,7 +42,8 @@ commands = {%- endfor %} [testenv:docs-pdf] -deps = -r{toxinidir}/doc/requirements.txt +deps = {[testenv:docs]deps} + allowlist_externals = rm mkdir @@ -104,7 +105,8 @@ commands = {% if doc.pdf_name -%} # PDF version [testenv:{{ doc.type }}-pdf-docs] -deps = -r{toxinidir}/doc/requirements.txt +deps = {[testenv:docs]deps} + allowlist_externals = rm mkdir -- 2.34.1 From 50af2e52e746e5f379e94cb4a63b2a1d141a73cc Mon Sep 17 00:00:00 2001 From: "Hasko, Vladimir" Date: Wed, 9 Aug 2023 10:09:48 +0000 Subject: [PATCH 4/4] Update 'otc_metadata/templates/tox.ini.j2' --- otc_metadata/templates/tox.ini.j2 | 2 -- 1 file changed, 2 deletions(-) diff --git a/otc_metadata/templates/tox.ini.j2 b/otc_metadata/templates/tox.ini.j2 index 8e7a437a..bfea2ac9 100644 --- a/otc_metadata/templates/tox.ini.j2 +++ b/otc_metadata/templates/tox.ini.j2 @@ -43,7 +43,6 @@ commands = [testenv:docs-pdf] deps = {[testenv:docs]deps} - allowlist_externals = rm mkdir @@ -106,7 +105,6 @@ commands = # PDF version [testenv:{{ doc.type }}-pdf-docs] deps = {[testenv:docs]deps} - allowlist_externals = rm mkdir -- 2.34.1