Skip to content

Commit 954ac99

Browse files
committed
Add license_expression info pypi API
Signed-off-by: Tushar Goel <[email protected]>
1 parent 570702d commit 954ac99

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/python_inspector/package_data.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from packageurl import PackageURL
1515

1616
from _packagedcode.models import PackageData
17+
from _packagedcode.pypi import compute_normalized_license
1718
from _packagedcode.pypi import get_declared_license
1819
from _packagedcode.pypi import get_description
1920
from _packagedcode.pypi import get_keywords
@@ -86,14 +87,17 @@ def get_pypi_data_from_purl(
8687
continue
8788
digests = url.get("digests") or {}
8889

90+
declared_license = get_declared_license(info)
91+
8992
yield PackageData(
9093
primary_language="Python",
9194
description=get_description(info),
9295
homepage_url=homepage_url,
9396
api_data_url=api_url,
9497
bug_tracking_url=bug_tracking_url,
9598
code_view_url=code_view_url,
96-
declared_license=get_declared_license(info),
99+
declared_license=declared_license,
100+
license_expression=info.get("license_expression"),
97101
download_url=dist_url,
98102
size=url.get("size"),
99103
md5=digests.get("md5") or url.get("md5_digest"),

tests/data/example-requirements-ignore-errors-expected.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
"code_view_url": null,
258258
"vcs_url": null,
259259
"copyright": null,
260-
"license_expression": null,
260+
"license_expression": "MIT",
261261
"declared_license": {
262262
"classifiers": [
263263
"License :: OSI Approved :: MIT License"
@@ -321,7 +321,7 @@
321321
"code_view_url": null,
322322
"vcs_url": null,
323323
"copyright": null,
324-
"license_expression": null,
324+
"license_expression": "MIT",
325325
"declared_license": {
326326
"classifiers": [
327327
"License :: OSI Approved :: MIT License"

0 commit comments

Comments
 (0)