Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/fosslight_util/compare_yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@
# 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'
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:
Expand Down
69 changes: 0 additions & 69 deletions src/fosslight_util/convert_excel_to_yaml.py

This file was deleted.

6 changes: 5 additions & 1 deletion tests/legacy/test_compare_yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@
import os
import json
from fosslight_util.compare_yaml import compare_yaml
from fosslight_util.parsing_yaml import parsing_yml


def main():
cur = os.getcwd()
result = compare_yaml(os.path.join(cur, 'before.yaml'), os.path.join(cur, 'after.yaml'))
resources = os.path.join(cur, 'resources')
before_fileitems, _, _ = parsing_yml(os.path.join(resources, 'before.yaml'), resources)
after_fileitems, _, _ = parsing_yml(os.path.join(resources, 'after.yaml'), resources)
result = compare_yaml(before_fileitems, after_fileitems)
print(json.dumps(result, indent=4, sort_keys=True))


Expand Down
20 changes: 0 additions & 20 deletions tests/legacy/test_convert_to_yaml.py

This file was deleted.

Loading