Normalize pypi package name (PEP 0503) (#181)

Signed-off-by: Jiyeong Seok <[email protected]>
fosslight · Dec 12, 2023 · 7faab9b · 7faab9b
1 parent d3adf08
commit 7faab9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/fosslight_dependency/package_manager/Npm.py b/src/fosslight_dependency/package_manager/Npm.py
@@ -103,7 +103,7 @@ def parse_transitive_relationship(self):
         err_msg = ''
 
         cmd = 'npm ls -a --omit=dev --json -s'
-        result = subprocess.run(cmd, shell=True, capture_output=True, text=True)
+        result = subprocess.run(cmd, shell=True, capture_output=True, text=True, encoidng='utf-8')
         rel_tree = result.stdout
         if rel_tree is None:
             logger.error(f"It returns the error: {cmd}")

diff --git a/src/fosslight_dependency/package_manager/Pypi.py b/src/fosslight_dependency/package_manager/Pypi.py
@@ -9,6 +9,7 @@
 import json
 import shutil
 import copy
+import re
 import fosslight_util.constant as constant
 import fosslight_dependency.constant as const
 from fosslight_dependency._package_manager import PackageManager
@@ -267,6 +268,7 @@ def parse_oss_information(self, f_name):
 
             for d in json_data:
                 oss_init_name = d['Name']
+                oss_init_name = re.sub(r"[-_.]+", "-", oss_init_name).lower()
                 oss_name = f"{self.package_manager_name}:{oss_init_name}"
                 license_name = check_UNKNOWN(d['License'])
                 homepage = check_UNKNOWN(d['URL'])