py2docfx 0.1.0rc1519250__py3-none-any.whl → 0.1.0rc1533195__py3-none-any.whl

py2docfx/__main__.py

@@ -1,3 +1,4 @@
+from __future__ import annotations # Avoid A | B annotation break under <= py3.9
 import argparse
 import os
 import sys

py2docfx/convert_prepare/generate_document.py

@@ -1,3 +1,4 @@
+from __future__ import annotations # Avoid A | B annotation break under <= py3.9
 import os
 from py2docfx.convert_prepare.generate_conf import generate_conf
 from py2docfx.convert_prepare.git import checkout

py2docfx/convert_prepare/get_source.py

@@ -28,7 +28,15 @@ def update_package_info(pkg: PackageInfo, source_folder: str):
                 text=True,
                 check=True
             )
-            setattr(pkg, attr, proc_ret.stdout.strip())
+
+            if isinstance(proc_ret.stdout, list):
+                attr_val = (proc_ret.stdout[-1]).strip()
+            elif '\n' in proc_ret.stdout:
+                attr_val = proc_ret.stdout.strip().split('\n')[-1]
+            else:
+                attr_val = proc_ret.stdout.strip()
+
+            setattr(pkg, attr, attr_val)
     else:
         folder = next(
             f for f in all_files if path.isdir(f) and f.endswith(".dist-info")

py2docfx/convert_prepare/git.py

@@ -18,7 +18,7 @@ def clone(repo_location, branch, folder, extra_token=None):
 
     global repoMap
 
-    if not test_url(repo_location):
+    if not test_url(repo_location, extra_token):
         raise ValueError(
             "Git repo address {} is not a valid URL.".format(repo_location)
         )
@@ -33,7 +33,7 @@ def clone(repo_location, branch, folder, extra_token=None):
             if extra_token:
                 check_params[1:1] = [
                     "-c",
-                    "http.extraHeader='Authorization: Basic {}'".format(extra_token),
+                    "http.extraHeader=Authorization: Basic {}".format(extra_token),
                 ]
 
             check_br = subprocess.check_output(check_params)
@@ -50,9 +50,9 @@ def clone(repo_location, branch, folder, extra_token=None):
                     branch,
                 ]
                 if extra_token:
-                    check_params[1:1] = [
+                    clone_params[1:1] = [
                         "-c",
-                        "http.extraHeader='Authorization: Basic {}'".format(
+                        "http.extraHeader=Authorization: Basic {}".format(
                             extra_token
                         ),
                     ]
@@ -73,12 +73,19 @@ def clone(repo_location, branch, folder, extra_token=None):
         return repoMap[pureURL]
 
 
-def test_url(url):
+def test_url(url, extraHeader):
     """
     Test if the url is a valid git repo url
     """
+    params = ["git", "ls-remote", url]
+    if extraHeader:
+        print("Using extra header to test git repo url.")
+        params[1:1] = [
+            "-c",
+            "http.extraHeader=Authorization: Basic {}".format(extraHeader),
+        ]
     try:
-        subprocess.check_output(["git", "ls-remote", url])
+        subprocess.check_output(params)
         return True
     except:
         return False
@@ -98,7 +105,7 @@ def convertBranch(repo_url, branch, extraHeader):
         if extraHeader:
             check_params[1:1] = [
                 "-c",
-                "http.extraHeader='Authorization: Basic {}'".format(extraHeader),
+                "http.extraHeader=Authorization: Basic {}".format(extraHeader),
             ]
 
         checkBr = subprocess.check_output(check_params)

py2docfx/convert_prepare/post_process/merge_toc.py

@@ -1,3 +1,4 @@
+from __future__ import annotations # Avoid A | B annotation break under <= py3.9
 import os
 import shutil
 

{py2docfx-0.1.0rc1519250.dist-info → py2docfx-0.1.0rc1533195.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2docfx
-Version: 0.1.0rc1519250
+Version: 0.1.0rc1533195
 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.0rc1519250.dist-info → py2docfx-0.1.0rc1533195.dist-info}/RECORD

@@ -1,11 +1,11 @@
 py2docfx/__init__.py,sha256=kPRhPGPC1JknDotkksG428c1iIgfFr_4_7Jm-llrowY,72
-py2docfx/__main__.py,sha256=NHg5rxBA9rlDF-Sl6NLSjxc7FfSX-zsgC0BOwQFbhuU,10665
+py2docfx/__main__.py,sha256=oN3abj4Z6abbyjgYHkRQ5VGQSWf6WAk90YR37gifbQw,10747
 py2docfx/convert_prepare/__init__.py,sha256=XxtxrP0kmW3ZBHIAoxsPDEHzcgeC0WSnole8Lk6CjKs,11
 py2docfx/convert_prepare/environment.py,sha256=AwS4c4OSwVdxlExBLVo310HrVhFMhWQ2Wh9RJPJKH1c,894
 py2docfx/convert_prepare/generate_conf.py,sha256=wqs6iyElzJarH-20_qEL9zvZvt5xfBMsGXSXPSZy6wg,2295
-py2docfx/convert_prepare/generate_document.py,sha256=sppAAAgpZVtsXvO5M5EEOR39JeRyJk5ie3Kh9z27PrA,2350
-py2docfx/convert_prepare/get_source.py,sha256=1XOdFABdzhmSld8-w72gaOQv8_xaUX7_VnFiSmvh3cc,4592
-py2docfx/convert_prepare/git.py,sha256=fY9urQQp5aMnlGnFrSvTTR0FPnIc-28b50W1NzIPpaw,5640
+py2docfx/convert_prepare/generate_document.py,sha256=wkZvdSFT32u6lgAlrL-PmrvVb5sFPq8pue804QVQ75A,2432
+py2docfx/convert_prepare/get_source.py,sha256=Rl6WYWpkalAWmc-02ZLb9zXxrHNDFaOoFTI8Pz5aM90,4872
+py2docfx/convert_prepare/git.py,sha256=xGJp2nDWLfVljrxyPnFKPoLIqmBh6by-QdITogIuxi0,5893
 py2docfx/convert_prepare/install_package.py,sha256=hATmgazcSX7k2n4jQXh9sQMyNUc1k1YqHv5K5UMALq4,262
 py2docfx/convert_prepare/pack.py,sha256=vZS67_GzEhUmZWHU1dxm8gnWyRBs-kB6-KjX1d_FdOU,1260
 py2docfx/convert_prepare/package_info.py,sha256=RCN3enfwXeU_9H8xBHLalvbhUrGxMtmlX0F9omGoPjU,6856
@@ -18,7 +18,7 @@ py2docfx/convert_prepare/sphinx_caller.py,sha256=CQjDmZRKxTIT83Ah8LSwhdSTObCqYes
 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
-py2docfx/convert_prepare/post_process/merge_toc.py,sha256=-7tygsSvJjTeR0hb0ABpu3kR5CsFJlWgU1QjnmAYkUo,1053
+py2docfx/convert_prepare/post_process/merge_toc.py,sha256=coyae54OB1nGcCkxz9oAu-W7VAxDnRJS4Kv9IrHeaP8,1135
 py2docfx/convert_prepare/subpackage_merge/merge_root_package.py,sha256=uK96qL2asuSfo_3SZaoP8XZaUvjf5mNkr17JNbZR4Lg,1026
 py2docfx/convert_prepare/subpackage_merge/merge_toc.py,sha256=nkVqe8R0m8D6cyTYV7aIpMDXorvn4-LXfU_vIK_hJBg,1706
 py2docfx/convert_prepare/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -105,7 +105,7 @@ py2docfx/docfx_yaml/tests/roots/test-writer-table/conf.py,sha256=avcbnIOV2mlGQwh
 py2docfx/docfx_yaml/tests/roots/test-writer-uri/code_with_uri.py,sha256=bzWTZpY2yf_By2bOSl1GFaY3BsZpkAvwQuGztlcHKkQ,537
 py2docfx/docfx_yaml/tests/roots/test-writer-uri/conf.py,sha256=avcbnIOV2mlGQwhMQJZC4W6UGRBRhnq1QBxjPWlySxQ,260
 py2docfx/docfx_yaml/tests/utils/test_utils.py,sha256=d0OYSUQ6NyoZx5mlLdNGGNhiNmmQhjVT4hQ6jY3VE_M,3383
-py2docfx-0.1.0rc1519250.dist-info/METADATA,sha256=Ka3DYHnNYsCKK7beTOX3s7LLY_uP74S6JwoI7KHVv9I,599
-py2docfx-0.1.0rc1519250.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-py2docfx-0.1.0rc1519250.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
-py2docfx-0.1.0rc1519250.dist-info/RECORD,,
+py2docfx-0.1.0rc1533195.dist-info/METADATA,sha256=6wHTRwhvzaG0xr_tInJBbVIrcumf5Q9ThQXkk0Bw2t8,599
+py2docfx-0.1.0rc1533195.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+py2docfx-0.1.0rc1533195.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
+py2docfx-0.1.0rc1533195.dist-info/RECORD,,

{py2docfx-0.1.0rc1519250.dist-info → py2docfx-0.1.0rc1533195.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any