From d7f7d7a205ba0dc39586018a31bcb7f935c73135 Mon Sep 17 00:00:00 2001 From: Henrik Sandklef Date: Fri, 2 Jan 2026 17:31:16 +0100 Subject: [PATCH 1/3] move resource functions to utils --- licomp_toolkit/__main__.py | 24 ++---------------------- licomp_toolkit/utils.py | 25 +++++++++++++++++++++++++ licomp_toolkit_test.tmp | 6 ------ 3 files changed, 27 insertions(+), 28 deletions(-) delete mode 100644 licomp_toolkit_test.tmp diff --git a/licomp_toolkit/__main__.py b/licomp_toolkit/__main__.py index 3e8de23..06b6e3a 100755 --- a/licomp_toolkit/__main__.py +++ b/licomp_toolkit/__main__.py @@ -18,6 +18,7 @@ from licomp_toolkit.schema_checker import LicompToolkitSchemaChecker from licomp_toolkit.suggester import OutboundSuggester from licomp_toolkit.display_compatibility import DisplayCompatibility +from licomp_toolkit.utils import resources_to_use from licomp.main_base import LicompParser from licomp.interface import UseCase @@ -42,25 +43,6 @@ def validate(self, args): LicompToolkitSchemaChecker().validate_file(args.file_name, deep=True) return None, ReturnCodes.LICOMP_OK.value, None - def _resources_to_use(self, args): - lt = LicompToolkit() - resources = args.resources - new_resources = [] - unsupported = [] - if args.resources == ['all']: - new_resources = list(lt.licomp_resources().keys()) - return new_resources, [] - for resource in resources: - if 'licomp' not in resource: - resource = f'licomp_{resource}' - else: - resource = resource.replace('-', '_') - - if not self.resource_avilable(resource): - unsupported.append(resource) - else: - new_resources.append(resource) - return new_resources, unsupported def verify(self, args): formatter = LicompToolkitFormatter.formatter(self.args.output_format) @@ -70,7 +52,7 @@ def verify(self, args): else: detailed_report = True - resources, unsupported = self._resources_to_use(args) + resources, unsupported = resources_to_use(args) if unsupported: return f'Resource(s) {", ".join(unsupported)} is/are not supported', ReturnCodes.LICOMP_UNSUPPORTED_RESOURCE.value, True expr_checker = ExpressionExpressionChecker() @@ -171,8 +153,6 @@ def versions(self, args): formatter = LicompToolkitFormatter.formatter(args.output_format) return formatter.format_licomp_versions(self.licomp_toolkit.versions()), ReturnCodes.LICOMP_OK.value, False - def resource_avilable(self, resource): - return resource in self.licomp_toolkit.licomp_resources().keys() def _working_return_code(return_code): return return_code >= 0 and return_code < ReturnCodes.LICOMP_LAST_SUCCESSFUL_CODE.value diff --git a/licomp_toolkit/utils.py b/licomp_toolkit/utils.py index 1597feb..5939ad6 100644 --- a/licomp_toolkit/utils.py +++ b/licomp_toolkit/utils.py @@ -6,6 +6,7 @@ import logging from licomp.interface import Licomp +from licomp_toolkit.toolkit import LicompToolkit from licomp.return_codes import compatibility_status_to_returncode from licomp.return_codes import ReturnCodes @@ -49,3 +50,27 @@ def _inc_map(_map, _name): new = curr + 1 _map[_name] = new return _map + +def resource_avilable(resource, licomp_toolkit): + return resource in licomp_toolkit.licomp_resources().keys() + +def resources_to_use(args): + lt = LicompToolkit() + resources = args.resources + new_resources = [] + unsupported = [] + if args.resources == ['all']: + new_resources = list(lt.licomp_resources().keys()) + return new_resources, [] + for resource in resources: + if 'licomp' not in resource: + resource = f'licomp_{resource}' + else: + resource = resource.replace('-', '_') + + + if not resource_avilable(resource, lt): + unsupported.append(resource) + else: + new_resources.append(resource) + return new_resources, unsupported diff --git a/licomp_toolkit_test.tmp b/licomp_toolkit_test.tmp deleted file mode 100644 index e101afb..0000000 --- a/licomp_toolkit_test.tmp +++ /dev/null @@ -1,6 +0,0 @@ -digraph depends { - graph [label="License Compatibility Graph (library)" labelloc=t] - node [shape=plaintext] - "MIT" -> "BSD-3-Clause" [color="darkblue" style="dotted"] - "BSD-3-Clause" -> "MIT" [color="darkgreen" ] -} From 146a189c8921284930383cdd28e3adeaa4ce3ccb Mon Sep 17 00:00:00 2001 From: Henrik Sandklef Date: Fri, 2 Jan 2026 17:35:41 +0100 Subject: [PATCH 2/3] fix flake8 warnings --- licomp_toolkit/__main__.py | 1 - licomp_toolkit/utils.py | 1 - 2 files changed, 2 deletions(-) diff --git a/licomp_toolkit/__main__.py b/licomp_toolkit/__main__.py index 06b6e3a..d96bbb1 100755 --- a/licomp_toolkit/__main__.py +++ b/licomp_toolkit/__main__.py @@ -43,7 +43,6 @@ def validate(self, args): LicompToolkitSchemaChecker().validate_file(args.file_name, deep=True) return None, ReturnCodes.LICOMP_OK.value, None - def verify(self, args): formatter = LicompToolkitFormatter.formatter(self.args.output_format) try: diff --git a/licomp_toolkit/utils.py b/licomp_toolkit/utils.py index 5939ad6..8306539 100644 --- a/licomp_toolkit/utils.py +++ b/licomp_toolkit/utils.py @@ -68,7 +68,6 @@ def resources_to_use(args): else: resource = resource.replace('-', '_') - if not resource_avilable(resource, lt): unsupported.append(resource) else: From a7bf4344a55c74c0964964826ad4645874d57b13 Mon Sep 17 00:00:00 2001 From: update-generated-files-action <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Jan 2026 16:36:53 +0000 Subject: [PATCH 3/3] Autofix (Push test pipeline / generate) https://github.com/hesa/licomp-toolkit/actions/runs/20662147736 --- licomp_toolkit_test.tmp | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 licomp_toolkit_test.tmp diff --git a/licomp_toolkit_test.tmp b/licomp_toolkit_test.tmp new file mode 100644 index 0000000..e101afb --- /dev/null +++ b/licomp_toolkit_test.tmp @@ -0,0 +1,6 @@ +digraph depends { + graph [label="License Compatibility Graph (library)" labelloc=t] + node [shape=plaintext] + "MIT" -> "BSD-3-Clause" [color="darkblue" style="dotted"] + "BSD-3-Clause" -> "MIT" [color="darkgreen" ] +}