Skip to content

Commit f3486ec

Browse files
committed
rel 2023.4.1
1 parent a12cbec commit f3486ec

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All major and minor version changes will be documented in this file. Details of
44
patch-level version changes can be found in [commit messages](../../commits/master).
55

6+
## 2023.4.1 - 2023/08/20
7+
8+
- Fixed Bug: https://github.com/FHPythonUtils/LicenseCheck/issues/55
9+
610
## 2023.4 - 2023/08/20
711

812
- Refactor and code enhancements

documentation/reference/licensecheck/packageinfo.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Packageinfo
1717

1818
## getModuleSize
1919

20-
[Show source in packageinfo.py:160](../../../licensecheck/packageinfo.py#L160)
20+
[Show source in packageinfo.py:162](../../../licensecheck/packageinfo.py#L162)
2121

2222
Get the size of a given module as an int.
2323

@@ -45,7 +45,7 @@ def getModuleSize(path: Path, name: ucstr) -> int:
4545

4646
## getMyPackageLicense
4747

48-
[Show source in packageinfo.py:143](../../../licensecheck/packageinfo.py#L143)
48+
[Show source in packageinfo.py:145](../../../licensecheck/packageinfo.py#L145)
4949

5050
Get the package license from "setup.cfg", "pyproject.toml" or user input
5151

@@ -68,7 +68,7 @@ def getMyPackageLicense() -> ucstr:
6868

6969
## getMyPackageMetadata
7070

71-
[Show source in packageinfo.py:119](../../../licensecheck/packageinfo.py#L119)
71+
[Show source in packageinfo.py:121](../../../licensecheck/packageinfo.py#L121)
7272

7373
Get the package classifiers and license from "setup.cfg", "pyproject.toml"
7474

@@ -155,7 +155,7 @@ def getPackageInfoPypi(requirement: ucstr) -> PackageInfo:
155155

156156
## getPackages
157157

158-
[Show source in packageinfo.py:97](../../../licensecheck/packageinfo.py#L97)
158+
[Show source in packageinfo.py:99](../../../licensecheck/packageinfo.py#L99)
159159

160160
Get dependency info.
161161

@@ -183,7 +183,7 @@ def getPackages(reqs: set[ucstr]) -> set[PackageInfo]:
183183

184184
## licenseFromClassifierlist
185185

186-
[Show source in packageinfo.py:77](../../../licensecheck/packageinfo.py#L77)
186+
[Show source in packageinfo.py:79](../../../licensecheck/packageinfo.py#L79)
187187

188188
Get license string from a list of project classifiers.
189189

licensecheck/packageinfo.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ def getPackageInfoPypi(requirement: ucstr) -> PackageInfo:
6868
homePage=info["home_page"],
6969
author=info["author"],
7070
size=int(response["urls"][-1]["size"]),
71-
license=ucstr(licenseClassifier if licenseClassifier != UNKNOWN else info["license"]),
71+
license=ucstr(
72+
licenseClassifier if licenseClassifier != UNKNOWN else info.get("license", UNKNOWN)
73+
),
7274
)
7375
except KeyError as error:
7476
raise ModuleNotFoundError from error
@@ -152,8 +154,8 @@ def getMyPackageLicense() -> ucstr:
152154
return licenseClassifier
153155
if "license" in metaData:
154156
if isinstance(metaData["license"], dict) and metaData["license"].get("text") is not None:
155-
return ucstr(metaData["license"].get("text"))
156-
return ucstr(metaData["license"])
157+
return ucstr(metaData["license"].get("text", UNKNOWN))
158+
return ucstr(f'{metaData["license"]}')
157159
return ucstr(input("Enter the project license\n>"))
158160

159161

licensecheck/types.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
class ucstr(str):
1818
"""Uppercase string"""
1919

20-
def __new__(cls, v) -> ucstr:
20+
def __new__(cls, v: str) -> ucstr:
2121
return super().__new__(cls, v.upper())
2222

2323

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "licensecheck"
3-
version = "2023.4"
3+
version = "2023.4.1"
44
license = "mit"
55
description = "Output the licenses used by dependencies and check if these are compatible with the project license"
66
authors = ["FredHappyface"]

0 commit comments

Comments
 (0)