Skip to content

Commit 7faab9b

Browse files
authored
Normalize pypi package name (PEP 0503) (#181)
Signed-off-by: Jiyeong Seok <[email protected]>
1 parent d3adf08 commit 7faab9b

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/fosslight_dependency/package_manager/Npm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def parse_transitive_relationship(self):
103103
err_msg = ''
104104

105105
cmd = 'npm ls -a --omit=dev --json -s'
106-
result = subprocess.run(cmd, shell=True, capture_output=True, text=True)
106+
result = subprocess.run(cmd, shell=True, capture_output=True, text=True, encoidng='utf-8')
107107
rel_tree = result.stdout
108108
if rel_tree is None:
109109
logger.error(f"It returns the error: {cmd}")

src/fosslight_dependency/package_manager/Pypi.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import json
1010
import shutil
1111
import copy
12+
import re
1213
import fosslight_util.constant as constant
1314
import fosslight_dependency.constant as const
1415
from fosslight_dependency._package_manager import PackageManager
@@ -267,6 +268,7 @@ def parse_oss_information(self, f_name):
267268

268269
for d in json_data:
269270
oss_init_name = d['Name']
271+
oss_init_name = re.sub(r"[-_.]+", "-", oss_init_name).lower()
270272
oss_name = f"{self.package_manager_name}:{oss_init_name}"
271273
license_name = check_UNKNOWN(d['License'])
272274
homepage = check_UNKNOWN(d['URL'])

0 commit comments

Comments
 (0)