py2docfx 0.1.10.dev1880208__py3-none-any.whl → 0.1.10.dev1881098__py3-none-any.whl

py2docfx/__main__.py

@@ -249,9 +249,10 @@ async def donwload_package_generate_documents(
 
     start_time = time.time()
     for idx in range(min([py2docfxEnvironment.VENV_BUFFER, len(package_info_list)])):
-        package = package_info_list[idx]
-        package_name, options = package.get_install_command()
-        env_prepare_tasks.append(asyncio.create_task(py2docfxEnvironment.prepare_venv(idx, package_name, options)))
+        package_info = package_info_list[idx]
+        package_number = start_num + idx
+        env_prepare_tasks.append(
+            asyncio.create_task(py2docfxEnvironment.prepare_venv(idx, package_info, package_number, github_token, ado_token)))
     await asyncio.create_task(
             py2docfxEnvironment.prepare_base_venv(required_package_list, github_token, ado_token))
     end_time = time.time()
@@ -269,10 +270,10 @@ async def donwload_package_generate_documents(
         end_time = time.time()
         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)
-        end_time = time.time()
-        print(f"<get_source>{package.name},{end_time-start_time}<get_source/>")
+        # start_time = time.time()
+        # get_source(py2docfxEnvironment.get_venv_exe(idx), package, package_number, vststoken=ado_token, githubtoken=github_token)
+        # end_time = time.time()
+        # print(f"<get_source>{package.name},{end_time-start_time}<get_source/>")
 
         # start_time = time.time()
         # package_name, options = package.get_install_command()

py2docfx/convert_prepare/environment.py

@@ -91,9 +91,11 @@ async def prepare_base_venv(required_package_list: list[PackageInfo], github_tok
     await install_required_packages(get_base_venv_exe(), required_package_list, github_token, ado_token)
     print(f"<CI INFO>: basevenv setup complete.")
 
-async def prepare_venv(venv_num: int, package_name: str, options: list[str]):
+async def prepare_venv(venv_num: int, package_info: PackageInfo, package_number: int, github_token: str, ado_token: str):
     await create_environment(get_venv_path(venv_num))
     await install_venv_requirements(venv_num)
+    get_source(get_venv_exe(venv_num), package_info, package_number, vststoken=ado_token, githubtoken=github_token)
+    package_name, options = package_info.get_install_command()
     await pip_utils.install_in_exe_async(get_venv_exe(venv_num), package_name, options)
     print(f"<CI INFO>: venv{venv_num} setup complete.")
 

py2docfx/venv/basevenv/Lib/site-packages/markupsafe/__init__.py

@@ -34,7 +34,9 @@ def escape(s: t.Any, /) -> Markup:
     """
     # If the object is already a plain string, skip __html__ check and string
     # conversion. This is the most common use case.
-    if s.__class__ is str:
+    # Use type(s) instead of s.__class__ because a proxy object may be reporting
+    # the __class__ of the proxied value.
+    if type(s) is str:
         return Markup(_escape_inner(s))
 
     if hasattr(s, "__html__"):

{py2docfx-0.1.10.dev1880208.dist-info → py2docfx-0.1.10.dev1881098.dist-info}/METADATA

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

@@ -1,7 +1,7 @@
 py2docfx/__init__.py,sha256=kPRhPGPC1JknDotkksG428c1iIgfFr_4_7Jm-llrowY,72
-py2docfx/__main__.py,sha256=WZ1M1gdZCJV-5qVYqTmBTTuX2q1mn33-TeX2scjOTgQ,16751
+py2docfx/__main__.py,sha256=rayHW2wxzb4k4sLyQNmGMZaml0w9rzsc77IxwiPaZkw,16789
 py2docfx/convert_prepare/__init__.py,sha256=XxtxrP0kmW3ZBHIAoxsPDEHzcgeC0WSnole8Lk6CjKs,11
-py2docfx/convert_prepare/environment.py,sha256=WEt-lgg5a7NOiNaf2YAlA7otZui_wfK59C-1ok4WLaI,5224
+py2docfx/convert_prepare/environment.py,sha256=b4cTmOvpN6qDXW3RIQgiKuW9Yx_DQlKyZrLCwabcbQU,5449
 py2docfx/convert_prepare/generate_conf.py,sha256=wqs6iyElzJarH-20_qEL9zvZvt5xfBMsGXSXPSZy6wg,2295
 py2docfx/convert_prepare/generate_document.py,sha256=sdCofYNlK87L0oRZZu6U-8wTFkly4gY0IwhTB_hxL3U,3245
 py2docfx/convert_prepare/get_source.py,sha256=hvWR_yPlfliLI9wywtnimKpjhJkx-LUYD6adGHgYTFA,5899
@@ -340,7 +340,7 @@ py2docfx/venv/basevenv/Lib/site-packages/jinja2/sandbox.py,sha256=-8zxR6TO9kUkci
 py2docfx/venv/basevenv/Lib/site-packages/jinja2/tests.py,sha256=Am5Z6Lmfr2XaH_npIfJJ8MdXtWsbLjMULZJulTAj30E,5905
 py2docfx/venv/basevenv/Lib/site-packages/jinja2/utils.py,sha256=udQxWIKaq4QDCZiXN31ngKOaGGdaMA5fl0JMaM-F6fg,26971
 py2docfx/venv/basevenv/Lib/site-packages/jinja2/visitor.py,sha256=ZmeLuTj66ic35-uFH-1m0EKXiw4ObDDb_WuE6h5vPFg,3572
-py2docfx/venv/basevenv/Lib/site-packages/markupsafe/__init__.py,sha256=YvSuddFJXkoaq4tB-1za0c-rrwLLj9UiNpbuBx2_OrU,13488
+py2docfx/venv/basevenv/Lib/site-packages/markupsafe/__init__.py,sha256=pREerPwvinB62tNCMOwqxBS2YHV6R52Wcq1d-rB4Z5o,13609
 py2docfx/venv/basevenv/Lib/site-packages/markupsafe/_native.py,sha256=2ptkJ40yCcp9kq3L1NqpgjfpZB-obniYKFFKUOkHh4Q,218
 py2docfx/venv/basevenv/Lib/site-packages/packaging/__init__.py,sha256=dtw2bNmWCQ9WnMoK3bk_elL1svSlikXtLpZhCFIB9SE,496
 py2docfx/venv/basevenv/Lib/site-packages/packaging/_elffile.py,sha256=_LcJW4YNKywYsl4169B2ukKRqwxjxst_8H0FRVQKlz8,3282
@@ -2785,7 +2785,7 @@ py2docfx/venv/venv0/Lib/site-packages/wheel/vendored/packaging/specifiers.py,sha
 py2docfx/venv/venv0/Lib/site-packages/wheel/vendored/packaging/tags.py,sha256=fedHXiOHkBxNZTXotXv8uXPmMFU9ae-TKBujgYHigcA,18950
 py2docfx/venv/venv0/Lib/site-packages/wheel/vendored/packaging/utils.py,sha256=XgdmP3yx9-wQEFjO7OvMj9RjEf5JlR5HFFR69v7SQ9E,5268
 py2docfx/venv/venv0/Lib/site-packages/wheel/vendored/packaging/version.py,sha256=PFJaYZDxBgyxkfYhH3SQw4qfE9ICCWrTmitvq14y3bs,16234
-py2docfx-0.1.10.dev1880208.dist-info/METADATA,sha256=-qcrt9EO-M1cjL8Vdvyfdileq71mh71nceJWu-3aJGI,601
-py2docfx-0.1.10.dev1880208.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-py2docfx-0.1.10.dev1880208.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
-py2docfx-0.1.10.dev1880208.dist-info/RECORD,,
+py2docfx-0.1.10.dev1881098.dist-info/METADATA,sha256=jaegAk5LvwKbxx3TS51AfAM6mI210cSLJ7yyS4KVeE4,601
+py2docfx-0.1.10.dev1881098.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+py2docfx-0.1.10.dev1881098.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
+py2docfx-0.1.10.dev1881098.dist-info/RECORD,,