Skip to content

Commit bc10f63

Browse files
committed
Reuse pypi code to extract metadata
Signed-off-by: Tushar Goel <[email protected]>
1 parent c77d8b6 commit bc10f63

16 files changed

+1720
-4179
lines changed

src/python_inspector/package_data.py

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515

1616
from _packagedcode import models
1717
from _packagedcode.models import PackageData
18+
from _packagedcode.pypi import get_declared_license
19+
from _packagedcode.pypi import get_keywords
20+
from _packagedcode.pypi import get_parties
1821
from python_inspector import utils_pypi
1922
from python_inspector.resolution import get_python_version_from_env_tag
2023
from python_inspector.utils_pypi import Environment
@@ -96,7 +99,6 @@ def get_pypi_data_from_purl(
9699
return []
97100
info = response.get("info") or {}
98101
homepage_url = info.get("home_page")
99-
license = info.get("license")
100102
project_urls = info.get("project_urls") or {}
101103
code_view_url = get_pypi_codeview_url(project_urls)
102104
bug_tracking_url = get_pypi_bugtracker_url(project_urls)
@@ -141,29 +143,19 @@ def get_pypi_data_from_purl(
141143
api_data_url=api_url,
142144
bug_tracking_url=bug_tracking_url,
143145
code_view_url=code_view_url,
144-
declared_license={
145-
"classifiers": license_classifiers,
146-
"license": license,
147-
},
146+
declared_license=get_declared_license(info),
148147
download_url=dist_url,
149148
size=url.get("size"),
150149
md5=digests.get("md5") or url.get("md5_digest"),
151150
sha256=digests.get("sha256"),
152151
release_date=url.get("upload_time"),
153-
keywords=keyword_classifiers,
154-
parties=[
155-
models.Party(
156-
type=models.party_person,
157-
name=info.get("author"),
158-
role="author",
159-
email=info.get("author_email"),
160-
),
161-
models.Party(
162-
type=models.party_person,
163-
name=info.get("maintainer"),
164-
role="maintainer",
165-
email=info.get("maintainer_email"),
166-
),
167-
],
152+
keywords=get_keywords(info),
153+
parties=get_parties(
154+
info,
155+
author_key="author",
156+
author_email_key="author_email",
157+
maintainer_key="maintainer",
158+
maintainer_email_key="maintainer_email",
159+
),
168160
**purl.to_dict(),
169161
).to_dict()

0 commit comments

Comments
 (0)