|
15 | 15 |
|
16 | 16 | from _packagedcode import models |
17 | 17 | 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 |
18 | 21 | from python_inspector import utils_pypi |
19 | 22 | from python_inspector.resolution import get_python_version_from_env_tag |
20 | 23 | from python_inspector.utils_pypi import Environment |
@@ -96,7 +99,6 @@ def get_pypi_data_from_purl( |
96 | 99 | return [] |
97 | 100 | info = response.get("info") or {} |
98 | 101 | homepage_url = info.get("home_page") |
99 | | - license = info.get("license") |
100 | 102 | project_urls = info.get("project_urls") or {} |
101 | 103 | code_view_url = get_pypi_codeview_url(project_urls) |
102 | 104 | bug_tracking_url = get_pypi_bugtracker_url(project_urls) |
@@ -141,29 +143,19 @@ def get_pypi_data_from_purl( |
141 | 143 | api_data_url=api_url, |
142 | 144 | bug_tracking_url=bug_tracking_url, |
143 | 145 | code_view_url=code_view_url, |
144 | | - declared_license={ |
145 | | - "classifiers": license_classifiers, |
146 | | - "license": license, |
147 | | - }, |
| 146 | + declared_license=get_declared_license(info), |
148 | 147 | download_url=dist_url, |
149 | 148 | size=url.get("size"), |
150 | 149 | md5=digests.get("md5") or url.get("md5_digest"), |
151 | 150 | sha256=digests.get("sha256"), |
152 | 151 | 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 | + ), |
168 | 160 | **purl.to_dict(), |
169 | 161 | ).to_dict() |
0 commit comments