fosslight-util 2.1.18__py3-none-any.whl → 2.1.20__py3-none-any.whl

fosslight_util/_get_downloadable_url.py

@@ -5,7 +5,6 @@
 import logging
 import re
 import requests
-from npm.bindings import npm_run
 from lastversion import latest
 from bs4 import BeautifulSoup
 from urllib.request import urlopen
@@ -17,6 +16,7 @@ logger = logging.getLogger(constant.LOGGER_NAME)
 def extract_name_version_from_link(link):
     oss_name = ""
     oss_version = ""
+    matched = False
     if link.startswith("www."):
         link = link.replace("www.", "https://www.", 1)
     for key, value in constant.PKG_PATTERN.items():
@@ -56,7 +56,10 @@ def extract_name_version_from_link(link):
                 if key in ["pypi", "maven", "npm", "npm2", "pub", "go"]:
                     oss_version, link = get_latest_package_version(link, key, origin_name)
                     logger.info(f'Try to download with the latest version:{link}')
+            matched = True
             break
+    if not matched:
+        key = ""
     return oss_name, oss_version, link, key
 
 
@@ -66,10 +69,11 @@ def get_latest_package_version(link, pkg_type, oss_name):
 
     try:
         if pkg_type in ['npm', 'npm2']:
-            stderr, stdout = npm_run('view', oss_name, 'version')
-            if stdout:
-                find_version = stdout.strip()
-            link_with_version = f'https://www.npmjs.com/package/{oss_name}/v/{find_version}'
+            npm_response = requests.get(f"https://registry.npmjs.org/{oss_name}")
+            if npm_response.status_code == 200:
+                find_version = npm_response.json().get("dist-tags", {}).get("latest")
+            if find_version:
+                link_with_version = f'https://www.npmjs.com/package/{oss_name}/v/{find_version}'
         elif pkg_type == 'pypi':
             find_version = str(latest(oss_name, at='pip', output_format='version', pre_ok=True))
             link_with_version = f'https://pypi.org/project/{oss_name}/{find_version}'
@@ -78,17 +82,20 @@ def get_latest_package_version(link, pkg_type, oss_name):
             if maven_response.status_code == 200:
                 find_version = maven_response.json().get('versions')[-1].get('versionKey').get('version')
             oss_name = oss_name.replace(':', '/')
-            link_with_version = f'https://mvnrepository.com/artifact/{oss_name}/{find_version}'
+            if find_version:
+                link_with_version = f'https://mvnrepository.com/artifact/{oss_name}/{find_version}'
         elif pkg_type == 'pub':
             pub_response = requests.get(f'https://pub.dev/api/packages/{oss_name}')
             if pub_response.status_code == 200:
                 find_version = pub_response.json().get('latest').get('version')
-            link_with_version = f'https://pub.dev/packages/{oss_name}/versions/{find_version}'
+            if find_version:
+                link_with_version = f'https://pub.dev/packages/{oss_name}/versions/{find_version}'
         elif pkg_type == 'go':
             go_response = requests.get(f'https://proxy.golang.org/{oss_name}/@latest')
             if go_response.status_code == 200:
                 find_version = go_response.json().get('Version')
-            link_with_version = f'https://pkg.go.dev/{oss_name}@{find_version}'
+            if find_version:
+                link_with_version = f'https://pkg.go.dev/{oss_name}@{find_version}'
     except Exception as e:
         logger.info(f'Fail to get latest package version({link}:{e})')
     return find_version, link_with_version

{fosslight_util-2.1.18.dist-info → fosslight_util-2.1.20.dist-info}/METADATA

@@ -1,21 +1,18 @@
 Metadata-Version: 2.1
 Name: fosslight-util
-Version: 2.1.18
+Version: 2.1.20
 Summary: FOSSLight Util
 Home-page: https://github.com/fosslight/fosslight_util
+Download-URL: https://github.com/fosslight/fosslight_util
 Author: LG Electronics
 License: Apache-2.0
-Download-URL: https://github.com/fosslight/fosslight_util
-Platform: UNKNOWN
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: XlsxWriter
 Requires-Dist: pandas
 Requires-Dist: openpyxl
@@ -27,13 +24,9 @@ Requires-Dist: python3-wget
 Requires-Dist: beautifulsoup4
 Requires-Dist: jsonmerge
 Requires-Dist: setuptools>=65.5.1
-Requires-Dist: npm
+Requires-Dist: numpy
 Requires-Dist: requests
 Requires-Dist: GitPython
-Requires-Dist: numpy; python_version < "3.8"
-Requires-Dist: numpy>=1.22.2; python_version >= "3.8"
-Requires-Dist: pygit2==1.6.1; python_version < "3.7"
-Requires-Dist: pygit2>=1.10.1; python_version >= "3.7"
 Requires-Dist: spdx-tools==0.8.*; sys_platform == "linux"
 Requires-Dist: cyclonedx-python-lib==8.5.*; sys_platform == "linux"
 
@@ -68,7 +61,7 @@ It is a package that supports common utils used by FOSSLight Scanner.
 
 ## 📋 Prerequisite
 
-FOSSLight Util needs a Python 3.6+.
+FOSSLight Util needs a Python 3.10+.
 
 ## 🎉 How to install
 
@@ -82,7 +75,7 @@ $ pip3 install fosslight_util
 
 Three modules can be called. Please refer to each file for detailed calling method.
 
-
+   
 ### 1. Setup logger (tests/test_log.py)
 ```
 from fosslight_util.set_log import init_log
@@ -103,7 +96,7 @@ def test():
     logger.warning("TESTING - Print log")
 ```
 
-
+  
 ### 2. Write result files (tests/test_output_format.py)
 ```
 from fosslight_util.output_format import write_output_file
@@ -119,7 +112,7 @@ def test():
                         '0.4.3', 'Apache-2.0', 'https://github.com/jpeddicord/askalono', '', 'Copyright (c) 2018 Amazon.com, Inc. or its affiliates.', '', '']]}
     success, msg = write_output_file('test_result/excel/FOSSLight-Report', '.xlsx', sheet_contents)
 ```
-
+  
 ### 3. Get spdx licenses (tests/test_spdx_licenses.py)
 ```
 from fosslight_util.spdx_licenses import get_spdx_licenses_json
@@ -185,5 +178,3 @@ Please report any ideas or bugs to improve by creating an issue in [fosslight_ut
 FOSSLight Util is released under [Apache-2.0][l].
 
 [l]: https://github.com/fosslight/fosslight_util/blob/main/LICENSE
-
-

{fosslight_util-2.1.18.dist-info → fosslight_util-2.1.20.dist-info}/RECORD

@@ -1,5 +1,5 @@
 fosslight_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fosslight_util/_get_downloadable_url.py,sha256=SqXCESg1GVXhCpObZoceXdFJVecDrDp-7qW88w0QsCY,12091
+fosslight_util/_get_downloadable_url.py,sha256=p6vSYr6BdSwqafqMX3Cl5M45MSE9N02w512Mh5C2Hyo,12355
 fosslight_util/compare_yaml.py,sha256=eLqqCLgERxRHN5vsnpQVMXIEU862Lx66mD_y4uMgQE4,2916
 fosslight_util/constant.py,sha256=zElnWOzXt020sYiFTiRQn8ZjZyZpL3aPmfAqfQLcxJk,2278
 fosslight_util/correct.py,sha256=1WEAL-9_KhjFPLucPhv0PNN3K7avm0z8mU6sTuSyeHM,3864
@@ -24,9 +24,9 @@ fosslight_util/write_yaml.py,sha256=QlEKoIPQsEaYERfbP53TeKgnllYzhLQWm5wYjnWtVjE,
 fosslight_util/resources/frequentLicenselist.json,sha256=GUhzK6tu7ok10fekOnmVmUgIGRC-acGABZKTNKfDyYA,4776157
 fosslight_util/resources/frequent_license_nick_list.json,sha256=ryU2C_6ZxHbz90_sUN9OvI9GXkCMLu7oGcmd9W79YYo,5005
 fosslight_util/resources/licenses.json,sha256=mK55z-bhY7Mjpj2KsO1crKGGL-X3F6MBFQJ0zLlx010,240843
-fosslight_util-2.1.18.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_util-2.1.18.dist-info/METADATA,sha256=eiYd-q6MOwvzp-SPII-NU2MPNQs6rdm9PgPZEWdweFY,6500
-fosslight_util-2.1.18.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-fosslight_util-2.1.18.dist-info/entry_points.txt,sha256=bzXX5i7HZ13V8BLKvtu_9KO3ZjtRypH-XszOXT6I3bU,69
-fosslight_util-2.1.18.dist-info/top_level.txt,sha256=2qyYWGLakgBRy4BqoBNt-I5C29tBr_e93e5e1pbuTGA,15
-fosslight_util-2.1.18.dist-info/RECORD,,
+fosslight_util-2.1.20.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_util-2.1.20.dist-info/METADATA,sha256=Xu9Tf7A99Bco8gbf9rdM-y2m9-F--XxOXLTDUJtEQqY,6156
+fosslight_util-2.1.20.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+fosslight_util-2.1.20.dist-info/entry_points.txt,sha256=0yZggRWNwDaClDG8UmUA10UFG8cVX3Jiy5gG9nW7hJs,68
+fosslight_util-2.1.20.dist-info/top_level.txt,sha256=2qyYWGLakgBRy4BqoBNt-I5C29tBr_e93e5e1pbuTGA,15
+fosslight_util-2.1.20.dist-info/RECORD,,

{fosslight_util-2.1.18.dist-info → fosslight_util-2.1.20.dist-info}/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 fosslight_download = fosslight_util.download:main
-