rel 2024.1.4

Author: FredHappyface

.gitignore

@@ -2,6 +2,8 @@ requirements_optional.txt
 poetry.lock
 *.~lock*
 *.sqlite
+tests/data/test_main_tc*.*
+!tests/data/test_main_tc*_expected.*
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

CHANGELOG.md

@@ -3,6 +3,18 @@
 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).
 
+## 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
+
+  ```txt
+  py311: OK (7.55=setup[5.89]+cmd[1.66] seconds)
+  py310: SKIP (0.02 seconds)
+  py39: SKIP (0.02 seconds)
+  py38: OK (6.23=setup[4.30]+cmd[1.94] seconds)
+  congratulations :) (13.95 seconds)
+  ```
+
 ## 2024.1.3 - 2024/03/20
 
 - fix https://github.com/FHPythonUtils/LicenseCheck/issues/74

documentation/reference/licensecheck/packageinfo.md

@@ -23,7 +23,9 @@ Get a string from a key from pkgMetadata.
 #### Signature
 
 ```python
-def _pkgMetadataGet(pkgMetadata: metadata.PackageMetadata, key: str) -> str: ...
+def _pkgMetadataGet(
+    pkgMetadata: metadata.PackageMetadata | dict[str, Any], key: str
+) -> str: ...
 ```
 
 

licensecheck/packageinfo.py

@@ -14,12 +14,12 @@
 from licensecheck.types import JOINS, UNKNOWN, PackageInfo, ucstr
 
 
-def _pkgMetadataGet(pkgMetadata: metadata.PackageMetadata, key: str) -> str:
+def _pkgMetadataGet(pkgMetadata: metadata.PackageMetadata | dict[str, Any], key: str) -> str:
 	"""Get a string from a key from pkgMetadata."""
-	value = pkgMetadata.json.get(key, UNKNOWN)
-	if isinstance(value, str):
-		return value
-	return JOINS.join(value)
+	value = pkgMetadata.get(key, UNKNOWN)
+	if not isinstance(value, str):
+		value = JOINS.join(value)
+	return value or UNKNOWN
 
 
 def getPackageInfoLocal(requirement: ucstr) -> PackageInfo:
@@ -35,11 +35,11 @@ def getPackageInfoLocal(requirement: ucstr) -> PackageInfo:
 		pkgMetadata = metadata.metadata(requirement)
 		lice = licenseFromClassifierlist(pkgMetadata.get_all("Classifier"))
 		if lice == UNKNOWN:
-			lice = _pkgMetadataGet(pkgMetadata, "license")
-		homePage = pkgMetadata.get("Home-page", UNKNOWN)
-		author = _pkgMetadataGet(pkgMetadata, "author")
-		name = _pkgMetadataGet(pkgMetadata, "name")
-		version = _pkgMetadataGet(pkgMetadata, "version")
+			lice = _pkgMetadataGet(pkgMetadata, "License")
+		homePage = _pkgMetadataGet(pkgMetadata, "Home-page")
+		author = _pkgMetadataGet(pkgMetadata, "Author")
+		name = _pkgMetadataGet(pkgMetadata, "Name")
+		version = _pkgMetadataGet(pkgMetadata, "Version")
 		size = 0
 		packagePaths = metadata.Distribution.from_name(requirement).files
 		if packagePaths is not None:
@@ -70,7 +70,7 @@ def getPackageInfoPypi(requirement: ucstr) -> PackageInfo:
 	request = session.get(f"https://pypi.org/pypi/{requirement}/json", timeout=60)
 	response = request.json()
 	try:
-		info = response["info"]
+		info = response.get("info", {})
 		licenseClassifier = licenseFromClassifierlist(info["classifiers"])
 
 		size = -1
@@ -79,10 +79,10 @@ def getPackageInfoPypi(requirement: ucstr) -> PackageInfo:
 			size = int(urls[-1]["size"])
 
 		return PackageInfo(
-			name=info["name"],
-			version=info["version"],
-			homePage=info["home_page"],
-			author=info["author"],
+			name=_pkgMetadataGet(info, "name"),
+			version=_pkgMetadataGet(info, "version"),
+			homePage=_pkgMetadataGet(info, "home_page"),
+			author=_pkgMetadataGet(info, "author"),
 			size=size,
 			license=ucstr(
 				licenseClassifier if licenseClassifier != UNKNOWN else info.get("license", UNKNOWN)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "licensecheck"
-version = "2024.1.3"
+version = "2024.1.4"
 license = "mit"
 description = "Output the licenses used by dependencies and check if these are compatible with the project license"
 authors = ["FredHappyface"]