Skip to content

Add new and improved licenses and licenses rules - #1421

Merged
pombredanne merged 16 commits into
developfrom
new-and-improved-license-rules-03-06
Mar 7, 2019
Merged

Add new and improved licenses and licenses rules#1421
pombredanne merged 16 commits into
developfrom
new-and-improved-license-rules-03-06

Conversation

@pombredanne

Copy link
Copy Markdown
Member

This is an "omnibus" PR for miscellaneous new licenses and license detection rules.

Some spurrious AGPL and GPL were messging up detection.

Reported-by: John M. Horan <jmhoran@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
This is fixing failing tests following new rules added for
#1418 and #1419

Reported-by: John M. Horan <jmhoran@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Comment thread etc/scripts/genlicspdx.py Outdated
@codecov

codecov Bot commented Mar 6, 2019

Copy link
Copy Markdown

Codecov Report

Merging #1421 into develop will increase coverage by 0.82%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1421      +/-   ##
===========================================
+ Coverage    83.65%   84.48%   +0.82%     
===========================================
  Files          119      119              
  Lines        13949    14794     +845     
===========================================
+ Hits         11669    12498     +829     
- Misses        2280     2296      +16
Impacted Files Coverage Δ
src/scancode/plugin_ignore.py 83.33% <0%> (-13.55%) ⬇️
src/formattedcode/output_json.py 75.38% <0%> (-1.98%) ⬇️
src/commoncode/fileset.py 72.99% <0%> (-1.46%) ⬇️
src/formattedcode/output_jsonlines.py 100% <0%> (ø) ⬆️
src/scancode/resource.py 86.12% <0%> (+0.43%) ⬆️
src/packagedcode/models.py 93.63% <0%> (+1.32%) ⬆️
src/plugincode/__init__.py 85.14% <0%> (+2.38%) ⬆️
src/commoncode/fileutils.py 85.09% <0%> (+3.97%) ⬆️
src/formattedcode/output_csv.py 84.71% <0%> (+6.22%) ⬆️
src/scancode/cli.py 82.35% <0%> (+6.25%) ⬆️
... and 2 more

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 887ae13...77f7358. Read the comment docs.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
pombredanne force-pushed the new-and-improved-license-rules-03-06 branch from 8590d07 to 5d2b418 Compare March 6, 2019 18:35
 * use None for attribute defaults NOT an empty string
 * perform all validations in validate()
 * add validate() tests

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Both are duplicates and mit-old-style-no-advert has more known uses

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Several tests are not useful since they check an exact match and are
bringing nothing new. We just kept a few  and removed the other ones.
A hash match test is kinda tautological and does not excercise anything
in the license matching algorithms. Even if runs fast it still runs for
nothing.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
This was deleted by mistake

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne

Copy link
Copy Markdown
Member Author

All greenish 🍏

@pombredanne
pombredanne merged commit fb9734d into develop Mar 7, 2019
@pombredanne
pombredanne deleted the new-and-improved-license-rules-03-06 branch March 7, 2019 21:59
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