Skip to content

1439 load multiple scans - #1543

Merged
pombredanne merged 5 commits into
developfrom
1439-load-multiple-scans
May 8, 2019
Merged

1439 load multiple scans#1543
pombredanne merged 5 commits into
developfrom
1439-load-multiple-scans

Conversation

@JonoYang

Copy link
Copy Markdown
Member

VirtualCodebase now accepts location as a list of locations, where each location is to a scan file that is to be combined with other scan files. This is used like so: scancode --from-json scan1.json --from-json scan2.json --json-pp combined-scan.json

     * This doesn't work yet

Signed-off-by: Jono Yang <jyang@nexb.com>
Signed-off-by: Jono Yang <jyang@nexb.com>
    * Update comments

Signed-off-by: Jono Yang <jyang@nexb.com>
    * Add test that creates a VirtualCodebase from multiple scans
    * Check to see if headers exist before attempting to get them when loading scan_data
    * Raise Exception when importing a scan with no files

Signed-off-by: Jono Yang <jyang@nexb.com>
Signed-off-by: Jono Yang <jyang@nexb.com>
@JonoYang
JonoYang force-pushed the 1439-load-multiple-scans branch from db8e763 to f0e2bdb Compare April 23, 2019 17:59
@codecov

codecov Bot commented Apr 23, 2019

Copy link
Copy Markdown

Codecov Report

Merging #1543 into develop will increase coverage by 0.11%.
The diff coverage is 96.42%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1543      +/-   ##
===========================================
+ Coverage    84.24%   84.36%   +0.11%     
===========================================
  Files          123      123              
  Lines        14411    14509      +98     
===========================================
+ Hits         12141    12240      +99     
+ Misses        2270     2269       -1
Impacted Files Coverage Δ
src/scancode/cli.py 76.02% <100%> (+0.03%) ⬆️
src/scancode/resource.py 86.25% <96.29%> (+0.27%) ⬆️
src/packagedcode/__init__.py 77.5% <0%> (+0.08%) ⬆️
src/typecode/pygments_lexers.py 52.9% <0%> (+0.64%) ⬆️
src/packagedcode/plugin_package.py 92.59% <0%> (+0.75%) ⬆️
src/scancode/api.py 96.09% <0%> (+0.99%) ⬆️
src/commoncode/fileutils.py 82.35% <0%> (+1.3%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 153a99b...f0e2bdb. Read the comment docs.

@pombredanne pombredanne left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

All goo. Thank you! merging!

@pombredanne
pombredanne merged commit bb44ff6 into develop May 8, 2019
@pombredanne
pombredanne deleted the 1439-load-multiple-scans branch May 8, 2019 10:28
@pombredanne
pombredanne restored the 1439-load-multiple-scans branch May 9, 2019 07:45
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.

2 participants