fosslight-dependency 4.1.22__tar.gz → 4.1.24__tar.gz

{fosslight_dependency-4.1.22 → fosslight_dependency-4.1.24}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fosslight_dependency
-Version: 4.1.22
+Version: 4.1.24
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Download-URL: https://github.com/fosslight/fosslight_dependency_scanner
@@ -17,6 +17,31 @@ License-File: LICENSE
 License-File: LICENSES/Apache-2.0.txt
 License-File: LICENSES/LicenseRef-3rd_party_licenses.txt
 License-File: LICENSES/MIT.txt
+Requires-Dist: openpyxl
+Requires-Dist: beautifulsoup4
+Requires-Dist: lxml
+Requires-Dist: virtualenv
+Requires-Dist: pyyaml
+Requires-Dist: lastversion
+Requires-Dist: fosslight_util>=2.1.30
+Requires-Dist: PyGithub
+Requires-Dist: requirements-parser
+Requires-Dist: defusedxml
+Requires-Dist: packageurl-python
+Requires-Dist: igraph
+Requires-Dist: matplotlib
+Requires-Dist: pyaskalono
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <!--
 Copyright (c) 2021 LG Electronics

{fosslight_dependency-4.1.22 → fosslight_dependency-4.1.24}/requirements.txt

@@ -4,7 +4,7 @@ lxml
 virtualenv
 pyyaml
 lastversion
-fosslight_util>=2.1.18
+fosslight_util>=2.1.30
 PyGithub
 requirements-parser
 defusedxml

{fosslight_dependency-4.1.22 → fosslight_dependency-4.1.24}/setup.py

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

{fosslight_dependency-4.1.22 → fosslight_dependency-4.1.24}/src/fosslight_dependency/package_manager/Android.py

@@ -9,6 +9,7 @@ import fosslight_util.constant as constant
 import fosslight_dependency.constant as const
 from fosslight_dependency._package_manager import PackageManager, get_url_to_purl
 from fosslight_dependency.dependency_item import DependencyItem, change_dependson_to_purl
+from fosslight_util.get_pom_license import get_license_from_pom
 from fosslight_util.oss_item import OssItem
 
 logger = logging.getLogger(constant.LOGGER_NAME)
@@ -55,6 +56,13 @@ class Android(PackageManager):
                         oss_item.download_location, oss_item.homepage = split_str[:7]
                 else:
                     continue
+                if not oss_item.license:
+                    license_names = get_license_from_pom(oss_item.name.split(':')[0],
+                                                         oss_item.name.split(':')[1],
+                                                         oss_item.version)
+                    if license_names:
+                        oss_item.license = license_names
+
                 dep_item.purl = get_url_to_purl(oss_item.download_location, 'maven')
                 purl_dict[f'{oss_item.name}({oss_item.version})'] = dep_item.purl
 

{fosslight_dependency-4.1.22 → fosslight_dependency-4.1.24}/src/fosslight_dependency/package_manager/Gradle.py

@@ -11,6 +11,7 @@ import fosslight_dependency.constant as const
 from fosslight_dependency._package_manager import PackageManager
 from fosslight_dependency._package_manager import version_refine, get_url_to_purl
 from fosslight_dependency.dependency_item import DependencyItem, change_dependson_to_purl
+from fosslight_util.get_pom_license import get_license_from_pom
 from fosslight_util.oss_item import OssItem
 
 logger = logging.getLogger(constant.LOGGER_NAME)
@@ -69,6 +70,10 @@ class Gradle(PackageManager):
                 oss_item.license = ', '.join(license_names)
             except Exception:
                 logger.info("Cannot find the license name")
+            if not oss_item.license:
+                license_names = get_license_from_pom(group_id, artifact_id, oss_ini_version)
+                if license_names:
+                    oss_item.license = license_names
 
             if used_filename or group_id == "":
                 oss_item.download_location = 'Unknown'

{fosslight_dependency-4.1.22 → fosslight_dependency-4.1.24}/src/fosslight_dependency/package_manager/Maven.py

@@ -15,6 +15,7 @@ import fosslight_dependency.constant as const
 from fosslight_dependency._package_manager import PackageManager
 from fosslight_dependency._package_manager import version_refine, get_url_to_purl, change_file_mode
 from fosslight_dependency.dependency_item import DependencyItem, change_dependson_to_purl
+from fosslight_util.get_pom_license import get_license_from_pom
 from fosslight_util.oss_item import OssItem
 
 logger = logging.getLogger(constant.LOGGER_NAME)
@@ -246,6 +247,10 @@ class Maven(PackageManager):
                     if key_license.findtext("name") is not None:
                         license_names.append(key_license.findtext("name").replace(",", ""))
                 oss_item.license = ', '.join(license_names)
+            if not oss_item.license:
+                license_names = get_license_from_pom(groupid, artifactid, version)
+                if license_names:
+                    oss_item.license = license_names
 
             dep_key = f"{oss_item.name}({version})"
 

{fosslight_dependency-4.1.22 → fosslight_dependency-4.1.24}/src/fosslight_dependency/package_manager/Pub.py

@@ -131,6 +131,9 @@ class Pub(PackageManager):
                     oss_item.homepage = ''
                 oss_item.download_location = f"{self.dn_url}{oss_origin_name}/versions/{oss_item.version}"
                 dep_item.purl = get_url_to_purl(oss_item.download_location, self.package_manager_name)
+                if json_data['isSdk']:
+                    oss_item.download_location = json_data['repository'] or json_data['homepage'] or ''
+                    oss_item.comment = 'SDK'
                 purl_dict[f'{oss_origin_name}({oss_item.version})'] = dep_item.purl
                 license_txt = json_data['license']
                 if license_txt is not None:

{fosslight_dependency-4.1.22 → fosslight_dependency-4.1.24}/src/fosslight_dependency.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
-Name: fosslight-dependency
-Version: 4.1.22
+Metadata-Version: 2.4
+Name: fosslight_dependency
+Version: 4.1.24
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Download-URL: https://github.com/fosslight/fosslight_dependency_scanner
@@ -17,6 +17,31 @@ License-File: LICENSE
 License-File: LICENSES/Apache-2.0.txt
 License-File: LICENSES/LicenseRef-3rd_party_licenses.txt
 License-File: LICENSES/MIT.txt
+Requires-Dist: openpyxl
+Requires-Dist: beautifulsoup4
+Requires-Dist: lxml
+Requires-Dist: virtualenv
+Requires-Dist: pyyaml
+Requires-Dist: lastversion
+Requires-Dist: fosslight_util>=2.1.30
+Requires-Dist: PyGithub
+Requires-Dist: requirements-parser
+Requires-Dist: defusedxml
+Requires-Dist: packageurl-python
+Requires-Dist: igraph
+Requires-Dist: matplotlib
+Requires-Dist: pyaskalono
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <!--
 Copyright (c) 2021 LG Electronics

{fosslight_dependency-4.1.22 → fosslight_dependency-4.1.24}/src/fosslight_dependency.egg-info/requires.txt

@@ -4,7 +4,7 @@ lxml
 virtualenv
 pyyaml
 lastversion
-fosslight_util>=2.1.18
+fosslight_util>=2.1.30
 PyGithub
 requirements-parser
 defusedxml