apply fixes, fmt, lint, test

Author: FredHappyface

CHANGELOG.md

@@ -3,10 +3,15 @@
 All major and minor version changes will be documented in this file. Details of
 patch-level version changes can be found in [commit messages](../../commits/master).
 
-## 2025.1.1 - 2025/10/03
+## 2026.0.1
 
 - Fixed GNU Library (old alternative license name) not being recognized as LGPL 2.0.
 - Added UPL-1.0 license to license types and updated the matrix (similar to MIT).
+- Fixed #145 (Bugfix load the show_only_failing from the config), thank you @pgjones
+- Feat #143 (Use ThreadPool Executor to fetch packages concurrently), thanks @atom-andrew
+- Fixed #141 (Support EPL-1.0 and EPL-2.0 license strings), thanks @MattTheCuber
+- Fixed #138 (running licensecheck without any config files), thanks @MattTheCuber
+- Fixed #130 (GNU Library being not recognized, added UPL-1.0), thanks @robertuss12
 
 ## 2025.1.0 - 2025/03/26
 
@@ -17,9 +22,9 @@ patch-level version changes can be found in [commit messages](../../commits/mast
 
 - update the cli interface to remove some confusing functionality
 - refactor the library / code qa improvements
-- Allow for alias of classifier in setup.cfg, thanks https://github.com/ericwb: #106
+- Allow for alias of classifier in setup.cfg, thanks <https://github.com/ericwb>: #106
 - Add support for SPDX license expression metadata after PEP 639: #107
-- Add use regex/glob pattern to ignore multiple packages, thanks https://github.com/JulianKimmig: #108
+- Add use regex/glob pattern to ignore multiple packages, thanks <https://github.com/JulianKimmig>: #108
 - Prioritise ['project'] table over ['tool.poetry'] in pyproject.toml: #104
 - Add option to show only failing packages: #98
 
@@ -30,15 +35,15 @@ patch-level version changes can be found in [commit messages](../../commits/mast
 
 ## 2024.2 - 2024/04/04
 
-- Add html output using `markdown` lib https://github.com/FHPythonUtils/LicenseCheck/issues/77
+- Add html output using `markdown` lib <https://github.com/FHPythonUtils/LicenseCheck/issues/77>
 
 ## 2024.1.5 - 2024/04/04
 
 - fix critical TypeError: can only join an iterable
 
 ## 2024.1.4 - 2024/03/30
 
-- fix critical https://github.com/FHPythonUtils/LicenseCheck/issues/75 where importlib.metadata.PackageMetadata.json does not exist in Python < 3.10
+- fix critical <https://github.com/FHPythonUtils/LicenseCheck/issues/75> where importlib.metadata.PackageMetadata.json does not exist in Python < 3.10
 
   ```txt
   py311: OK (7.55=setup[5.89]+cmd[1.66] seconds)
@@ -50,7 +55,7 @@ patch-level version changes can be found in [commit messages](../../commits/mast
 
 ## 2024.1.3 - 2024/03/20
 
-- fix https://github.com/FHPythonUtils/LicenseCheck/issues/74
+- fix <https://github.com/FHPythonUtils/LicenseCheck/issues/74>
 - update tests (as env has changed, ideally we'd mock more than we do atm)
 - linting fixes
 
@@ -73,45 +78,45 @@ patch-level version changes can be found in [commit messages](../../commits/mast
 ## 2024 - 2024/01/27
 
 - code improvements
-- users can now specify a license from the command line with `--license` https://github.com/FHPythonUtils/LicenseCheck/issues/69
+- users can now specify a license from the command line with `--license` <https://github.com/FHPythonUtils/LicenseCheck/issues/69>
 
 ## 2024 - 2024/01/07
 
 - update dependencies
 
 ## 2023.5.2 - 2023/12/01
 
-- fix: crash when a namespace doesn't exist https://github.com/FHPythonUtils/LicenseCheck/issues/65
-- fix: add support for double quotes in extras https://github.com/FHPythonUtils/LicenseCheck/pull/64,
-  thanks https://github.com/arunkumarpandian
+- fix: crash when a namespace doesn't exist <https://github.com/FHPythonUtils/LicenseCheck/issues/65>
+- fix: add support for double quotes in extras <https://github.com/FHPythonUtils/LicenseCheck/pull/64>,
+  thanks <https://github.com/arunkumarpandian>
 
 ## 2023.5.1 - 2023/09/21
 
-- Fix optional extras from dependencies being included by default. Thank you https://github.com/arunkumarpandian!
-- Dynamically get version from package metadata. Thank you https://github.com/emesar
+- Fix optional extras from dependencies being included by default. Thank you <https://github.com/arunkumarpandian>!
+- Dynamically get version from package metadata. Thank you <https://github.com/emesar>
 - Bump version of rich
 
 ## 2023.4.3 - 2023/08/30
 
-- Add a new flag `--skip-dependencies` which will exclude from the processing a list of the current project dependencies. Suitable for private dependencies which are only available on a private registry and not on PyPi. Thank you https://github.com/Azraeht :)
+- Add a new flag `--skip-dependencies` which will exclude from the processing a list of the current project dependencies. Suitable for private dependencies which are only available on a private registry and not on PyPi. Thank you <https://github.com/Azraeht> :)
 
 ## 2023.4.2 - 2023/08/25
 
-- Fixed Bug: handle missing urls for a pypi package https://github.com/FHPythonUtils/LicenseCheck/issues/57. Thank you https://github.com/Azraeht!
+- Fixed Bug: handle missing urls for a pypi package <https://github.com/FHPythonUtils/LicenseCheck/issues/57>. Thank you <https://github.com/Azraeht>!
 
 ## 2023.4.1 - 2023/08/20
 
-- Fixed Bug: https://github.com/FHPythonUtils/LicenseCheck/issues/55
+- Fixed Bug: <https://github.com/FHPythonUtils/LicenseCheck/issues/55>
 
 ## 2023.4 - 2023/08/20
 
 - Refactor and code enhancements
-- Fixed Bug: fix behaviour of dependency discovery for 'extras', thank you https://github.com/TuriJ95!
-- Fixed Bug: ignore-package not working, thank you https://github.com/mathiasbockwoldt !
+- Fixed Bug: fix behaviour of dependency discovery for 'extras', thank you <https://github.com/TuriJ95>!
+- Fixed Bug: ignore-package not working, thank you <https://github.com/mathiasbockwoldt> !
 
 ## 2023.3 - 2023/07/29
 
-- Fixed Bug: requirements:requirements.txt reading mode, thank you https://github.com/NicolaDonelli
+- Fixed Bug: requirements:requirements.txt reading mode, thank you <https://github.com/NicolaDonelli>
 - Fixed Bug: Permissive libraries are not compatible with closed licenses. Closes #49
 - Fixed Bug: Unexpected warnings for ignored license. Closes #48
 - New Feature: Support option ignore-licenses in pyproject.toml. Closes #46
@@ -134,19 +139,19 @@ patch-level version changes can be found in [commit messages](../../commits/mast
 
 ## 2023.1.2 - 2023/06/24
 
-- Merge PR https://github.com/FHPythonUtils/LicenseCheck/pull/39 (Fixes #38)
+- Merge PR <https://github.com/FHPythonUtils/LicenseCheck/pull/39> (Fixes #38)
 
 ## 2023.1.1 - 2023/03/07
 
-- Merge PR https://github.com/FHPythonUtils/LicenseCheck/pull/33
+- Merge PR <https://github.com/FHPythonUtils/LicenseCheck/pull/33>
   (implements feature: Support for PEP631: Declaring dependencies in pyproject.toml enhancement)
 - Fix crash if setup.cfg exists with no metadata section
-  (https://github.com/FHPythonUtils/LicenseCheck/issues/34)
+  (<https://github.com/FHPythonUtils/LicenseCheck/issues/34>)
 
 ## 2023
 
-- Fix: https://github.com/FHPythonUtils/LicenseCheck/issues/26
-- Fix python 3.8 compatibility, thanks https://github.com/NicolaDonelli !
+- Fix: <https://github.com/FHPythonUtils/LicenseCheck/issues/26>
+- Fix python 3.8 compatibility, thanks <https://github.com/NicolaDonelli> !
 
 ## 2022.3.2 - 2022/12/30
 
@@ -163,13 +168,13 @@ patch-level version changes can be found in [commit messages](../../commits/mast
 
 ## 2022.2.0 - 2022/10/22
 
-- Add support for `setup.cfg` https://github.com/FHPythonUtils/LicenseCheck/issues/21
-  (thank you https://github.com/NicolaDonelli for the code :))
-- Use rich for table rendering https://github.com/FHPythonUtils/LicenseCheck/issues/20
+- Add support for `setup.cfg` <https://github.com/FHPythonUtils/LicenseCheck/issues/21>
+  (thank you <https://github.com/NicolaDonelli> for the code :))
+- Use rich for table rendering <https://github.com/FHPythonUtils/LicenseCheck/issues/20>
 
 ## 2022.1.1 - 2022/04/09
 
-- More detailed warnings per https://github.com/FHPythonUtils/LicenseCheck/issues/19
+- More detailed warnings per <https://github.com/FHPythonUtils/LicenseCheck/issues/19>
 - Add check using spdx identifiers
 
 ## 2022.1 - 2022/04/06
@@ -185,14 +190,14 @@ patch-level version changes can be found in [commit messages](../../commits/mast
 
 ## 2022.0.1 - 2022/02/01
 
-- Hopefully fix https://github.com/FHPythonUtils/LicenseCheck/issues/14 for real this time
+- Hopefully fix <https://github.com/FHPythonUtils/LicenseCheck/issues/14> for real this time
 - Update deps
 - Remove `pip`
 - Replace `tomlkit` with `tomli`
 
 ## 2022 - 2022/01/14
 
-- Fix https://github.com/FHPythonUtils/LicenseCheck/issues/18
+- Fix <https://github.com/FHPythonUtils/LicenseCheck/issues/18>
 
 ## 2021.5.2 - 2021/10/18
 
@@ -201,35 +206,35 @@ patch-level version changes can be found in [commit messages](../../commits/mast
 
 ## 2021.5 - 2021/09/14
 
-- Add `-u poetry:dev` to command-line to include dev packages (excluded by default) per https://github.com/FHPythonUtils/LicenseCheck/issues/16
-- Add support for proprietary license per https://github.com/FHPythonUtils/LicenseCheck/issues/15
-- Raise RuntimeError if missing license and classifier https://github.com/FHPythonUtils/LicenseCheck/issues/14
+- Add `-u poetry:dev` to command-line to include dev packages (excluded by default) per <https://github.com/FHPythonUtils/LicenseCheck/issues/16>
+- Add support for proprietary license per <https://github.com/FHPythonUtils/LicenseCheck/issues/15>
+- Raise RuntimeError if missing license and classifier <https://github.com/FHPythonUtils/LicenseCheck/issues/14>
 - Quality improvements to license_matrix.py
 - Add additional examples to readme
-- Support pre-commit-hooks https://github.com/FHPythonUtils/LicenseCheck/issues/8
+- Support pre-commit-hooks <https://github.com/FHPythonUtils/LicenseCheck/issues/8>
 
 ## 2021.4.1 - 2021/09/07
 
 - Command-line options take precedent over config options as expected
 
 ## 2021.4 - 2021/09/07
 
-- Add config file functionality per https://github.com/FHPythonUtils/LicenseCheck/issues/11
-	- Parsed in the following order: `pyproject.toml`, `setup.cfg`, `licensecheck.toml`, `licensecheck.json`, `licensecheck.ini`, `~/licensecheck.toml`, `~/licensecheck.json`, `~/licensecheck.ini`
-	- Note that the config takes precedent over command-line options
-- Add optional path to requirements.txt as outlined in https://github.com/FHPythonUtils/LicenseCheck/issues/9#issuecomment-898878228
-	- Eg. `licensecheck --using requirements:c:/path/to/reqs.txt;path/to/other/reqs.txt`
+- Add config file functionality per <https://github.com/FHPythonUtils/LicenseCheck/issues/11>
+ 	- Parsed in the following order: `pyproject.toml`, `setup.cfg`, `licensecheck.toml`, `licensecheck.json`, `licensecheck.ini`, `~/licensecheck.toml`, `~/licensecheck.json`, `~/licensecheck.ini`
+ 	- Note that the config takes precedent over command-line options
+- Add optional path to requirements.txt as outlined in <https://github.com/FHPythonUtils/LicenseCheck/issues/9#issuecomment-898878228>
+ 	- Eg. `licensecheck --using requirements:c:/path/to/reqs.txt;path/to/other/reqs.txt`
 
 ## 2021.3 - 2021/08/13
 
-- Add `--ignore-packages`, `--fail-packages`,`--ignore-licenses`, `--fail-licenses`, per https://github.com/FHPythonUtils/LicenseCheck/issues/7
+- Add `--ignore-packages`, `--fail-packages`,`--ignore-licenses`, `--fail-licenses`, per <https://github.com/FHPythonUtils/LicenseCheck/issues/7>
 - Fix spelling
 - Added a couple examples to the readme
 - Added pylintrc to pyproject.toml
 
 ## 2021.2 - 2021/08/13
 
-- Added ability to use requirements.txt per https://github.com/FHPythonUtils/LicenseCheck/issues/6
+- Added ability to use requirements.txt per <https://github.com/FHPythonUtils/LicenseCheck/issues/6>
 - Code clean-up + refactoring
 - Fix spelling
 - packagecompat.py → types.py as this module holds types + typing info
@@ -247,19 +252,19 @@ patch-level version changes can be found in [commit messages](../../commits/mast
 
 - Tidied up
 - Added `--zero/-0` flag to return non-zero exit code when an incompatible
-	license is found
+ license is found
 
 ## 2021 - 2021/01/24
 
 - Updated requirements
 - Fallback to requirements.txt when poetry throws an error and direct the user
-	to troubleshoot
+ to troubleshoot
 
 ## 2020.0.4 - 2020/10/14
 
 - Improved support for GPL fans out there by detecting variants in a more
-	granular manner. Fewer false -ves for said GPL variants. E.g. a dependency with
-	GPL2 only will be flagged for a project using GPL3
+ granular manner. Fewer false -ves for said GPL variants. E.g. a dependency with
+ GPL2 only will be flagged for a project using GPL3
 
 ## 2020.0.3 - 2020/10/12
 

licensecheck/cli.py

@@ -145,10 +145,8 @@ def main(args: dict[str, Any]) -> int:
 	for file in config_files:
 		config += Config.from_path(file, optional=True)
 
-	scopedData: ConfigNode = config.get("tool", {}).get(
-		"licensecheck", ConfigNode()
-	)
-	scopedConfig = {**scopedData.data, **args}
+	scopedData: ConfigNode = config.get("tool", {}).get("licensecheck", ConfigNode())
+	scopedConfig: dict[str, Any] = {**scopedData.data, **args}
 
 	# File
 	requirements_paths = scopedConfig.get("requirements_paths") or ["__stdin__"]
@@ -159,9 +157,7 @@ def main(args: dict[str, Any]) -> int:
 	)
 
 	# Get my license
-	this_license_text = (
-		scopedConfig.get("license") or  packageinfo.ProjectMetadata.get_license()
-	)
+	this_license_text = scopedConfig.get("license") or packageinfo.ProjectMetadata.get_license()
 	this_license = license_matrix.licenseType(this_license_text).pop()
 
 	def getFromConfig(key: str) -> set[types.ucstr]:

licensecheck/license_matrix/__init__.py

@@ -43,7 +43,7 @@
 
 from loguru import logger
 
-from licensecheck.types import JOINS, ucstr
+from licensecheck.types import JOINS, License, ucstr
 from licensecheck.types import License as L
 
 THISDIR = Path(__file__).resolve().parent
@@ -52,7 +52,7 @@
 	LICENSE_MATRIX: list[list[str]] = list[list[str]](csv.reader(csv_file))
 
 
-termToLicense = {
+termToLicenseData = {
 	"UNKNOWN": L.UNKNOWN,
 	"PUBLIC DOMAIN": L.PUBLIC,
 	"CC-PDDC": L.PUBLIC,
@@ -64,7 +64,8 @@
 	"MIT": L.MIT,
 	"BSD": L.BSD,
 	"ISC": L.ISC,
-	"UPL-1.0": L.UPL_1,
+	"EUPL": L.EU,
+	"UPL": L.UPL_1,
 	"NCSA": L.NCSA,
 	"PYTHON": L.PSFL,
 	"PSF-2.0": L.PSFL,
@@ -79,7 +80,7 @@
 	"LGPL-3.0-OR-LATER": L.LGPL_3_PLUS,
 	"LGPL-2.0-ONLY": L.LGPL_2,
 	"LGPLV2": L.LGPL_2,
-	"GNU LIBRARY": L.LGPL_2,
+	"GNU LIBRARY": L.LGPL_X,
 	"LGPL-3.0-ONLY": L.LGPL_3,
 	"LGPLV3": L.LGPL_3,
 	"LGPL": L.LGPL_X,
@@ -95,10 +96,17 @@
 	"GPL-3.0": L.GPL_3,
 	"GPL": L.GPL_X,
 	"MPL": L.MPL,
-	"EUPL": L.EU,
 	"PROPRIETARY": L.PROPRIETARY,
 }
 
+termToLicense: dict[str, License] = dict(
+    sorted(
+        termToLicenseData.items(),
+        key=lambda item: len(item[0]),
+        reverse=True,
+    )
+)
+
 
 def licenseLookup(licenseStr: ucstr, ignoreLicenses: set[ucstr] | None = None) -> L:
 	"""Identify a license from an uppercase string representation of a license.

licensecheck/packageinfo.py

@@ -3,10 +3,10 @@
 from __future__ import annotations
 
 import configparser
-from concurrent.futures import ThreadPoolExecutor
 import contextlib
 import re
 from collections.abc import Iterable
+from concurrent.futures import ThreadPoolExecutor
 from email.message import Message
 from importlib import metadata
 from pathlib import Path
@@ -62,7 +62,7 @@ def getPackages(self) -> set[PackageInfo]:
 		:return set[PackageInfo]: A set of package information objects.
 		"""
 		with ThreadPoolExecutor() as executor:
-			return set(executor.map(self.get_package_info, self.reqs))
+			return set(executor.map(self._get_package_info, self.reqs))
 
 	def _get_package_info(self, package: Requirement) -> PackageInfo:
 		"""Retrieve package information, preferring local data.

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "licensecheck"
-version = "2026.0.0"
+version = "2026.0.1"
 description = "Output the licenses used by dependencies and check if these are compatible with the project license"
 authors = [{ name = "FredHappyface" }]
 requires-python = ">=3.12"

tests/platform_independent/data/licenseCheckLicenses.txt

@@ -71,7 +71,7 @@ UNKNOWN
 UNKNOWN
 UNKNOWN
 UNLICENSE
-UNKNOWN
+UPL_1
 NCSA
 UNKNOWN
 UNKNOWN

tests/platform_independent/test_checker.py

@@ -32,7 +32,8 @@ def test_check(
 	ignore_packages: set[str] | None,
 	fail_packages: set[str] | None,
 	fail_licenses: set[str] | None,
-	*, expected_incompatible: bool,
+	*,
+	expected_incompatible: bool,
 ) -> None:
 	"""Parametrized test for different license check scenarios."""
 	mock_packages = {

tests/platform_independent/test_license_matrix.py

@@ -23,11 +23,14 @@ def test_licenseLookup() -> None:
 		licenses.append(licenseName)
 
 	licenses.append("NO_LICENSE")
+	msgs = []
 	for x in types.License._member_names_:
 		if x not in licenses:
-			msg = f"{x} not in licenses"
-			logger.error(msg)
-			raise AssertionError(msg)
+			msgs.append( f"{x} not in licenses")
+
+	if len(msgs):
+		logger.error(msgs)
+		raise AssertionError(msgs)
 
 	cmp_file = Path(f"{THISDIR}/data/licenseCheckLicenses.txt")
 
@@ -52,7 +55,7 @@ def test_licenseType_unknown() -> None:
 
 def test_licenseType_empty() -> None:
 	no_licenses = {
-		all(x == types.L.NO_LICENSE for x in license_matrix.licenseType(y)) for y in {"", None}
+		all(x == types.L.NO_LICENSE for x in license_matrix.licenseType(y)) for y in ("", None)
 	}
 	assert all(no_licenses)