py2docfx 0.1.13rc2016963__py3-none-any.whl → 0.1.14.dev2017094__py3-none-any.whl

py2docfx/convert_prepare/environment.py

@@ -91,9 +91,9 @@ async def install_converter_requirement_async(executable: str):
 async def install_required_packages(
         executable: str, required_package_list: list[PackageInfo], github_token: str, ado_token: str):
     for package in required_package_list:
-        # TODO: create a git clone async function and use it here, check if it already exists
-        # if package.install_type == package.InstallType.SOURCE_CODE:
-        #     get_source(package, idx, vststoken=ado_token, githubtoken=github_token)
+        idx = required_package_list.index(package)
+        if package.install_type == package.InstallType.SOURCE_CODE:
+            await get_source(executable, package, idx, vststoken=ado_token, githubtoken=github_token, is_required_pkg=True)
         package_name, options = package.get_install_command()
         pip_cmd = PIP_INSTALL_COMMAND + PIP_INSTALL_VENV_COMMON_OPTIONS + options + [package_name]
         py2docfx_logger = get_logger(__name__)

py2docfx/convert_prepare/get_source.py

@@ -8,6 +8,7 @@ import py2docfx.convert_prepare.pip_utils as pip_utils
 import py2docfx.convert_prepare.pack as pack
 from py2docfx.docfx_yaml.logger import get_logger
 from py2docfx.convert_prepare.constants import TARGET_REPO, SOURCE_REPO, DIST_TEMP
+from py2docfx.convert_prepare.install_package import install_package
 from py2docfx.convert_prepare.package_info import PackageInfo
 from py2docfx.convert_prepare.source import Source
 
@@ -72,9 +73,11 @@ def update_package_info(executable: str, pkg: PackageInfo, source_folder: str):
         source_folder=source_folder, yaml_output_folder=yaml_output_folder, package_name=pkg.name
     )
 
-async def get_source(executable: str, pkg: PackageInfo, cnt: int, vststoken=None, githubtoken=None):
+async def get_source(executable: str, pkg: PackageInfo, cnt: int, vststoken=None, githubtoken=None, is_required_pkg=False):
     py2docfx_logger = get_logger(__name__)
     path_cnt = str(cnt)
+    if is_required_pkg:
+        path_cnt = "required_" + path_cnt
     dist_dir = path.join(DIST_TEMP, path_cnt)
 
     if pkg.install_type == PackageInfo.InstallType.SOURCE_CODE:

py2docfx/convert_prepare/sphinx_caller.py

@@ -87,12 +87,12 @@ async def run_converter(package_name: str,
     # TODO: update generate_conf to replace "yaml_builder" with "py2docfx.docfx_yaml.yaml_builder"
     # then no need to manually add docfx_yaml to path
     package_root_parent = os.path.join(PACKAGE_ROOT, 'docfx_yaml')
+    os.environ['PROCESSING_PACKAGE_NAME'] = package_name
     env_tmp = os.environ.copy()
     if os.name == 'nt' : # TODO: may need to add basevenv site-packages if not work
         env_tmp["PYTHONPATH"] = f"{extra_package_path};{package_root_parent};"
     else:
         env_tmp["PYTHONPATH"] = f"{extra_package_path}:{package_root_parent}:"
-    os.environ['PROCESSING_PACKAGE_NAME'] = package_name
     proc = await asyncio.create_subprocess_exec(
         executable, *sphinx_param,
         cwd=PACKAGE_ROOT,

{py2docfx-0.1.13rc2016963.dist-info → py2docfx-0.1.14.dev2017094.dist-info}/METADATA

@@ -1,10 +1,9 @@
 Metadata-Version: 2.1
 Name: py2docfx
-Version: 0.1.13rc2016963
+Version: 0.1.14.dev2017094
 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
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{py2docfx-0.1.13rc2016963.dist-info → py2docfx-0.1.14.dev2017094.dist-info}/RECORD

@@ -3,10 +3,10 @@ py2docfx/__main__.py,sha256=DWLEx3XbEmDbGrwe1QWm5dBW_a8FJdzp_7uQeXaEgN0,5928
 py2docfx/convert_prepare/__init__.py,sha256=XxtxrP0kmW3ZBHIAoxsPDEHzcgeC0WSnole8Lk6CjKs,11
 py2docfx/convert_prepare/arg_parser.py,sha256=Wa1iK8a0Gb3QqaS4X7nUPGvh-7mWhuBS9IVbmnjC770,7606
 py2docfx/convert_prepare/constants.py,sha256=RC5DqNkqWvx4hb91FrajZ1R9dBFLxcPyoEJ43jdm36E,102
-py2docfx/convert_prepare/environment.py,sha256=ClUnNHehYjxMwS50cqnCQO5vHCQaA289opSdfhkOARc,7293
+py2docfx/convert_prepare/environment.py,sha256=CF8g2hnpwFXsTfvp1O8lwYpR848iCK8bDM2UAWqibEQ,7286
 py2docfx/convert_prepare/generate_conf.py,sha256=wqs6iyElzJarH-20_qEL9zvZvt5xfBMsGXSXPSZy6wg,2295
 py2docfx/convert_prepare/generate_document.py,sha256=iTOCMBwkfvZEj5dlEGUq4qynUodaYxJuIrG9R5eGk38,2949
-py2docfx/convert_prepare/get_source.py,sha256=Sw5QMWWbKLSznHgNu7JLSW0Wy_FEk0uR_IaKKSKUCl4,5280
+py2docfx/convert_prepare/get_source.py,sha256=p7ktERW-OtA02O1RnikKb8EYmuUVKrqAlznOA-IvCDw,5441
 py2docfx/convert_prepare/git.py,sha256=Qb6uexUo3KKwp2Hq9Q27gMU4Z2P8ZBk7JcSmxBfFCBY,6491
 py2docfx/convert_prepare/install_package.py,sha256=aJxQBwLRPTIKpdtLVl-SaXPaF_OX_H1ZtWmcKD8Zzuk,274
 py2docfx/convert_prepare/pack.py,sha256=Jjj9ps8ESoKUFmSk6VgNmxOwMhuwirnQ-rhqigH-4VY,1578
@@ -17,7 +17,7 @@ py2docfx/convert_prepare/paths.py,sha256=964RX81Qf__rzXgEATfqBNFCKTYVjLt9J7WCz2T
 py2docfx/convert_prepare/pip_utils.py,sha256=Y_xmIE0Ld-gXgR8rkXSfj-AMh1bcUJvscMgSdNZyPQU,2138
 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=K7HZddkzENu_QkOrgoKeILsXkRmyQrpUXhRsow-51I4,4696
+py2docfx/convert_prepare/sphinx_caller.py,sha256=iyalaxdhcMpiUsPEziEgH7v7cd5Zpx8KeD11iCULGbc,4696
 py2docfx/convert_prepare/subpackage.py,sha256=mXAi_07pXvnPkSLZfykDh_7VeFxfLy74pYlzhMO8N_Q,5183
 py2docfx/convert_prepare/utils.py,sha256=TwfDjIqIx_nAoSeQ-LX30h_-d96WhPQcAu7P8N_tSjM,1618
 py2docfx/convert_prepare/conf_templates/conf.py_t,sha256=8zxvY1WiG-z2aiSNDY0719C08QxZLXXEMwKfYSGN0ZE,3811
@@ -4195,7 +4195,7 @@ py2docfx/venv/venv1/Lib/site-packages/win32comext/taskscheduler/test/test_addtas
 py2docfx/venv/venv1/Lib/site-packages/win32comext/taskscheduler/test/test_localsystem.py,sha256=08ojAS48W6RLsUbRD45j0SJhg_Y2NFHZT6qjT4Vrig0,75
 py2docfx/venv/venv1/Scripts/pywin32_postinstall.py,sha256=u95n7QQUxpCjrZistYE-3gN451zXzopuJna8cXRQ4Jw,28115
 py2docfx/venv/venv1/Scripts/pywin32_testall.py,sha256=-6yvZmd2lPQc4e8i6PgLsr_totF6mScvoq0Jqr0V2fM,3844
-py2docfx-0.1.13rc2016963.dist-info/METADATA,sha256=Jax3MrNenNRzT4um3CTKB_wGYJFt2EVipGspg7vNLOY,599
-py2docfx-0.1.13rc2016963.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-py2docfx-0.1.13rc2016963.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
-py2docfx-0.1.13rc2016963.dist-info/RECORD,,
+py2docfx-0.1.14.dev2017094.dist-info/METADATA,sha256=oZEYsVOlJTvgVZr1RMBOUk4HE2g9VIn9KzbNuXZifPk,550
+py2docfx-0.1.14.dev2017094.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+py2docfx-0.1.14.dev2017094.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
+py2docfx-0.1.14.dev2017094.dist-info/RECORD,,