From 77e3c21d77f8a9bb87bcd557a218cba2a51b6128 Mon Sep 17 00:00:00 2001 From: Loup-Garou911XD Date: Thu, 7 Mar 2024 12:37:41 +0530 Subject: [PATCH] modified: Makefile modified: src/assets/sphinx/template/conf.py modified: tools/batools/docs.py --- Makefile | 2 +- src/assets/sphinx/template/conf.py | 3 ++- tools/batools/docs.py | 8 +++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 83274d9d..8c7f6ea0 100644 --- a/Makefile +++ b/Makefile @@ -185,7 +185,7 @@ docs-pdoc: @$(PCOMMAND) gen_docs_pdoc docs-sphinx: - $(MAKE) dummymodules +# $(MAKE) dummymodules @$(PCOMMAND) gen_docs_sphinx pcommandbatch_speed_test: prereqs diff --git a/src/assets/sphinx/template/conf.py b/src/assets/sphinx/template/conf.py index 9599dcf2..6b947ba2 100644 --- a/src/assets/sphinx/template/conf.py +++ b/src/assets/sphinx/template/conf.py @@ -12,7 +12,8 @@ # import os import sys -sys.path.insert(0, os.path.abspath(os.getenv('BALLISTICA_ROOT')+'/src/assets/sphinx/.modules/')) + +sys.path.insert(0, os.path.abspath('..')) # -- Options for HTML output ------------------------------------------------- diff --git a/tools/batools/docs.py b/tools/batools/docs.py index 287645ff..b2062425 100755 --- a/tools/batools/docs.py +++ b/tools/batools/docs.py @@ -213,7 +213,7 @@ def _run_pdoc() -> None: duration = time.monotonic() - starttime print(f'{Clr.GRN}Generated pdoc documentation in {duration:.1f}s.{Clr.RST}') -def generate_sphinxdoc(): +def generate_sphinxdoc() -> None: _run_sphinx() def _run_sphinx() -> None: @@ -245,9 +245,7 @@ def _run_sphinx() -> None: shutil.copytree(assets_dirs['bacommon_package'], temp_modules_dir + 'bacommon/', dirs_exist_ok=True) shutil.copytree(template_dir, sphinx_apidoc_out, dirs_exist_ok= True) - - os.environ['BALLISTICA_ROOT'] = os.getcwd() - + starttime = time.monotonic() subprocess.run(['sphinx-apidoc', @@ -264,6 +262,6 @@ def _run_sphinx() -> None: subprocess.run( ['make', 'html'], check = True, cwd= sphinx_apidoc_out) shutil.copytree(sphinx_apidoc_out + '_build/html/', build_dir, dirs_exist_ok=True) - shutil.rmtree(temp_modules_dir) + # shutil.rmtree(temp_modules_dir) duration = time.monotonic() - starttime print(f'Generated sphinx documentation in {duration:.1f}s.')