py2docfx 0.1.11.dev1859874__py3-none-any.whl → 0.1.11.dev1869610__py3-none-any.whl

py2docfx/__main__.py

@@ -3,11 +3,8 @@ import argparse
 import os
 import shutil
 import sys
-import threading
 import time
 
-sys.path.insert(0, "C:\\MsCodeRepo\\py2docfx\\src")
-
 from py2docfx import PACKAGE_ROOT
 from py2docfx.convert_prepare.environment import VirtualEnvironmentManager
 from py2docfx.convert_prepare.generate_document import generate_document
@@ -18,7 +15,6 @@ from py2docfx.convert_prepare.params import load_file_params, load_command_param
 from py2docfx.convert_prepare.package_info import PackageInfo
 
 CLEAN_UP_FOLDERS = ["dist_temp", "source_repo", "target_repo", "venv"]
-CACHED_VIRTUALENV_LENGTH = 5
 
 print("Adding yaml extension to path")
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)),'docfx_yaml'))
@@ -227,20 +223,6 @@ def donwload_package_generate_documents(
         github_token: str, ado_token: str):
 
     venv_manager = VirtualEnvironmentManager(package_info_list, required_package_list, github_token, ado_token)
-    def initial_venv_cache():
-        package_count = len(package_info_list)
-        cache_cout = CACHED_VIRTUALENV_LENGTH
-        if package_count < CACHED_VIRTUALENV_LENGTH:
-            cache_cout = package_count
-
-        threads = []
-        for i in range(cache_cout):
-            thread = threading.Thread(target = venv_manager.create_template_venv, args=[str(i)])
-            threads.append(thread)
-            thread.start()
-
-        for thread in threads:
-            thread.join()
 
     def donwload_one_package_generate_document(
             package: PackageInfo,
@@ -274,25 +256,10 @@ def donwload_package_generate_documents(
         if output_doc_folder:
             package.path.move_document_to_target(os.path.join(output_doc_folder, package.name))
 
-    # Cache virtual environments
-    start_time = time.time()
-    initial_venv_cache()
-    end_time = time.time()
-    print(f"<initial_venv_cache>{end_time - start_time}<initial_venv_cache/>")
-
     for package_index, package in enumerate(package_info_list):
         worker_venv_id = str(package_index)
+        venv_manager.create_template_venv(worker_venv_id)
         env_executable = os.path.join(PACKAGE_ROOT, "venv", worker_venv_id, "Scripts", "python.exe")
-        # check if the venv is created
-        if not os.path.exists(env_executable):
-            raise RuntimeError(f"Virtual environment for {package.name} is not avaliable")
-
-        # start caching new venv
-        cache_condition = package_index + CACHED_VIRTUALENV_LENGTH < len(package_info_list)
-        if cache_condition:
-            cache_venv_id = str(package_index + CACHED_VIRTUALENV_LENGTH)
-            thread = threading.Thread(target = venv_manager.create_template_venv, args=[cache_venv_id])
-            thread.start()
 
         start_time = time.time()
         donwload_one_package_generate_document(package, package_index, env_executable)
@@ -302,10 +269,6 @@ def donwload_package_generate_documents(
         # used venv clean up
         folder_clean_up(os.path.join(PACKAGE_ROOT, "venv", worker_venv_id))
 
-        # wait for the new venv to be cached
-        if cache_condition:
-            thread.join()
-
     if output_doc_folder:
         start_time = time.time()
         move_root_toc_to_target(YAML_OUTPUT_ROOT, output_doc_folder)

py2docfx/convert_prepare/pip_utils.py

@@ -3,12 +3,12 @@ from py2docfx import PACKAGE_ROOT
 PYPI = "pypi"
 
 pip_install_common_options = [
-    # "--no-cache-dir",
+    "--no-cache-dir",
     "--quiet",
-    "--no-compile",
+    #"--no-compile",
     "--no-warn-conflicts",
     "--disable-pip-version-check",
-    # "--verbose",
+    "--verbose",
 ]
 
 
@@ -26,12 +26,15 @@ def download(package_name, path, executable, extra_index_url=None, prefer_source
 
 
 def install(package_name, options, executable, quiet_install=True):
-    # Installs a package from PyPI using pip.
-    install_param = "pip install {} {}".format(
-        " ".join(pip_install_common_options + options), package_name
-    ).split(" ")
+    install_param = [
+        executable,
+        "-m"
+        "pip",
+        "install",
+        package_name
+    ]
 
     if quiet_install:
-        subprocess.run([executable, "-m"] + install_param + pip_install_common_options, check=True, cwd=PACKAGE_ROOT)
+        subprocess.run(install_param + pip_install_common_options, check=True, cwd=PACKAGE_ROOT)
     else:
-        subprocess.run([executable, "-m"] + install_param, check=True, cwd=PACKAGE_ROOT)
+        subprocess.run(install_param, check=True, cwd=PACKAGE_ROOT)

py2docfx/convert_prepare/sphinx_caller.py

@@ -79,7 +79,8 @@ def run_converter(rst_path, out_path, executable, conf_path = None):
         if not executable:
             raise ValueError("Can't get the executable binary for the Python interpreter.")
         sphinx_param = [
-            executable, sphinx_build_path,
+            executable,
+            sphinx_build_path,
             rst_path,
             outdir,
             '-c', conf_path or rst_path,

{py2docfx-0.1.11.dev1859874.dist-info → py2docfx-0.1.11.dev1869610.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2docfx
-Version: 0.1.11.dev1859874
+Version: 0.1.11.dev1869610
 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.11.dev1859874.dist-info → py2docfx-0.1.11.dev1869610.dist-info}/RECORD

@@ -1,5 +1,5 @@
 py2docfx/__init__.py,sha256=kPRhPGPC1JknDotkksG428c1iIgfFr_4_7Jm-llrowY,72
-py2docfx/__main__.py,sha256=KJoUsy5BCnk6-Qt7JghIQYy7MJ6PRl1aPi8cpGv7iDI,13555
+py2docfx/__main__.py,sha256=_FCsC7Gt7WnOGb4ZTAAsd5JIDuuLNQm1CNlcGPv82y0,12157
 py2docfx/convert_prepare/__init__.py,sha256=XxtxrP0kmW3ZBHIAoxsPDEHzcgeC0WSnole8Lk6CjKs,11
 py2docfx/convert_prepare/environment.py,sha256=r_Jp3hL_wGsM0ZkliFjJOC_jiFbEh90Wmw2ZXhn_MwI,2955
 py2docfx/convert_prepare/generate_conf.py,sha256=wqs6iyElzJarH-20_qEL9zvZvt5xfBMsGXSXPSZy6wg,2295
@@ -12,10 +12,10 @@ py2docfx/convert_prepare/package_info.py,sha256=vRkFKuBxxIm4yyb2daWTzdISma8pL-RM
 py2docfx/convert_prepare/package_info_extra_settings.py,sha256=u5B5e8hc0m9PA_-0kJzq1LtKn-xzZlucwXHTFy49mDg,1475
 py2docfx/convert_prepare/params.py,sha256=PXMB8pLtb4XbfI322avA47q0AO-TyBE6kZf7FU8I6v4,1771
 py2docfx/convert_prepare/paths.py,sha256=964RX81Qf__rzXgEATfqBNFCKTYVjLt9J7WCz2TnNdc,485
-py2docfx/convert_prepare/pip_utils.py,sha256=KsPGKPHJmDKZXufquto7lOGcPzo2f52LVC9OdYwjdj8,1373
+py2docfx/convert_prepare/pip_utils.py,sha256=qA_bMoORlFnKriIqGohbskYIwLfslXpWJkwTOQo8H2A,1267
 py2docfx/convert_prepare/repo_info.py,sha256=6ASJlhBwf6vZTSENgrWCVlJjlJVhuBxzdQyWEdWAC4c,117
 py2docfx/convert_prepare/source.py,sha256=6-A7oof3-WAQcQZZVpT9pKiFLH4CCIZeYqq0MN0O3gw,1710
-py2docfx/convert_prepare/sphinx_caller.py,sha256=fGgNiNZRjFsV3HqpemVVbEVYaN5BoJs8N1BfYPiFaQI,4435
+py2docfx/convert_prepare/sphinx_caller.py,sha256=JUafEpC2L-S3lZDpRwRFPhSzD-2EzFA8CPel8rnSA4s,4448
 py2docfx/convert_prepare/subpackage.py,sha256=mXAi_07pXvnPkSLZfykDh_7VeFxfLy74pYlzhMO8N_Q,5183
 py2docfx/convert_prepare/conf_templates/conf.py_t,sha256=VL5K6xUTIw2cb4GFjDXu5iCZFPA2Kb36KLvier78HFg,3811
 py2docfx/convert_prepare/conf_templates/master_doc.rst_t,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1883,7 +1883,7 @@ py2docfx/venv/0/Scripts/rst2s5.py,sha256=qup0-LMkBGLuh6Bj-1n8ucEVc5T8ANpqL0Pscmp
 py2docfx/venv/0/Scripts/rst2xetex.py,sha256=FNBX2UuBN3vqJQss_DdqjMBSU5BQmOFGLOZV8DSNAuk,905
 py2docfx/venv/0/Scripts/rst2xml.py,sha256=7uyNsZb5QOV243R-EQqdsyUKX7t5_9sQd6LYtw1ZyPA,634
 py2docfx/venv/0/Scripts/rstpep2html.py,sha256=p-PYRUWuvD1LWAzofxrQu_Go3SMfIS8q0pmy6HT2Y5E,702
-py2docfx-0.1.11.dev1859874.dist-info/METADATA,sha256=sAohHeMJItV8oOmJckAc2_BOzCgGPF_NLarh1M1LEFA,601
-py2docfx-0.1.11.dev1859874.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-py2docfx-0.1.11.dev1859874.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
-py2docfx-0.1.11.dev1859874.dist-info/RECORD,,
+py2docfx-0.1.11.dev1869610.dist-info/METADATA,sha256=8Ce8hBQ_337Beft-kjIhxPoBLixD304QaJTxJzRmW9Q,601
+py2docfx-0.1.11.dev1869610.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+py2docfx-0.1.11.dev1869610.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
+py2docfx-0.1.11.dev1869610.dist-info/RECORD,,