Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update SPDX Version handling #3137

Merged
merged 65 commits into from
Jul 11, 2023
Merged

Conversation

anthonyharrison
Copy link
Contributor

No description provided.

anthonyharrison and others added 30 commits May 27, 2020 12:55
anthonyharrison and others added 23 commits May 2, 2022 19:08
* fix: add special case for 3.7 ValueError
addresses intel#1639

re.search returns `None` on failure, updating to indicate the version is
`UNKNOWN` when this occurs and generating a log message
Co-authored-by: GitHub <noreply@github.com>
Co-authored-by: Terri Oda <terri@toybox.ca>
* feat: add detailed flag

* fix: add default value

* fix: default output param

* test: add detailed flag test

Co-authored-by: Terri Oda <terri@toybox.ca>
Co-authored-by: b31ngd3v <b31ngd3v@gmail.com>
# Conflicts:
#	.pre-commit-config.yaml
#	README.md
#	cve_bin_tool/checkers/xml2.py
#	cve_bin_tool/cli.py
#	cve_bin_tool/csv2cve.py
#	cve_bin_tool/cve_scanner.py
#	cve_bin_tool/cvedb.py
#	cve_bin_tool/output_engine/__init__.py
#	cve_bin_tool/output_engine/util.py
#	cve_bin_tool/version.py
#	cve_bin_tool/version_scanner.py
#	dev-requirements.txt
#	test/test_cli.py
#	test/test_output_engine.py
# Conflicts:
#	cve_bin_tool/csv2cve.py
@codecov-commenter
Copy link

codecov-commenter commented Jul 8, 2023

Codecov Report

Merging #3137 (4a81ff3) into main (b4291b6) will increase coverage by 5.34%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #3137      +/-   ##
==========================================
+ Coverage   76.02%   81.36%   +5.34%     
==========================================
  Files         716      716              
  Lines       11051    11051              
  Branches     1482     1482              
==========================================
+ Hits         8401     8992     +591     
+ Misses       2328     1659     -669     
- Partials      322      400      +78     
Flag Coverage Δ
longtests 75.98% <100.00%> (-0.04%) ⬇️
win-longtests 79.13% <100.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
cve_bin_tool/sbom_manager/spdx_parser.py 87.15% <100.00%> (ø)

... and 23 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Contributor

@terriko terriko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to remove the duplicate docs section then merge this.

README.md Outdated Show resolved Hide resolved
@terriko terriko merged commit b351849 into intel:main Jul 11, 2023
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants