py2docfx 0.1.11.dev1899135__py3-none-any.whl → 0.1.11.dev1902551__py3-none-any.whl

py2docfx/convert_prepare/environment.py

@@ -1,6 +1,7 @@
 import subprocess
 import asyncio
 import os
+import sys
 from py2docfx import PACKAGE_ROOT
 from py2docfx.convert_prepare.package_info import PackageInfo
 from py2docfx.convert_prepare.get_source import get_source
@@ -11,7 +12,7 @@ VENV_REQUIREMENT_MODULES = ["setuptools", "wheel"] # to support running setup.py
 VENV_DIR = "venv"
 VENV_BUFFER = 10
 VENV_DELETE_BUFFER = 10
-PIP_INSTALL_COMMAND = ["-m", "pip", "install", "--upgrade"]
+PIP_INSTALL_COMMAND = ["-m", "pip", "install", "--upgrade"] 
 
 PIP_INSTALL_VENV_COMMON_OPTIONS = [
     "--quiet",
@@ -53,16 +54,31 @@ def get_base_venv_path() -> str:
     return os.path.join(PACKAGE_ROOT, VENV_DIR, "basevenv")
 
 def get_venv_exe(venv_num: int) -> str:
-    return os.path.join(get_venv_path(venv_num), "Scripts", "python.exe")
+    if os.name == 'nt':
+        return os.path.join(get_venv_path(venv_num), "Scripts", "python.exe")
+    else:
+        return os.path.join(get_venv_path(venv_num), "bin", "python3")
 
 def get_base_venv_exe() -> str:
-    return os.path.join(get_base_venv_path(), "Scripts", "python.exe")
+    if os.name == 'nt':
+        return os.path.join(get_base_venv_path(), "Scripts", "python.exe")
+    else:
+        return os.path.join(get_base_venv_path(), "bin", "python3")
 
 def get_venv_package_path(venv_num: int) -> str:
-    return os.path.join(get_venv_path(venv_num), "Lib", "site-packages")
+    if os.name == 'nt':  # Windows
+        return os.path.join(get_venv_path(venv_num), "Lib", "site-packages")
+    else:  # Linux and other Unix-like systems
+        python_version = f"python{sys.version_info.major}.{sys.version_info.minor}" # venv version should be same as native
+        return os.path.join(get_venv_path(venv_num), "lib", python_version, "site-packages")
 
 def get_base_venv_sphinx_build_path() -> str:
-    return os.path.join(get_base_venv_path(), "Lib", "site-packages", "sphinx", "cmd", "build.py")
+    if os.name == 'nt':  # Windows
+        return os.path.join(get_base_venv_path(), "Lib", "site-packages", "sphinx", "cmd", "build.py")
+    else: # Linux and other Unix-like systems
+        python_version = f"python{sys.version_info.major}.{sys.version_info.minor}" # venv version should be same as native
+        return os.path.join(get_base_venv_path(), "lib", python_version, "site-packages", "sphinx", "cmd", "build.py")
+        
 
 async def install_converter_requirement_async(executable: str):
     pip_cmd = PIP_INSTALL_COMMAND + PIP_INSTALL_VENV_COMMON_OPTIONS + REQUIREMENT_MODULES
@@ -79,7 +95,10 @@ async def install_required_packages(
         await(await asyncio.create_subprocess_exec(executable, *pip_cmd)).wait()
 
 async def create_environment(venv_path: int):
-    await (await asyncio.create_subprocess_exec("python", "-m", "venv", venv_path)).wait()
+    if os.name == 'nt':
+        await (await asyncio.create_subprocess_exec("python", "-m", "venv", venv_path)).wait()
+    else: # On linux the default command name is
+        await (await asyncio.create_subprocess_exec("python3", "-m", "venv", venv_path)).wait()
 
 async def prepare_base_venv(required_package_list: list[PackageInfo], github_token: str, ado_token: str):
     print(f"<CI INFO>: Creating basevenv...")

{py2docfx-0.1.11.dev1899135.dist-info → py2docfx-0.1.11.dev1902551.dist-info}/METADATA

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

@@ -2,7 +2,7 @@ py2docfx/__init__.py,sha256=kPRhPGPC1JknDotkksG428c1iIgfFr_4_7Jm-llrowY,72
 py2docfx/__main__.py,sha256=O36ZLYcCTl6b4_Y6_JKcG8HCTLxD6pExi25yNocOQDk,12641
 py2docfx/convert_prepare/__init__.py,sha256=XxtxrP0kmW3ZBHIAoxsPDEHzcgeC0WSnole8Lk6CjKs,11
 py2docfx/convert_prepare/constants.py,sha256=9hj5Jn0PezeJ2FUGlIjJRtxMtZcgpRTtHnGlHNguWw0,81
-py2docfx/convert_prepare/environment.py,sha256=ucYjPK6DzaE-qrHp22BiEq9fprNFPh948g1ebpmujdk,5399
+py2docfx/convert_prepare/environment.py,sha256=AEQPNaEFno3wuwKxNqLxQLipAxah8SpW5V5kO_GTgTo,6458
 py2docfx/convert_prepare/generate_conf.py,sha256=wqs6iyElzJarH-20_qEL9zvZvt5xfBMsGXSXPSZy6wg,2295
 py2docfx/convert_prepare/generate_document.py,sha256=NASy3I0thAkIMv1n6ECXBK8gVHORzfQrlPCNG8BAYaA,2646
 py2docfx/convert_prepare/get_source.py,sha256=z3a3Uv6tnTKiJoh77-CZ2Xd6tWnpl_YwldKWI4u2Q98,5074
@@ -4235,7 +4235,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.11.dev1899135.dist-info/METADATA,sha256=Vxnooz0LFmMp27__Gv-2P7nNmn8Y3zNNs7aFVZZtrR8,601
-py2docfx-0.1.11.dev1899135.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-py2docfx-0.1.11.dev1899135.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
-py2docfx-0.1.11.dev1899135.dist-info/RECORD,,
+py2docfx-0.1.11.dev1902551.dist-info/METADATA,sha256=214eEnS7XiCXv_h9m9HUGsCor6i26E9OyCJptwl7VfY,601
+py2docfx-0.1.11.dev1902551.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+py2docfx-0.1.11.dev1902551.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
+py2docfx-0.1.11.dev1902551.dist-info/RECORD,,