py2docfx 0.1.9.dev1929227__py3-none-any.whl → 0.1.9.dev1929828__py3-none-any.whl

py2docfx/__main__.py

@@ -17,6 +17,8 @@ from py2docfx.convert_prepare.params import load_file_params, load_command_param
 from py2docfx.convert_prepare.package_info import PackageInfo
 import py2docfx.convert_prepare.environment as py2docfxEnvironment
 
+os.chdir(PACKAGE_ROOT)
+
 def get_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
         description=(
@@ -320,10 +322,11 @@ def on_rm_error( func, path, exc_info):
 def remove_folder(folder: str | os.PathLike) -> None:
     try:
         shutil.rmtree(folder)
-    except PermissionError:
-        shutil.rmtree(folder, ignore_errors=False, onerror=on_rm_error)
+    except PermissionError as e:
+        if '.git' and '.idx' in str(e):
+            shutil.rmtree(folder, ignore_errors=False, onerror=on_rm_error)
         if os.path.exists(folder):
-            raise ValueError(f"Failed to remove folder {folder}")
+            raise RuntimeError(f"Failed to remove folder {folder}")
         
 def temp_folder_clean_up(folder_list: list[str | os.PathLike]) -> None:
     for folder in folder_list:
@@ -362,7 +365,6 @@ def main(argv) -> int:
     py2docfx_logger.info(msg)
     
     sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)),'docfx_yaml'))
-    os.chdir(PACKAGE_ROOT)
     output_doc_folder = prepare_out_dir(output_root)
 
     try:

py2docfx/convert_prepare/environment.py

@@ -47,7 +47,6 @@ def install_converter_requirements(executable: str):
 async def install_venv_requirements(venv_num: int):
     venv_exe = get_venv_exe(venv_num)
     pip_cmd = ["-m", "pip", "install", "--upgrade"]+ VENV_REQUIREMENT_MODULES
-    # await(await asyncio.create_subprocess_exec(venv_exe, *pip_cmd)).wait()
     await pip_utils.run_async_subprocess(venv_exe, pip_cmd)
 
 def get_venv_path(venv_num: int) -> str:
@@ -85,7 +84,6 @@ def get_base_venv_sphinx_build_path() -> str:
 
 async def install_converter_requirement_async(executable: str):
     pip_cmd = PIP_INSTALL_COMMAND + PIP_INSTALL_VENV_COMMON_OPTIONS + REQUIREMENT_MODULES
-    # await(await asyncio.create_subprocess_exec(executable, *pip_cmd)).wait()
     await pip_utils.run_async_subprocess(executable, pip_cmd)
 
 async def install_required_packages(
@@ -96,7 +94,6 @@ async def install_required_packages(
         #     get_source(package, idx, vststoken=ado_token, githubtoken=github_token)
         package_name, options = package.get_install_command()
         pip_cmd = PIP_INSTALL_COMMAND + PIP_INSTALL_VENV_COMMON_OPTIONS + options + [package_name]
-        # await(await asyncio.create_subprocess_exec(executable, *pip_cmd)).wait()
         await pip_utils.run_async_subprocess(executable, pip_cmd)
 
 async def create_environment(venv_path: int):

py2docfx/convert_prepare/pack.py

@@ -1,8 +1,10 @@
 import shutil
 from os import path
 import os
-import wheel.cli.unpack as wheel_cli_unpack
+import subprocess
+import sys
 
+from py2docfx.docfx_yaml.logger import get_package_logger, log_subprocess_ouput
 
 def unpack_dist(dist_file):
     if dist_file.endswith(".whl"):
@@ -22,8 +24,16 @@ def unpack_wheel(file_path):
     """
     Transform a wheel file to a folder containing source code
     """
-
-    wheel_cli_unpack.unpack(file_path, path.dirname(file_path))
+    py2docfx_logger = get_package_logger(__name__)
+    command = [sys.executable,
+               '-m',
+               'wheel',
+               'unpack',
+               file_path,
+               '-d',
+               os.path.dirname(file_path)]
+    output = subprocess.run(command, check=True, capture_output=True, text=True)
+    log_subprocess_ouput(output, py2docfx_logger)
     extract_folder = [file for file in os.listdir(path.dirname(file_path)) if path.isdir(path.join(path.dirname(file_path), file))][0]
     data_folder = path.join(path.dirname(file_path), extract_folder, extract_folder + ".data")
     if path.exists(data_folder):

py2docfx/convert_prepare/sphinx_caller.py

@@ -32,29 +32,18 @@ def run_apidoc(rst_path, source_code_path, exclude_paths, package_info: PackageI
         if os.path.isdir(subfolderPath):
             msg = "<CI INFO>: Subfolder path {}.".format(subfolderPath)
             py2docfx_logger.info(msg)
-            if os.environ.get('LOG_LEVEL') == 'INFO':
-                args = [
-                    "--module-first",
-                    "--no-headings",
-                    "--no-toc",
-                    "--implicit-namespaces",
-                    "-o",
-                    rst_path,
-                    subfolderPath,
-                ]
-            else:
-                args = [
-                    "-q",
-                    "--module-first",
-                    "--no-headings",
-                    "--no-toc",
-                    "--implicit-namespaces",
-                    "-o",
-                    rst_path,
-                    subfolderPath
-                ]
+            args = [
+                "--module-first",
+                "--no-headings",
+                "--no-toc",
+                "--implicit-namespaces",
+                "-o",
+                rst_path,
+                subfolderPath,
+            ]
             args.extend(exclude_paths)
-            apidoc.main(args)
+            output = subprocess.run([sys.executable, "-m", "sphinx.ext.apidoc"] + args, capture_output=True, text=True)
+            log_subprocess_ouput(output, py2docfx_logger)
             if package_info.build_in_subpackage and subfolder == "azure":
                 subpackages_rst_record = move_rst_files_to_subfolder(
                     package_paths.doc_folder, package_info.name,

py2docfx/venv/venv1/Lib/site-packages/jwt/__init__.py

@@ -27,7 +27,7 @@ from .exceptions import (
 )
 from .jwks_client import PyJWKClient
 
-__version__ = "2.10.0"
+__version__ = "2.10.1"
 
 __title__ = "PyJWT"
 __description__ = "JSON Web Token implementation in Python"

py2docfx/venv/venv1/Lib/site-packages/jwt/api_jwt.py

@@ -419,11 +419,11 @@ class PyJWT:
         if "iss" not in payload:
             raise MissingRequiredClaimError("iss")
 
-        if isinstance(issuer, Sequence):
-            if payload["iss"] not in issuer:
+        if isinstance(issuer, str):
+            if payload["iss"] != issuer:
                 raise InvalidIssuerError("Invalid issuer")
         else:
-            if payload["iss"] != issuer:
+            if payload["iss"] not in issuer:
                 raise InvalidIssuerError("Invalid issuer")
 
 

{py2docfx-0.1.9.dev1929227.dist-info → py2docfx-0.1.9.dev1929828.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2docfx
-Version: 0.1.9.dev1929227
+Version: 0.1.9.dev1929828
 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.9.dev1929227.dist-info → py2docfx-0.1.9.dev1929828.dist-info}/RECORD

@@ -1,14 +1,14 @@
 py2docfx/__init__.py,sha256=kPRhPGPC1JknDotkksG428c1iIgfFr_4_7Jm-llrowY,72
-py2docfx/__main__.py,sha256=7UwcCulXqoywCzpuG-fJ8anwvF8YWlFyA6P9-CG0R_E,15006
+py2docfx/__main__.py,sha256=EbG_3p6wOrbkMWg8OF83XK_5aPl00uuO4-1Le1TXjac,15056
 py2docfx/convert_prepare/__init__.py,sha256=XxtxrP0kmW3ZBHIAoxsPDEHzcgeC0WSnole8Lk6CjKs,11
 py2docfx/convert_prepare/constants.py,sha256=RC5DqNkqWvx4hb91FrajZ1R9dBFLxcPyoEJ43jdm36E,102
-py2docfx/convert_prepare/environment.py,sha256=7EmlodXVG0S5wnn0_VFPwPJ_3OHfJfGpN33SUL3HSRI,7233
+py2docfx/convert_prepare/environment.py,sha256=X6818O3GFkkEvy_Ssj7HIxEgW8hOg0-p61_MZOs9E1c,6991
 py2docfx/convert_prepare/generate_conf.py,sha256=wqs6iyElzJarH-20_qEL9zvZvt5xfBMsGXSXPSZy6wg,2295
 py2docfx/convert_prepare/generate_document.py,sha256=mNfJpLViIfzwRnjVwXmg5H5lVWzKJkUHeXTiJouA39o,2879
 py2docfx/convert_prepare/get_source.py,sha256=6EMSLiDOfid4d7SDxweV_-TGV4McxhSxKQPJju2Mi4Y,5221
 py2docfx/convert_prepare/git.py,sha256=OIoaX_0LG5ueY8zmUwrbxl_YyMxwLzgTp6g0uSkC2Y0,6617
 py2docfx/convert_prepare/install_package.py,sha256=hATmgazcSX7k2n4jQXh9sQMyNUc1k1YqHv5K5UMALq4,262
-py2docfx/convert_prepare/pack.py,sha256=bptweiUnlk_jtu1FxgqlqvHVOCfvoeAqemxli6ep0-o,1231
+py2docfx/convert_prepare/pack.py,sha256=k8eme75VRhdsZOc9ox0zNORXP4kFhAiPiP4mUdNBwwU,1614
 py2docfx/convert_prepare/package_info.py,sha256=2fDyalHtxhZQICehDK4zv7k69HE427c1MLEuHVnPzBU,7624
 py2docfx/convert_prepare/package_info_extra_settings.py,sha256=u5B5e8hc0m9PA_-0kJzq1LtKn-xzZlucwXHTFy49mDg,1475
 py2docfx/convert_prepare/params.py,sha256=PXMB8pLtb4XbfI322avA47q0AO-TyBE6kZf7FU8I6v4,1771
@@ -16,7 +16,7 @@ py2docfx/convert_prepare/paths.py,sha256=964RX81Qf__rzXgEATfqBNFCKTYVjLt9J7WCz2T
 py2docfx/convert_prepare/pip_utils.py,sha256=SGWS07Rn0sWlZsr_fdGIqLFHsgma4UvsghjzkNogFkc,2930
 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=KM5SanFk67Kkd3oVKzNN-5KCAAiyNUUgnJl5mDs-3kw,4439
+py2docfx/convert_prepare/sphinx_caller.py,sha256=P3iuTCGGZm4oHawBKpaXHPNg4Pdy6lzsMzo4A8WqKB0,4157
 py2docfx/convert_prepare/subpackage.py,sha256=mXAi_07pXvnPkSLZfykDh_7VeFxfLy74pYlzhMO8N_Q,5183
 py2docfx/convert_prepare/conf_templates/conf.py_t,sha256=8zxvY1WiG-z2aiSNDY0719C08QxZLXXEMwKfYSGN0ZE,3811
 py2docfx/convert_prepare/conf_templates/root_doc.rst_t,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -2417,11 +2417,11 @@ py2docfx/venv/venv1/Lib/site-packages/isapi/samples/redirector_asynch.py,sha256=
 py2docfx/venv/venv1/Lib/site-packages/isapi/samples/redirector_with_filter.py,sha256=sDh2CdJvFQyRl4nESKvE_BD5RmS2LueTDKzo68yYXBU,6571
 py2docfx/venv/venv1/Lib/site-packages/isapi/samples/test.py,sha256=NSLKDlBkyVHcAidp7KTAsR1aDwNLZDKsii1GdnTpsXk,6513
 py2docfx/venv/venv1/Lib/site-packages/isapi/test/extension_simple.py,sha256=DPRrNspfpfwJiNU9xXtFVn5Q09ufQxQ44zMIZObqxF0,4339
-py2docfx/venv/venv1/Lib/site-packages/jwt/__init__.py,sha256=t4ls09ayVevWiOgfVTg_ArWm6mjMUyjkUJS0RzKGaO0,1711
+py2docfx/venv/venv1/Lib/site-packages/jwt/__init__.py,sha256=VB2vFKuboTjcDGeZ8r-UqK_dz3NsQSQEqySSICby8Xg,1711
 py2docfx/venv/venv1/Lib/site-packages/jwt/algorithms.py,sha256=cKr-XEioe0mBtqJMCaHEswqVOA1Z8Purt5Sb3Bi-5BE,30409
 py2docfx/venv/venv1/Lib/site-packages/jwt/api_jwk.py,sha256=6F1r7rmm8V5qEnBKA_xMjS9R7VoANe1_BL1oD2FrAjE,4451
 py2docfx/venv/venv1/Lib/site-packages/jwt/api_jws.py,sha256=aM8vzqQf6mRrAw7bRy-Moj_pjWsKSVQyYK896AfMjJU,11762
-py2docfx/venv/venv1/Lib/site-packages/jwt/api_jwt.py,sha256=7TmATwZ4pon34XltU311mYuwoXAhAIXmamJD8WnHF7M,14517
+py2docfx/venv/venv1/Lib/site-packages/jwt/api_jwt.py,sha256=OGT4hok1l5A6FH_KdcrU5g6u6EQ8B7em0r9kGM9SYgA,14512
 py2docfx/venv/venv1/Lib/site-packages/jwt/exceptions.py,sha256=bUIOJ-v9tjopTLS-FYOTc3kFx5WP5IZt7ksN_HE1G9Q,1211
 py2docfx/venv/venv1/Lib/site-packages/jwt/help.py,sha256=vFdNzjQoAch04XCMYpCkyB2blaqHAGAqQrtf9nSPkdk,1808
 py2docfx/venv/venv1/Lib/site-packages/jwt/jwk_set_cache.py,sha256=hBKmN-giU7-G37L_XKgc_OZu2ah4wdbj1ZNG_GkoSE8,959
@@ -4180,7 +4180,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.9.dev1929227.dist-info/METADATA,sha256=AdTxA5oRejsOXyUNWzH-f_XtTaS1pKeZmgpjNrWCG0M,600
-py2docfx-0.1.9.dev1929227.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-py2docfx-0.1.9.dev1929227.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
-py2docfx-0.1.9.dev1929227.dist-info/RECORD,,
+py2docfx-0.1.9.dev1929828.dist-info/METADATA,sha256=XwLCnksnsT2nMutJwEweteQkOiqAo4jN9I6-mvGFUL4,600
+py2docfx-0.1.9.dev1929828.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+py2docfx-0.1.9.dev1929828.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
+py2docfx-0.1.9.dev1929828.dist-info/RECORD,,