rel 2023.1.2

Author: FredHappyface

CHANGELOG.md

@@ -3,6 +3,10 @@
 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).
 
+## 2023.1.2 - 2023/06/24
+
+- 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

documentation/reference/licensecheck/packageinfo.md

@@ -17,7 +17,7 @@ Packageinfo
 
 ## getModuleSize
 
-[Show source in packageinfo.py:168](../../../licensecheck/packageinfo.py#L168)
+[Show source in packageinfo.py:161](../../../licensecheck/packageinfo.py#L161)
 
 Get the size of a given module as an int.
 
@@ -41,7 +41,7 @@ def getModuleSize(path: Path, name: str) -> int:
 
 ## getMyPackageLicense
 
-[Show source in packageinfo.py:151](../../../licensecheck/packageinfo.py#L151)
+[Show source in packageinfo.py:144](../../../licensecheck/packageinfo.py#L144)
 
 Get the package license from "setup.cfg", "pyproject.toml" or user input
 
@@ -60,7 +60,7 @@ def getMyPackageLicense() -> str:
 
 ## getMyPackageMetadata
 
-[Show source in packageinfo.py:127](../../../licensecheck/packageinfo.py#L127)
+[Show source in packageinfo.py:120](../../../licensecheck/packageinfo.py#L120)
 
 Get the package classifiers and license from "setup.cfg", "pyproject.toml"
 
@@ -79,7 +79,7 @@ def getMyPackageMetadata() -> dict[str, Any]:
 
 ## getPackageInfoLocal
 
-[Show source in packageinfo.py:22](../../../licensecheck/packageinfo.py#L22)
+[Show source in packageinfo.py:16](../../../licensecheck/packageinfo.py#L16)
 
 Get package info from local files including version, author
 and	the license.
@@ -112,7 +112,7 @@ def getPackageInfoLocal(requirement: str) -> PackageInfo:
 
 ## getPackageInfoPypi
 
-[Show source in packageinfo.py:60](../../../licensecheck/packageinfo.py#L60)
+[Show source in packageinfo.py:53](../../../licensecheck/packageinfo.py#L53)
 
 Get package info from local files including version, author
 and	the license.
@@ -145,7 +145,7 @@ def getPackageInfoPypi(requirement: str) -> PackageInfo:
 
 ## getPackages
 
-[Show source in packageinfo.py:105](../../../licensecheck/packageinfo.py#L105)
+[Show source in packageinfo.py:98](../../../licensecheck/packageinfo.py#L98)
 
 Get dependency info.
 
@@ -172,7 +172,7 @@ def getPackages(reqs: set[str]) -> set[PackageInfo]:
 
 ## licenseFromClassifierlist
 
-[Show source in packageinfo.py:85](../../../licensecheck/packageinfo.py#L85)
+[Show source in packageinfo.py:78](../../../licensecheck/packageinfo.py#L78)
 
 Get license string from a list of project classifiers.
 

licensecheck/packageinfo.py

@@ -3,15 +3,9 @@
 from __future__ import annotations
 
 import configparser
-import sys
 from importlib import metadata
-
-if sys.version_info < (3, 9, 0):
-	import importlib_resources as ilr
-else:
-	import importlib.resources as ilr
 from pathlib import Path
-from typing import Any, cast
+from typing import Any
 
 import requests
 import tomli
@@ -37,7 +31,11 @@ def getPackageInfoLocal(requirement: str) -> PackageInfo:
 		author = pkgMetadata.get("Author", UNKNOWN)
 		name = pkgMetadata.get("Name", UNKNOWN)
 		version = pkgMetadata.get("Version", UNKNOWN)
-		size = sum([pp.size for pp in metadata.Distribution.from_name(requirement).files if pp.size is not None])
+		size = 0
+		packagePaths = metadata.Distribution.from_name(requirement).files
+		if packagePaths is not None:
+			size = sum(pp.size for pp in packagePaths if pp.size is not None)
+
 		# append to pkgInfo
 		return PackageInfo(
 			name=name,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "licensecheck"
-version = "2023.1.1"
+version = "2023.1.2"
 license = "mit"
 description = "Output the licenses used by dependencies and check if these are compatible with the project license"
 authors = ["FredHappyface"]
@@ -33,7 +33,6 @@ requests = "<3,>=2.28.1"
 fhconfparser = "<2024,>=2022"
 tomli = "<3,>=2.0.1"
 rich = "<13,>=12.6.0"
-importlib-resources = { version = ">=3.0.0", python = "<3.9" }
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.1.1"

requirements.txt

@@ -1,5 +1,4 @@
 fhconfparser<2024,>=2022
-importlib-resources>=3.0.0;python_version<'3.9'
 requests<3,>=2.28.1
 requirements-parser<2,>=0.5.0
 rich<13,>=12.6.0