fosslight-dependency 3.13.9__tar.gz → 3.14.0__tar.gz

{fosslight_dependency-3.13.9 → fosslight_dependency-3.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_dependency
-Version: 3.13.9
+Version: 3.14.0
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics

{fosslight_dependency-3.13.9 → fosslight_dependency-3.14.0}/setup.py

@@ -35,7 +35,7 @@ if __name__ == "__main__":
 
     setup(
         name=_PACKAEG_NAME,
-        version='3.13.9',
+        version='3.14.0',
         package_dir={"": "src"},
         packages=find_namespace_packages(where='src'),
         description='FOSSLight Dependency Scanner',

{fosslight_dependency-3.13.9 → fosslight_dependency-3.14.0}/src/fosslight_dependency/constant.py

@@ -25,7 +25,7 @@ HELM = 'helm'
 
 # Supported package name and manifest file
 SUPPORT_PACKAE = {
-    PYPI: ['requirements.txt', 'setup.py'],
+    PYPI: ['requirements.txt', 'setup.py', 'pyproject.toml'],
     NPM: 'package.json',
     MAVEN: 'pom.xml',
     GRADLE: 'build.gradle',

{fosslight_dependency-3.13.9 → fosslight_dependency-3.14.0}/src/fosslight_dependency/package_manager/Cocoapods.py

@@ -86,7 +86,7 @@ class Cocoapods(PackageManager):
             try:
                 comment_list = []
                 deps_list = []
-                if self.direct_dep:
+                if self.direct_dep and (len(self.direct_dep_list) > 0):
                     if pod_oss_name_origin in self.direct_dep_list:
                         comment_list.append('direct')
                     else:
@@ -98,10 +98,12 @@ class Cocoapods(PackageManager):
                 comment = ','.join(comment_list)
                 deps = ','.join(deps_list)
 
+                oss_name_report = f'{self.package_manager_name}:{pod_oss_name_origin}'
                 pod_oss_name = pod_oss_name_origin
                 if '/' in pod_oss_name_origin:
                     pod_oss_name = pod_oss_name_origin.split('/')[0]
                 if pod_oss_name in external_source_list:
+                    oss_name_report = pod_oss_name_origin
                     podspec_filename = pod_oss_name + '.podspec.json'
                     spec_file_path = os.path.join("Pods", "Local Podspecs", podspec_filename)
                 else:
@@ -126,13 +128,14 @@ class Cocoapods(PackageManager):
                     spec_file_path = os.path.join(file_path_without_version, pod_oss_version, file_path[-1])
 
                 oss_name, oss_version, license_name, dn_loc, homepage = self.get_oss_in_podspec(spec_file_path)
+                if pod_oss_name in external_source_list:
+                    homepage = dn_loc
                 if oss_name == '':
                     continue
                 if pod_oss_version != oss_version:
                     logger.warning(f'{pod_oss_name_origin} has different version({pod_oss_version})\
                                    with spec version({oss_version})')
-                sheet_list.append([const.SUPPORT_PACKAE.get(self.package_manager_name),
-                                  f'{self.package_manager_name}:{pod_oss_name_origin}',
+                sheet_list.append([const.SUPPORT_PACKAE.get(self.package_manager_name), oss_name_report,
                                    pod_oss_version, license_name, dn_loc, homepage, '', '', comment, deps])
             except Exception as e:
                 logger.warning(f"Fail to get {pod_oss_name_origin}:{e}")

{fosslight_dependency-3.13.9 → fosslight_dependency-3.14.0}/src/fosslight_dependency/package_manager/Pypi.py

@@ -75,10 +75,10 @@ class Pypi(PackageManager):
         install_cmd_list = []
         for manifest_file in manifest_files:
             if os.path.exists(manifest_file):
-                if manifest_file == 'setup.py':
-                    install_cmd_list.append("pip install .")
-                elif manifest_file == 'requirements.txt':
+                if manifest_file == 'requirements.txt':
                     install_cmd_list.append("pip install -r requirements.txt")
+                else:
+                    install_cmd_list.append("pip install .")
             else:
                 manifest_files.remove(manifest_file)
                 self.set_manifest_file(manifest_files)
@@ -237,7 +237,7 @@ class Pypi(PackageManager):
             install_deptree_command = f"pip install {pipdeptree}"
             command_list.append(install_deptree_command)
             uninstall_deptree_command = f"pip uninstall -y {pipdeptree}"
-        pipdeptree_command = f"{pipdeptree} --local-only --json-tree -e pipdeptree > {self.tmp_deptree_file}"
+        pipdeptree_command = f"{pipdeptree} --json-tree -e 'pipdeptree,pip,wheel,setuptools' > {self.tmp_deptree_file}"
         command_list.append(pipdeptree_command)
         command_list.append(uninstall_deptree_command)
         command_list.append(deactivate_command)
@@ -247,8 +247,16 @@ class Pypi(PackageManager):
             cmd_ret = subprocess.call(command, shell=True)
             if cmd_ret == 0:
                 self.append_input_package_list_file(self.tmp_file_name)
+                with open(self.tmp_file_name, 'r', encoding='utf-8') as json_f:
+                    json_data = json.load(json_f)
+                    for d in json_data:
+                        self.total_dep_list.append(re.sub(r"[-_.]+", "-", d['Name']).lower())
                 if len(pip_license_pkg_list) != 0:
                     self.append_input_package_list_file(self.tmp_pip_license_info_file_name)
+                    with open(self.tmp_pip_license_info_file_name, 'r', encoding='utf-8') as json_f:
+                        json_data = json.load(json_f)
+                        for d in json_data:
+                            self.total_dep_list.append(re.sub(r"[-_.]+", "-", d['Name']).lower())
             else:
                 logger.error(f"Failed to run command: {command}")
                 ret = False
@@ -287,7 +295,9 @@ class Pypi(PackageManager):
 
                 comment_list = []
                 deps_list = []
-                if self.direct_dep_list:
+                if oss_init_name == self.package_name:
+                    comment_list.append('root package')
+                elif self.direct_dep and len(self.direct_dep_list) > 0:
                     if f'{oss_init_name}({oss_version})' in self.direct_dep_list:
                         comment_list.append('direct')
                     else:
@@ -312,12 +322,12 @@ class Pypi(PackageManager):
         deps = 'dependencies'
         installed_ver = 'installed_version'
 
-        pkg_name = package[package_name]
+        pkg_name = re.sub(r"[-_.]+", "-", package[package_name]).lower()
         pkg_ver = package[installed_ver]
         dependency_list = package[deps]
         dependencies[f"{pkg_name}({pkg_ver})"] = []
         for dependency in dependency_list:
-            dep_name = dependency[package_name]
+            dep_name = re.sub(r"[-_.]+", "-", dependency[package_name]).lower()
             dep_version = dependency[installed_ver]
             dependencies[f"{pkg_name}({pkg_ver})"].append(f"{dep_name}({dep_version})")
             if dependency[deps] != []:
@@ -332,8 +342,20 @@ class Pypi(PackageManager):
 
         with open(self.tmp_deptree_file, 'r', encoding='utf8') as f:
             json_f = json.load(f)
-            for package in json_f:
-                self.direct_dep_list.append(f"{package['package_name']}({package['installed_version']})")
+            root_package = json_f
+            if ('pyproject.toml' in self.manifest_file_name) or ('setup.py' in self.manifest_file_name):
+                direct_without_system_package = 0
+                for package in root_package:
+                    package_name = re.sub(r"[-_.]+", "-", package['package_name']).lower()
+                    if package_name in self.total_dep_list:
+                        direct_without_system_package += 1
+                if direct_without_system_package == 1:
+                    self.package_name = re.sub(r"[-_.]+", "-", json_f[0]['package_name']).lower()
+                    root_package = json_f[0]['dependencies']
+
+            for package in root_package:
+                package_name = re.sub(r"[-_.]+", "-", package['package_name']).lower()
+                self.direct_dep_list.append(f"{package_name}({package['installed_version']})")
                 if package['dependencies'] == []:
                     continue
                 self.relation_tree = self.get_dependencies(self.relation_tree, package)

{fosslight_dependency-3.13.9 → fosslight_dependency-3.14.0}/src/fosslight_dependency.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-dependency
-Version: 3.13.9
+Version: 3.14.0
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics