From 59a17c599a6b6f2279a437f9a27b5bc11a079230 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Fri, 9 May 2025 12:30:45 +0000 Subject: [PATCH 1/4] Docs constraints new architecture --- otc_metadata/templates/tox.ini.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/otc_metadata/templates/tox.ini.j2 b/otc_metadata/templates/tox.ini.j2 index edfd5f1..f855ee9 100644 --- a/otc_metadata/templates/tox.ini.j2 +++ b/otc_metadata/templates/tox.ini.j2 @@ -28,7 +28,7 @@ commands = {posargs} [testenv:docs] deps = -r{toxinidir}/doc/requirements.txt - -c https://raw.githubusercontent.com/opentelekomcloud-docs/docs-constraints/main/constraints.txt + -c https://raw.githubusercontent.com/opentelekomcloud-docs/docs-constraints/main/constraints/{{otcdocs_cloud_environment}}/{{target_environment}}/constraints.txt allowlist_externals = mkdir cp -- 2.34.1 From 4079591fa96e1c1995e33f0ddf1a49f3f76ebf44 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Mon, 12 May 2025 10:22:29 +0000 Subject: [PATCH 2/4] fix glossary --- otc_metadata/data/repositories/gloss.yaml | 4 ++-- test.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 test.py diff --git a/otc_metadata/data/repositories/gloss.yaml b/otc_metadata/data/repositories/gloss.yaml index ee3e0d4..4a91476 100644 --- a/otc_metadata/data/repositories/gloss.yaml +++ b/otc_metadata/data/repositories/gloss.yaml @@ -5,9 +5,9 @@ repositories: repo: opentelekomcloud-docs/glossary type: github cloud_environments: - - + - eu_de - environment: internal repo: docs/glossary type: gitea cloud_environments: - - + - eu_de diff --git a/test.py b/test.py new file mode 100644 index 0000000..14d52d2 --- /dev/null +++ b/test.py @@ -0,0 +1,3 @@ +import otc_metadata + +print(otc_metadata.Services().services_by_category(category="application", environment="public", cloud_environment="swiss")) \ No newline at end of file -- 2.34.1 From 75bf927aa7e95e443822901456401eae1db3d6f1 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Mon, 12 May 2025 10:22:42 +0000 Subject: [PATCH 3/4] fix glossary --- test.py | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 test.py diff --git a/test.py b/test.py deleted file mode 100644 index 14d52d2..0000000 --- a/test.py +++ /dev/null @@ -1,3 +0,0 @@ -import otc_metadata - -print(otc_metadata.Services().services_by_category(category="application", environment="public", cloud_environment="swiss")) \ No newline at end of file -- 2.34.1 From a26c0b8c11ee4d894b162f2e4cb7e444458823a2 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Wed, 14 May 2025 07:20:23 +0000 Subject: [PATCH 4/4] fix pep8 --- otc_metadata/services.py | 13 ++++++------- tools/generate_doc_confpy.py | 4 ++-- tools/generate_docexports_data.py | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/otc_metadata/services.py b/otc_metadata/services.py index 2812ebc..6c6b07e 100644 --- a/otc_metadata/services.py +++ b/otc_metadata/services.py @@ -13,7 +13,6 @@ import copy import warnings -import json import otc_metadata.data @@ -76,7 +75,7 @@ class Services(object): def all_docs(self): "Service Docs data listing." return copy.deepcopy(self._service_data["documents"]) - + @property def all_repositories(self): "Service Repositories data listing." @@ -283,7 +282,7 @@ class Services(object): if not service: warnings.warn("No Service defition of type %s" % (cat)) continue - + for repositories in self.all_repositories: if repositories["service_type"] == service["service_type"]: res_doc = copy.deepcopy(doc) @@ -386,7 +385,7 @@ class Services(object): break break return res - + def get_service_with_repo_by_service_type(self, service_type): """Retrieve service with repos by service_type @@ -417,7 +416,7 @@ class Services(object): res[i]["repositories"] = repositories["repositories"] break return res - + def all_services_by_categories(self, cloud_environment, environments): """Retrieve all services sorted by categories """ @@ -440,7 +439,7 @@ class Services(object): for i, category in enumerate(res): if category["name"] == srv["service_category"]: res[i]["services"].append(srv) - + # Sort services for category in res: category["services"].sort(key=lambda x: x.get("service_title", "").lower()) @@ -448,4 +447,4 @@ class Services(object): # Sort categories res.sort(key=lambda x: x.get("name", "").lower()) - return res \ No newline at end of file + return res diff --git a/tools/generate_doc_confpy.py b/tools/generate_doc_confpy.py index f79b0d3..0904988 100644 --- a/tools/generate_doc_confpy.py +++ b/tools/generate_doc_confpy.py @@ -170,7 +170,7 @@ def process_repositories(args, service): if target_repo.get("type") != "github": context["git_type"] = target_repo["type"] if (args.target_environment == "public" - and args.cloud_environment == "swiss"): + and args.cloud_environment == "swiss"): context["html_options"] = dict( logo_url="https://docs.sc.otc.t-systems.com", ) @@ -183,7 +183,7 @@ def process_repositories(args, service): context["otcdocs_search_environment"] = "hc_de" context["otcdocs_search_index"] = "search_index_de" elif (args.target_environment == "internal" - and args.cloud_environment == "swiss"): + and args.cloud_environment == "swiss"): context["html_options"] = dict( disable_search=True, site_name="Internal Documentation Portal", diff --git a/tools/generate_docexports_data.py b/tools/generate_docexports_data.py index 265996b..5bc6273 100644 --- a/tools/generate_docexports_data.py +++ b/tools/generate_docexports_data.py @@ -24,7 +24,7 @@ def main(): data = otc_metadata.services.Services() data._sort_data() - docs = data.docs_html_by_category(environment="internal",cloud_environment=args.cloud_environment) + docs = data.docs_html_by_category(environment="internal", cloud_environment=args.cloud_environment) # Filter out documents with "disable_import": True for category, services in docs['categories'].items(): -- 2.34.1