py2docfx 0.1.10.dev1870743__py3-none-any.whl → 0.1.10.dev1871013__py3-none-any.whl

py2docfx/__main__.py

@@ -245,6 +245,7 @@ async def donwload_package_generate_documents(
     
     start_num = len(required_package_list)
     env_prepare_tasks = []
+    env_remove_tasks = []
 
     for idx in range(min([py2docfxEnvironment.VENV_BUFFER, len(package_info_list)])):
         env_prepare_tasks.append(asyncio.create_task(
@@ -308,12 +309,21 @@ async def donwload_package_generate_documents(
                         ado_token)
                 )
             )
+        if idx >= 1:
+            env_remove_tasks.append(asyncio.create_task(py2docfxEnvironment.remove_environment(idx-1)))
+        if idx > py2docfxEnvironment.VENV_BUFFER and env_remove_tasks[idx-py2docfxEnvironment.VENV_BUFFER] != None:
+            print(f"Removing venv {idx-py2docfxEnvironment.VENV_BUFFER}")
+            await env_remove_tasks[idx-py2docfxEnvironment.VENV_BUFFER]
     
     if output_doc_folder:
         start_time = time.time()
         move_root_toc_to_target(YAML_OUTPUT_ROOT, output_doc_folder)
         end_time = time.time()
         print(f"<move_root_toc_to_target>{end_time-start_time}<move_root_toc_to_target/>")
+    
+    for idx in range(len(env_remove_tasks)):
+        if env_remove_tasks[idx] != None and not env_remove_tasks[idx].done():
+            await env_remove_tasks[idx]
 
 def prepare_out_dir(output_root: str | os.PathLike) -> os.PathLike | None:
     # prepare output_root\DOC_FOLDER_NAME (if folder contains files, raise exception)
@@ -343,6 +353,8 @@ def main(argv) -> int:
         shutil.rmtree("source_repo")
     if os.path.exists("target_repo"):
         shutil.rmtree("target_repo")
+
+    # TODO: may need to purge pip cache
     (package_info_list, required_package_list, github_token, ado_token, output_root, \
           venv_required) = parse_command_line_args(argv)
     venv_required = False

py2docfx/convert_prepare/environment.py

@@ -1,6 +1,7 @@
 import subprocess
 import asyncio
 import os
+import shutil
 from py2docfx import PACKAGE_ROOT
 from py2docfx.convert_prepare.package_info import PackageInfo
 from py2docfx.convert_prepare.get_source import get_source
@@ -9,8 +10,15 @@ from py2docfx.convert_prepare import pip_utils
 REQUIREMENT_MODULES = ["setuptools", "sphinx==6.1.3", "pyyaml", "jinja2==3.0.3", "wheel"]
 VENV_DIR = "venv"
 VENV_BUFFER = 10
+VENV_DELETE_BUFFER = 10
 PIP_INSTALL_COMMAND = ["-m", "pip", "install", "--upgrade"]
 
+PIP_INSTALL_VENV_COMMON_OPTIONS = [
+    "--quiet",
+    "--no-warn-conflicts",
+    "--disable-pip-version-check",
+]
+
 def install_converter_requirements(executable: str):
     """
     Install setuptools/sphinx/pyyaml/jinja2
@@ -40,7 +48,7 @@ def get_venv_exe(venv_num: int) -> str:
     return os.path.join(get_venv_path(venv_num), "Scripts", "python.exe")
 
 async def install_converter_requirement_async(executable: str):
-    pip_cmd = PIP_INSTALL_COMMAND + REQUIREMENT_MODULES
+    pip_cmd = PIP_INSTALL_COMMAND + PIP_INSTALL_VENV_COMMON_OPTIONS + REQUIREMENT_MODULES
     await(await asyncio.create_subprocess_exec(executable, *pip_cmd)).wait()
 
 async def install_required_packages(
@@ -50,7 +58,7 @@ async def install_required_packages(
         # if package.install_type == package.InstallType.SOURCE_CODE:
         #     get_source(package, idx, vststoken=ado_token, githubtoken=github_token)
         package_name, options = package.get_install_command()
-        pip_cmd = PIP_INSTALL_COMMAND + pip_utils.pip_install_common_options + options + [package_name]
+        pip_cmd = PIP_INSTALL_COMMAND + PIP_INSTALL_VENV_COMMON_OPTIONS + options + [package_name]
         await(await asyncio.create_subprocess_exec(executable, *pip_cmd)).wait()
 
 async def create_environment(venv_num: int):
@@ -63,4 +71,13 @@ async def prepare_venv(venv_num: int, required_package_list: list[PackageInfo],
     await install_converter_requirement_async(get_venv_exe(venv_num))
     print(f"<CI INFO>: Installing required packages in venv{venv_num}...")
     await install_required_packages(get_venv_exe(venv_num), required_package_list, github_token, ado_token)
-    print(f"<CI INFO>: venv{venv_num} setup complete.")
+    print(f"<CI INFO>: venv{venv_num} setup complete.")
+
+async def remove_environment(venv_num: int):
+    venv_path = get_venv_path(venv_num)
+    if os.path.exists(venv_path):
+        print(f"<CI INFO>: Removing venv{venv_num}...")
+        return asyncio.to_thread(shutil.rmtree, venv_path)
+
+# Example usage
+# asyncio.run(remove_environment(1))

{py2docfx-0.1.10.dev1870743.dist-info → py2docfx-0.1.10.dev1871013.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2docfx
-Version: 0.1.10.dev1870743
+Version: 0.1.10.dev1871013
 Summary: A package built based on Sphinx which download source code package and generate yaml files supported by docfx.
 Author: Microsoft Corporation
 License: MIT License

{py2docfx-0.1.10.dev1870743.dist-info → py2docfx-0.1.10.dev1871013.dist-info}/RECORD

@@ -1,7 +1,7 @@
 py2docfx/__init__.py,sha256=kPRhPGPC1JknDotkksG428c1iIgfFr_4_7Jm-llrowY,72
-py2docfx/__main__.py,sha256=wxlErNKLRQGZJAsEwe4JaJTRE48aWRTdJMsOrm5eda8,15084
+py2docfx/__main__.py,sha256=Nq5DzPY8RZNuUqUUTW6rF_k_75LNrGG39lX4injCWrY,15719
 py2docfx/convert_prepare/__init__.py,sha256=XxtxrP0kmW3ZBHIAoxsPDEHzcgeC0WSnole8Lk6CjKs,11
-py2docfx/convert_prepare/environment.py,sha256=ohq072McKtmpRwgzPycocz_PYOyqVMiSC1--N8GEtkE,3167
+py2docfx/convert_prepare/environment.py,sha256=_gGbLRnuOnL8vsU-b7jZITqIN9CUeSXNFB8_xKWtKjk,3656
 py2docfx/convert_prepare/generate_conf.py,sha256=wqs6iyElzJarH-20_qEL9zvZvt5xfBMsGXSXPSZy6wg,2295
 py2docfx/convert_prepare/generate_document.py,sha256=cLfFr7od0RHADkXyh2gaPreXZGvKNBUlduBosYTuPbk,3118
 py2docfx/convert_prepare/get_source.py,sha256=eEIbfLkGdBSOIJElMBTiXkKlkujb_hdFu5g6InNroTg,5851
@@ -1882,7 +1882,7 @@ py2docfx/venv/venv0/Scripts/rst2s5.py,sha256=lnv7lRNv1Oz3gjI5BOJlTqfCJQLJxgwJ9l3
 py2docfx/venv/venv0/Scripts/rst2xetex.py,sha256=5_9VjwA5RKUMJG9L__1ZiS8DIeLHRdPWeWW7B4otM8M,909
 py2docfx/venv/venv0/Scripts/rst2xml.py,sha256=hU2nzGVbXbQBnH_ydI5f2VDkGQyDMUdTgz3rfa45JMg,638
 py2docfx/venv/venv0/Scripts/rstpep2html.py,sha256=uLmCJKfEKPeeWS0n76HharN9YEYIuCRQQXfPPBJaRso,706
-py2docfx-0.1.10.dev1870743.dist-info/METADATA,sha256=f1EhLfHJgC_UWDu-Msa0wdWIvAbqsQrRXL5PQ-9zLH8,601
-py2docfx-0.1.10.dev1870743.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-py2docfx-0.1.10.dev1870743.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
-py2docfx-0.1.10.dev1870743.dist-info/RECORD,,
+py2docfx-0.1.10.dev1871013.dist-info/METADATA,sha256=tnMc1MCAhdOQTwQam94xJuJfhlBL1Elbd28qOYpzGFI,601
+py2docfx-0.1.10.dev1871013.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+py2docfx-0.1.10.dev1871013.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
+py2docfx-0.1.10.dev1871013.dist-info/RECORD,,