py2docfx 0.1.19.dev2192444__py3-none-any.whl → 0.1.19.dev2192635__py3-none-any.whl

py2docfx/__main__.py

@@ -106,8 +106,8 @@ async def main(argv) -> int:
     
     # create log folder and package log folder
     log_folder = os.path.join(PACKAGE_ROOT, LOG_FOLDER)
-    os.makedirs(log_folder, exist_ok=True)
-    os.makedirs(os.path.join(log_folder, "package_logs"), exist_ok=True)
+    os.makedirs(log_folder)
+    os.makedirs(os.path.join(log_folder, "package_logs"))
     
     py2docfxLogger.decide_global_log_level(verbose, show_warning)
     

py2docfx/convert_prepare/get_source.py

@@ -41,11 +41,10 @@ def update_package_info(executable: str, pkg: PackageInfo, source_folder: str):
 
             setattr(pkg, attr, attr_val)
     else:
-        # Find .dist-info folders
-        dist_info_folders = [f for f in all_files if path.isdir(f) and f.endswith(".dist-info")]
-        
-        if dist_info_folders:
-            folder = dist_info_folders[0]  # Take the first one if multiple exist
+        folder = next(
+            f for f in all_files if path.isdir(f) and f.endswith(".dist-info")
+        )
+        if folder:
             if path.exists(path.join(folder, "METADATA")):
                 with open(
                     path.join(folder, "METADATA"), "r", encoding="utf-8"
@@ -98,9 +97,6 @@ async def get_source(executable: str, pkg: PackageInfo, cnt: int, vststoken=None
             sys.path.insert(0, source_folder)
     elif pkg.install_type == PackageInfo.InstallType.PYPI:
         full_name = pkg.get_combined_name_version()
-        # Ensure the dist directory exists
-        os.makedirs(dist_dir, exist_ok=True)
-        
         await pip_utils.download(
             full_name,
             dist_dir,
@@ -108,53 +104,25 @@ async def get_source(executable: str, pkg: PackageInfo, cnt: int, vststoken=None
             prefer_source_distribution=pkg.prefer_source_distribution,
         )
         # unpack the downloaded wheel file.
-        dist_files = os.listdir(dist_dir)
-        if not dist_files:
-            msg = f"No files downloaded to {dist_dir} for package {pkg.name}"
-            py2docfx_logger.error(msg)
-            raise FileNotFoundError(f"No files found in {dist_dir}")
-            
-        downloaded_dist_file = path.join(dist_dir, dist_files[0])
+        downloaded_dist_file = path.join(dist_dir, os.listdir(dist_dir)[0])
         await pack.unpack_dist(pkg.name, downloaded_dist_file)
         os.remove(downloaded_dist_file)
-        dist_files = os.listdir(dist_dir)
-        if not dist_files:
-            msg = f"No files found in {dist_dir} after unpacking for package {pkg.name}"
-            py2docfx_logger.error(msg)
-            raise FileNotFoundError(f"No files found in {dist_dir} after unpacking")
-            
         source_folder = path.join(
             path.dirname(downloaded_dist_file),
-            dist_files[0]
+            os.listdir(dist_dir)[0]
         )
     elif pkg.install_type == PackageInfo.InstallType.DIST_FILE:
-        # Ensure the dist directory exists
-        os.makedirs(dist_dir, exist_ok=True)
-        
         await pip_utils.download(pkg.location, dist_dir, prefer_source_distribution=False)
         # unpack the downloaded dist file.
-        dist_files = os.listdir(dist_dir)
-        if not dist_files:
-            msg = f"No files downloaded to {dist_dir} for package {pkg.name}"
-            py2docfx_logger.error(msg)
-            raise FileNotFoundError(f"No files found in {dist_dir}")
-            
-        downloaded_dist_file = path.join(dist_dir, dist_files[0])
+        downloaded_dist_file = path.join(dist_dir, os.listdir(dist_dir)[0])
         await pack.unpack_dist(pkg.name, downloaded_dist_file)
         os.remove(downloaded_dist_file)
-        
-        # Check again after unpacking
-        dist_files = os.listdir(dist_dir)
-        if not dist_files:
-            msg = f"No files found in {dist_dir} after unpacking for package {pkg.name}"
-            py2docfx_logger.error(msg)
-            raise FileNotFoundError(f"No files found in {dist_dir} after unpacking")
         if downloaded_dist_file.endswith(".tar.gz"):
             downloaded_dist_file = downloaded_dist_file.rsplit(".", maxsplit=1)[
                 0]
         source_folder = path.join(
             path.dirname(downloaded_dist_file),
-            dist_files[0] if dist_files else ""
+            os.listdir(dist_dir)[0]
         )
     else:
         msg = f"Unknown install type: {pkg.install_type}"

py2docfx/convert_prepare/git.py

@@ -25,7 +25,7 @@ async def clone(repo_location, branch, folder, extra_token=None):
         raise ValueError(msg)
     else:
         # Remove http(s):// from url to record. Further avoid dup-clone.
-        pureURL = re.sub(r"^\s*https?://", "", repo_location)
+        pureURL = re.sub("^\s*https?://", "", repo_location)
 
         if pureURL not in repoMap:
             branch = convertBranch(repo_location, branch, extra_token)

py2docfx/docfx_yaml/logger.py

@@ -77,18 +77,16 @@ def counts_errors_warnings(log_file_path):
                 warning_count += 1
     return warning_count, error_count
 
-def get_warning_error_count():
-    main_log_file_path = os.path.join("logs", "log.txt")
-    warning_count, error_count = counts_errors_warnings(main_log_file_path)
-    
-    log_folder_path = os.path.join("logs", "package_logs")
-    # Check if the directory exists before trying to list its contents
-    if os.path.exists(log_folder_path) and os.path.isdir(log_folder_path):
-        for log_file in os.listdir(log_folder_path):
-            log_file_path = os.path.join(log_folder_path, log_file)
-            warnings, errors = counts_errors_warnings(log_file_path)
-            warning_count += warnings
-            error_count += errors
+def get_warning_error_count():
+    main_log_file_path = os.path.join("logs", "log.txt")
+    warning_count, error_count = counts_errors_warnings(main_log_file_path)
+    
+    log_folder_path = os.path.join("logs", "package_logs")
+    for log_file in os.listdir(log_folder_path):
+        log_file_path = os.path.join(log_folder_path, log_file)
+        warnings, errors = counts_errors_warnings(log_file_path)
+        warning_count += warnings
+        error_count += errors
     
     return warning_count, error_count
 
@@ -120,17 +118,15 @@ def print_out_log_by_log_level(log_list, log_level):
         if log['level'] >= log_level and log['message'] not in ['', '\n', '\r\n']:
             print(log['message'])
 
-def output_log_by_log_level():
-    log_level = get_log_level()
-    main_log_file_path = os.path.join("logs", "log.txt")
-    print_out_log_by_log_level(parse_log(main_log_file_path), log_level)
-    
-    package_logs_folder = os.path.join("logs", "package_logs")
-    # Check if the directory exists before trying to list its contents
-    if os.path.exists(package_logs_folder) and os.path.isdir(package_logs_folder):
-        for log_file in os.listdir(package_logs_folder):
-            log_file_path = os.path.join(package_logs_folder, log_file)
-            print_out_log_by_log_level(parse_log(log_file_path), log_level)
+def output_log_by_log_level():
+    log_level = get_log_level()
+    main_log_file_path = os.path.join("logs", "log.txt")
+    print_out_log_by_log_level(parse_log(main_log_file_path), log_level)
+    
+    package_logs_folder = os.path.join("logs", "package_logs")
+    for log_file in os.listdir(package_logs_folder):
+        log_file_path = os.path.join(package_logs_folder, log_file)
+        print_out_log_by_log_level(parse_log(log_file_path), log_level)
 
 async def run_async_subprocess(exe_path, cmd, logger, cwd=None):
     if cwd is None:

{py2docfx-0.1.19.dev2192444.dist-info → py2docfx-0.1.19.dev2192635.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py2docfx
-Version: 0.1.19.dev2192444
+Version: 0.1.19.dev2192635
 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.19.dev2192444.dist-info → py2docfx-0.1.19.dev2192635.dist-info}/RECORD

@@ -1,13 +1,13 @@
 py2docfx/__init__.py,sha256=kPRhPGPC1JknDotkksG428c1iIgfFr_4_7Jm-llrowY,72
-py2docfx/__main__.py,sha256=NDKRx5RhLJP6Z6zFEdGZJje69jxPaGeHLU_2e5GYUO4,5958
+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=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=I_-QXXFFraMruDf13xlkwGAs5hDuv-wAjW3w-ylOw2Q,6930
-py2docfx/convert_prepare/git.py,sha256=Cq76ooxejKlVJiJWWbBhbLZ_JvxqN2ka12L8jkl80b4,6492
+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
 py2docfx/convert_prepare/package_info.py,sha256=-zrMNeAkHxxzLRjBl1kRehUJy_ugc16yns-xdcAHQIQ,7711
@@ -65,7 +65,7 @@ py2docfx/docfx_yaml/convert_enum.py,sha256=HX6qdjDbdbBblx-TH41JXBLIJY3wzL3if-qnL
 py2docfx/docfx_yaml/convert_module.py,sha256=GptO1MRwaQ2Qbu724F0kCDDQQTZe7mWOtrOp3Rzgl-I,2259
 py2docfx/docfx_yaml/convert_package.py,sha256=Ep7PmvoLInDvY6OU5dveR6iVwyzGRkW3q6lX7yGJ0JE,2109
 py2docfx/docfx_yaml/directives.py,sha256=zVVuNM_6AU9G6sbqL1UAyHHgPe7bkBWbthXI-PO5ez0,879
-py2docfx/docfx_yaml/logger.py,sha256=V09O17R0YFvLFKKc5-aSXWO4iFufQzpgaxMa6EzNqHM,6817
+py2docfx/docfx_yaml/logger.py,sha256=gz416vqSqmsD91qLOCLAzomczlCfWqGXFJFRzLlVbJE,6503
 py2docfx/docfx_yaml/miss_reference.py,sha256=NHoQtas0kvFsJXaR4fsk7kHjwV4aJobrr_Q30HaUc_I,2450
 py2docfx/docfx_yaml/nodes.py,sha256=tBDi35jLJArlobl07DKOkmH2qz7dudXLp_kTUfR_r2w,412
 py2docfx/docfx_yaml/parameter_utils.py,sha256=04wQCtbS-G2hWM5UGkL22s10LZLUbqbh3RM9rWGOToI,10897
@@ -3913,7 +3913,7 @@ py2docfx/venv/venv1/Lib/site-packages/wheel/_commands/convert.py,sha256=0wSJMU0m
 py2docfx/venv/venv1/Lib/site-packages/wheel/_commands/pack.py,sha256=o3iwjfRHl7N9ul-M2kHbewLJZnqBLAWf0tzUCwoiTMw,3078
 py2docfx/venv/venv1/Lib/site-packages/wheel/_commands/tags.py,sha256=Rv2ySVb8-qX3osKp3uJgxcIMXkjt43XUD0-zvC6KvnY,4775
 py2docfx/venv/venv1/Lib/site-packages/wheel/_commands/unpack.py,sha256=Y_J7ynxPSoFFTT7H0fMgbBlVErwyDGcObgme5MBuz58,1021
-py2docfx-0.1.19.dev2192444.dist-info/METADATA,sha256=MCJHbQ0eJXL1aKxUwM6tcI_20MWWar1J5QUqgG5_Hzo,548
-py2docfx-0.1.19.dev2192444.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-py2docfx-0.1.19.dev2192444.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
-py2docfx-0.1.19.dev2192444.dist-info/RECORD,,
+py2docfx-0.1.19.dev2192635.dist-info/METADATA,sha256=hez1GaWFLjHZZRtBrbfBvYu5vH5liEZK7Q0nHR1pSS4,548
+py2docfx-0.1.19.dev2192635.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+py2docfx-0.1.19.dev2192635.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
+py2docfx-0.1.19.dev2192635.dist-info/RECORD,,