py2docfx 0.1.10.dev1871193__py3-none-any.whl → 0.1.10.dev1871308__py3-none-any.whl

py2docfx/__main__.py

@@ -247,10 +247,13 @@ async def donwload_package_generate_documents(
     env_prepare_tasks = []
     env_remove_tasks = []
 
+    start_time = time.time()
     for idx in range(min([py2docfxEnvironment.VENV_BUFFER, len(package_info_list)])):
         env_prepare_tasks.append(asyncio.create_task(
             py2docfxEnvironment.prepare_venv(idx, required_package_list, github_token, ado_token)))
-    
+    end_time = time.time()
+    print(f"<warmup_venvs>{end_time-start_time}<warmup_venvs/>")
+
     for idx, package in enumerate(package_info_list):
         package_number = start_num + idx
         print(f"Processing package {package.name}, env_prepare_tasks: {len(env_prepare_tasks)}")
@@ -261,7 +264,7 @@ async def donwload_package_generate_documents(
             print(f"Failed to setup venv for package {package.name}: {e}")
             raise
         end_time = time.time()
-        print(f"<wait_prepare_venv>{end_time-start_time}<wait_prepare_venv/>")
+        print(f"<wait_prepare_venv>{package.name},{end_time-start_time}<wait_prepare_venv/>")
 
         start_time = time.time()
         get_source(py2docfxEnvironment.get_venv_exe(idx), package, package_number, vststoken=ado_token, githubtoken=github_token)
@@ -298,6 +301,7 @@ async def donwload_package_generate_documents(
             end_time = time.time()
             print(f"<move_document_to_target>{package.name},{end_time-start_time}<move_document_to_target/>")
         
+        start_time = time.time()
         if idx + py2docfxEnvironment.VENV_BUFFER < len(package_info_list):
             print(f"Creating venv {idx + py2docfxEnvironment.VENV_BUFFER}")
             env_prepare_tasks.append(
@@ -309,12 +313,20 @@ async def donwload_package_generate_documents(
                         ado_token)
                 )
             )
+        end_time = time.time()
+        print(f"<create_prepare_venv>{package.name},{end_time-start_time}<create_prepare_venv/>")
         if idx >= 1:
+            start_time = time.time()
             env_remove_tasks.append(asyncio.create_task(
-                asyncio.to_thread(py2docfxEnvironment.remove_environment,idx-1)))
+                py2docfxEnvironment.remove_environment(idx-1)))
+            end_time = time.time()
+            print(f"<create_remove_venv>{package.name},{end_time-start_time}<create_remove_venv/>")
         if idx > py2docfxEnvironment.VENV_BUFFER and env_remove_tasks[idx-py2docfxEnvironment.VENV_BUFFER] != None:
+            start_time = time.time()
             print(f"Removing venv {idx-py2docfxEnvironment.VENV_BUFFER}")
             await env_remove_tasks[idx-py2docfxEnvironment.VENV_BUFFER]
+            end_time = time.time()
+            print(f"<wait_remove_venv>{package.name},{end_time-start_time}<wait_remove_venv/>")
     
     if output_doc_folder:
         start_time = time.time()
@@ -322,9 +334,12 @@ async def donwload_package_generate_documents(
         end_time = time.time()
         print(f"<move_root_toc_to_target>{end_time-start_time}<move_root_toc_to_target/>")
     
+    start_time = time.time()
     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]
+    end_time = time.time()
+    print(f"<wait_remove_venv>{end_time-start_time}<wait_remove_venv/>")
 
 def prepare_out_dir(output_root: str | os.PathLike) -> os.PathLike | None:
     # prepare output_root\DOC_FOLDER_NAME (if folder contains files, raise exception)

py2docfx/convert_prepare/environment.py

@@ -73,11 +73,18 @@ async def prepare_venv(venv_num: int, required_package_list: list[PackageInfo],
     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.")
 
-def remove_environment(venv_num: int):
+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}...")
-        shutil.rmtree(venv_path)
-
-# Example usage
-# asyncio.run(remove_environment(1))
+        # Create a subprocess to run the shell command for removing the directory
+        process = await asyncio.create_subprocess_shell(
+            f'rm -rf {venv_path}' if os.name != 'nt' else f'rmdir /S /Q {venv_path}',
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE
+        )
+        stdout, stderr = await process.communicate()
+        if process.returncode == 0:
+            print(f"<CI INFO>: venv{venv_num} removed.")
+        else:
+            print(f"<CI ERROR>: Failed to remove venv{venv_num}. Error: {stderr.decode()}")

{py2docfx-0.1.10.dev1871193.dist-info → py2docfx-0.1.10.dev1871308.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2docfx
-Version: 0.1.10.dev1871193
+Version: 0.1.10.dev1871308
 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.dev1871193.dist-info → py2docfx-0.1.10.dev1871308.dist-info}/RECORD

@@ -1,7 +1,7 @@
 py2docfx/__init__.py,sha256=kPRhPGPC1JknDotkksG428c1iIgfFr_4_7Jm-llrowY,72
-py2docfx/__main__.py,sha256=NeNJ-Vu1C16P9vTYhp1TcujtK52QQRPsjnnV0nBKnss,15794
+py2docfx/__main__.py,sha256=3vyfQ8XV8TtKPCb7C7A0d-VnzKXb58zfHOz806lUBa0,16554
 py2docfx/convert_prepare/__init__.py,sha256=XxtxrP0kmW3ZBHIAoxsPDEHzcgeC0WSnole8Lk6CjKs,11
-py2docfx/convert_prepare/environment.py,sha256=ihivOlbJ_AipP2OrgrvYcaE3EBYg4yqqsS4LzFl54m0,3624
+py2docfx/convert_prepare/environment.py,sha256=DzmHS4dfOcOvkWroYXk3o4EHmeZIW1g7QVe1LRTDQSI,4126
 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=hvWR_yPlfliLI9wywtnimKpjhJkx-LUYD6adGHgYTFA,5899
@@ -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.dev1871193.dist-info/METADATA,sha256=z9gHaJOpywGaoBDTaHhjL33nrLivlXQilUFNMiy30KU,601
-py2docfx-0.1.10.dev1871193.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-py2docfx-0.1.10.dev1871193.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
-py2docfx-0.1.10.dev1871193.dist-info/RECORD,,
+py2docfx-0.1.10.dev1871308.dist-info/METADATA,sha256=n7uLT1RnYyrbHOqNdysT6OrGuozubkH86PkVKH1kgms,601
+py2docfx-0.1.10.dev1871308.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+py2docfx-0.1.10.dev1871308.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
+py2docfx-0.1.10.dev1871308.dist-info/RECORD,,