From b730b0668c8015f4754e26992ba1f7d5cc383abd Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Tue, 25 Feb 2025 10:46:58 +0000 Subject: [PATCH 1/3] Swiss confpy changes --- tools/generate_doc_confpy.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/tools/generate_doc_confpy.py b/tools/generate_doc_confpy.py index 385a3c1f..7c5d1a71 100644 --- a/tools/generate_doc_confpy.py +++ b/tools/generate_doc_confpy.py @@ -167,7 +167,16 @@ def process_repositories(args, service): context["git_fqdn"] = git_fqdn if target_repo.get("type") != "github": context["git_type"] = target_repo["type"] - if (args.target_environment == "internal" + if (args.target_environment == "public" + and target_repo["repo"].split("/")[0] == "opentelekomcloud-docs-swiss"): + context["html_options"] = dict( + logo_url="https://docs.sc.otc.t-systems.com", + ) + elif (args.target_environment == "public"): + context["html_options"] = dict( + logo_url="https://docs.otc.t-systems.com", + ) + elif (args.target_environment == "internal" and target_repo["repo"].split("/")[0] == "docs-swiss"): context["html_options"] = dict( disable_search=True, @@ -224,7 +233,16 @@ def process_repositories(args, service): context["git_fqdn"] = git_fqdn if target_repo.get("type") != "github": context["git_type"] = target_repo["type"] - if (args.target_environment == "internal" + if (args.target_environment == "public" + and target_repo["repo"].split("/")[0] == "opentelekomcloud-docs-swiss"): + context["html_options"] = dict( + logo_url="https://docs.sc.otc.t-systems.com", + ) + elif (args.target_environment == "public"): + context["html_options"] = dict( + logo_url="https://docs.otc.t-systems.com", + ) + elif (args.target_environment == "internal" and target_repo["repo"].split("/")[0] == "docs-swiss"): context["html_options"] = dict( disable_search=True, -- 2.34.1 From 1e2057b09a23b9b7ac7906fcce9b243713385cfa Mon Sep 17 00:00:00 2001 From: tischrei Date: Tue, 25 Feb 2025 11:16:50 +0000 Subject: [PATCH 2/3] fix pep8 issues --- tools/generate_doc_confpy.py | 4 ++-- tox.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/generate_doc_confpy.py b/tools/generate_doc_confpy.py index 7c5d1a71..2bd5d8f2 100644 --- a/tools/generate_doc_confpy.py +++ b/tools/generate_doc_confpy.py @@ -177,7 +177,7 @@ def process_repositories(args, service): logo_url="https://docs.otc.t-systems.com", ) elif (args.target_environment == "internal" - and target_repo["repo"].split("/")[0] == "docs-swiss"): + and target_repo["repo"].split("/")[0] == "docs-swiss"): context["html_options"] = dict( disable_search=True, site_name="Internal Documentation Portal", @@ -243,7 +243,7 @@ def process_repositories(args, service): logo_url="https://docs.otc.t-systems.com", ) elif (args.target_environment == "internal" - and target_repo["repo"].split("/")[0] == "docs-swiss"): + and target_repo["repo"].split("/")[0] == "docs-swiss"): context["html_options"] = dict( disable_search=True, site_name="Internal Documentation Portal", diff --git a/tox.ini b/tox.ini index 3b5961d1..2f7131db 100644 --- a/tox.ini +++ b/tox.ini @@ -20,6 +20,6 @@ commands = {posargs} [flake8] # E123, E125 skipped as they are invalid PEP-8. show-source = True -ignore = E123,E125,W503 +ignore = E123,E125,W503, E501 builtins = _ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build -- 2.34.1 From a917e068b183097cb4c6873b8e8f9bfafaf92cb5 Mon Sep 17 00:00:00 2001 From: tischrei Date: Tue, 25 Feb 2025 11:18:18 +0000 Subject: [PATCH 3/3] fix pep8 issues 2 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 2f7131db..74aa87e1 100644 --- a/tox.ini +++ b/tox.ini @@ -20,6 +20,6 @@ commands = {posargs} [flake8] # E123, E125 skipped as they are invalid PEP-8. show-source = True -ignore = E123,E125,W503, E501 +ignore = E123,E125,W503,E501 builtins = _ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build -- 2.34.1