fosslight-util 2.1.0__tar.gz → 2.1.1__tar.gz

{fosslight_util-2.1.0 → fosslight_util-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_util
-Version: 2.1.0
+Version: 2.1.1
 Summary: FOSSLight Util
 Home-page: https://github.com/fosslight/fosslight_util
 Author: LG Electronics

{fosslight_util-2.1.0 → fosslight_util-2.1.1}/requirements.txt

@@ -8,7 +8,7 @@ coloredlogs
 python3-wget
 beautifulsoup4
 jsonmerge
-spdx-tools>=0.8.2;sys_platform!="win32"
+spdx-tools==0.8.*;sys_platform=="linux"
 setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
 numpy; python_version < '3.8'
 numpy>=1.22.2; python_version >= '3.8'

{fosslight_util-2.1.0 → fosslight_util-2.1.1}/setup.py

@@ -14,7 +14,7 @@ with open('requirements.txt', 'r', 'utf-8') as f:
 if __name__ == "__main__":
     setup(
         name='fosslight_util',
-        version='2.1.0',
+        version='2.1.1',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Util',

{fosslight_util-2.1.0 → fosslight_util-2.1.1}/src/fosslight_util/compare_yaml.py

@@ -4,7 +4,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import logging
+from typing import List, Dict
 from fosslight_util.constant import LOGGER_NAME
+from fosslight_util.oss_item import FileItem
 
 logger = logging.getLogger(LOGGER_NAME)
 VERSION = 'version'
@@ -12,7 +14,7 @@ LICENSE = 'license'
 NAME = 'name'
 
 
-def compare_yaml(before_fileitems, after_fileitems):
+def compare_yaml(before_fileitems: List[FileItem], after_fileitems: List[FileItem]) -> Dict[str, List]:
     bf_raw = []
     af_raw = []
     for bf in before_fileitems:

{fosslight_util-2.1.0 → fosslight_util-2.1.1}/src/fosslight_util/output_format.py

@@ -183,11 +183,11 @@ def write_output_file(output_file_without_ext: str, file_extension: str, scan_it
         elif format == 'yaml':
             success, msg, _ = write_yaml(result_file, scan_item, False)
         elif format.startswith('spdx'):
-            if platform.system() != 'Windows':
-                success, msg, _ = write_spdx(output_file_without_ext, file_extension, scan_item, spdx_version)
-            else:
+            if platform.system() == 'Windows' or platform.system() == 'Darwin':
                 success = False
-                msg = 'Windows not support spdx format.'
+                msg = f'{platform.system()} not support spdx format.'
+            else:
+                success, msg, _ = write_spdx(output_file_without_ext, file_extension, scan_item, spdx_version)
     else:
         if file_extension == '.xlsx':
             success, msg = write_result_to_excel(result_file, scan_item, extended_header, hide_header)

{fosslight_util-2.1.0 → fosslight_util-2.1.1}/src/fosslight_util.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-util
-Version: 2.1.0
+Version: 2.1.1
 Summary: FOSSLight Util
 Home-page: https://github.com/fosslight/fosslight_util
 Author: LG Electronics

{fosslight_util-2.1.0 → fosslight_util-2.1.1}/src/fosslight_util.egg-info/SOURCES.txt

@@ -7,7 +7,6 @@ src/fosslight_util/__init__.py
 src/fosslight_util/_get_downloadable_url.py
 src/fosslight_util/compare_yaml.py
 src/fosslight_util/constant.py
-src/fosslight_util/convert_excel_to_yaml.py
 src/fosslight_util/correct.py
 src/fosslight_util/cover.py
 src/fosslight_util/download.py

{fosslight_util-2.1.0 → fosslight_util-2.1.1}/src/fosslight_util.egg-info/requires.txt

@@ -25,5 +25,5 @@ pygit2==1.6.1
 [:python_version>='3.7']
 pygit2>=1.10.1
 
-[:sys_platform != "win32"]
-spdx-tools>=0.8.2
+[:sys_platform == "linux"]
+spdx-tools==0.8.*

fosslight_util-2.1.0/src/fosslight_util/convert_excel_to_yaml.py

@@ -1,69 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (c) 2022 LG Electronics Inc.
-# SPDX-License-Identifier: Apache-2.0
-import os
-import sys
-import logging
-import yaml
-import re
-from fosslight_util.constant import LOGGER_NAME
-from fosslight_util.write_yaml import create_yaml_with_ossitem
-from fosslight_util.read_excel import read_oss_report
-
-logger = logging.getLogger(LOGGER_NAME)
-
-
-def find_report_file(path_to_find):
-    file_to_find = ["FOSSLight-Report.xlsx", "OSS-Report.xlsx"]
-
-    try:
-        for file in file_to_find:
-            file_with_path = os.path.join(path_to_find, file)
-            if os.path.isfile(file_with_path):
-                return file
-        for root, dirs, files in os.walk(path_to_find):
-            for file in files:
-                file_name = file.lower()
-                p = re.compile(r"[\s\S]*OSS[\s\S]*-Report[\s\S]*.xlsx", re.I)
-                if p.search(file_name):
-                    return os.path.join(root, file)
-    except Exception as error:
-        logger.debug("Find report:"+str(error))
-    return ""
-
-
-def convert_excel_to_yaml(oss_report_to_read: str, output_file: str, sheet_names: str = "") -> None:
-    _file_extension = ".yaml"
-    yaml_dict = {}
-
-    if os.path.isfile(oss_report_to_read):
-        try:
-            items = read_oss_report(oss_report_to_read, sheet_names)
-            for item in items:
-                create_yaml_with_ossitem(item, yaml_dict)
-            if yaml_dict:
-                output_file = output_file if output_file.endswith(_file_extension) else output_file + _file_extension
-                success = write_yaml_file(output_file, yaml_dict)
-                if success:
-                    logger.warning(f"Output: {output_file}")
-                else:
-                    logger.error(f"Can't write yaml file : {output_file}")
-                    sys.exit(1)
-        except Exception as error:
-            logger.error(f"Convert yaml: {error}")
-    else:
-        logger.error(f"Can't find a file: {oss_report_to_read}")
-
-
-def write_yaml_file(output_file, json_output):
-    success = True
-    error_msg = ""
-
-    try:
-        with open(output_file, 'w') as f:
-            yaml.dump(json_output, f, sort_keys=False)
-    except Exception as ex:
-        error_msg = str(ex)
-        success = False
-    return success, error_msg