Skip to content

Commit 17ccfdb

Browse files
committed
Use latest SCTK packagedcode
Now using correct requirement strings in dependencies Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent 039616d commit 17ccfdb

2 files changed

Lines changed: 17 additions & 7 deletions

File tree

CHANGELOG.rst

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@ Changelog
22
=========
33

44

5-
v0.0.0
5+
v0.6.0
6+
------
7+
8+
- Use latest ScanCode toolkit packagedcode including the ability to collect
9+
extra index URLs from requirements.txt
10+
11+
12+
v0.5.0
613
------
714

815
Initial release.

src/_packagedcode/pypi.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -844,12 +844,15 @@ def get_requirements_txt_dependencies(location, include_nested=False):
844844

845845
purl = purl and purl.to_string() or None
846846

847-
if req.is_editable:
848-
requirement = req.dumps()
849-
else:
850-
requirement = req.dumps(with_name=False)
847+
requirement = req.dumps()
851848

852-
if location.endswith(('dev.txt', 'test.txt', 'tests.txt',)):
849+
if location.endswith(
850+
(
851+
'dev.txt',
852+
'test.txt',
853+
'tests.txt',
854+
)
855+
):
853856
scope = 'development'
854857
is_runtime = False
855858
is_optional = True
@@ -865,7 +868,7 @@ def get_requirements_txt_dependencies(location, include_nested=False):
865868
is_runtime=is_runtime,
866869
is_optional=is_optional,
867870
is_resolved=req.is_pinned or False,
868-
extracted_requirement=requirement
871+
extracted_requirement=requirement,
869872
)
870873
)
871874

0 commit comments

Comments
 (0)