Skip to content

Commit 6f8b968

Browse files
authored
Merge pull request #974 from TG1999/launchpad
2 parents 83a76f1 + 8e110d2 commit 6f8b968

File tree

4 files changed

+22
-9
lines changed

4 files changed

+22
-9
lines changed

CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ Release notes
33

44

55

6+
Version v30.2.1
7+
----------------
8+
9+
- We refactored and fixed the LaunchPad API code.
10+
11+
612
Version v30.2.0
713
----------------
814

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = vulnerablecode
3-
version = 30.2.0
3+
version = 30.2.1
44
license = Apache-2.0 AND CC-BY-SA-4.0
55

66
# description must be on ONE line https://github.com/pypa/setuptools/issues/1390

vulnerabilities/package_managers.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,17 +137,24 @@ def fetch(self, pkg: str) -> Iterable[PackageVersion]:
137137
while True:
138138
response = get_response(url=url, content_type="json")
139139

140-
entries = response["entries"]
140+
if not response:
141+
break
142+
entries = response.get("entries")
141143
if not entries:
142144
break
143145

144146
for release in entries:
145-
source_package_version = release["source_package_version"]
146-
source_package_version = remove_debian_default_epoch(source_package_version)
147-
yield PackageVersion(
148-
value=source_package_version,
149-
release_date=dateparser.parse(release["date_published"]),
150-
)
147+
source_package_version = release.get("source_package_version")
148+
source_package_version = remove_debian_default_epoch(version=source_package_version)
149+
date_published = release.get("date_published")
150+
release_date = None
151+
if date_published and type(date_published) is str:
152+
release_date = dateparser.parse(date_published)
153+
if source_package_version:
154+
yield PackageVersion(
155+
value=source_package_version,
156+
release_date=release_date,
157+
)
151158
if response.get("next_collection_link"):
152159
url = response["next_collection_link"]
153160
else:

vulnerablecode/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import warnings
1313
from pathlib import Path
1414

15-
__version__ = "30.2.0"
15+
__version__ = "30.2.1"
1616

1717

1818
def command_line():

0 commit comments

Comments
 (0)