Skip to content

Commit 16ffdd2

Browse files
committed
poetry: switch back to CaPyCli main
Qualifier code from sw360/capycli#144 has been merged.
1 parent a99af44 commit 16ffdd2

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

capywfa/capywfa.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,15 @@ def get_all_components(sw360_client):
7878

7979
def pass1_map_bom(bom, sw360_url, sw360_token):
8080
mapper = MapBom()
81+
8182
# we don't want relaxed_debian_parsing here as capycli would then ignore
8283
# Debian suffices (SW360 release 1.3.4 matches Debian version 1.3.4-2)
8384
mapper.relaxed_debian_parsing = False
85+
86+
# get all (PURL) matches, filtered by qualifiers
87+
mapper.full_search = True # equivalent to --matchmode=full-search
88+
mapper.qualifier_match = True # equivalent to --matchmode=qualifier-match
89+
8490
mapper.login(token=sw360_token, url=sw360_url,
8591
oauth2=(len(sw360_token) > 100))
8692
purls = {item.bom_ref: item.purl for item in bom.components}

poetry.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ requires-python = ">=3.10.0,<4.0"
2323
dependencies = [
2424
"packageurl-python (>0.11,<1.0)",
2525
"requests (>=2.32.0,<3.0)",
26-
"capycli @ git+https://github.com/sw360/capycli@feat/purl-qualifier-search",
26+
"capycli @ git+https://github.com/sw360/capycli@main",
2727
"sw360 (>=1.8.0,<2.0)",
2828
]
2929

0 commit comments

Comments
 (0)