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.

Sign up for GitHub

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

Jump to bottom

Add support for license expressions #1054

Merged
merged 166 commits into from
May 4, 2018
Merged

Add support for license expressions #1054

merged 166 commits into from
May 4, 2018

Conversation

pombredanne
Copy link
Member

This PR adds support to report license expressions in scan results per #74
It also contains the latest SPDX-related licenses and more that have been synced.

@pombredanne
Make variable names more explicit
238329a 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve synclic to work SPDX sync
65f110b 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Use correct case for SPDX key
47881fe 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add new and improved licenses #41
04bfa66 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Create new/updated synced licenses in scancode dir #41
a256437 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve license metadata #41
b3113e2 
 * this includes some name changes to align with SPDX

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add new and improved licenses #41
7ff1159 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Update FSF licenses SPDX ids to v3
4cb7b1d 
This includes the changes from + to -or-later and -only

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add new license rules #41
3268a9f 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add composite licenses #41
87ec664 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve error message for incorrect YAML
baca3a6 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Remove duplicated licenses #41
b83d0bc 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve license information #41
efe868a 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Use spaces, not tabs #41
72056ab 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add composite licenses #41
65c0d2f 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add is_composite License attribute #41
4150941 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Remove duplicate license
385c5c4 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Update rules to match ntpl updated key
8f778f7 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add new BSD detection rules
a9b177d 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add new SPDX exceptions #41
05bea5d 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add SPDX license id
10ae3fc 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Update license data (mostly URLs)
2081f92 
 *based on sync with SPDX

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improved SPDX license sync
159b9d6 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add rarely seen AGPL variants from SPDX
98c5c2e 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Update license names and keys
dd37183 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add new QT exception
fde5ed1 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Fix SPX license key
ffadcd0 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Remove SPDX key from Austrian CC license
1bd49dc 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add URL to licenses
35e6fe9 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Update license information
5bab1ff 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add test expectations for expressions
c12151f 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Test expressions #74
af76359 
 * Also allow to regen tests

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Fix sync with upstream
65497c7 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add test expectations for expressions #74
5b5cca0 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Do not extract text from JPEG and Gif #74
c57b5b6 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve license testing #74
439af41 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add test expectations for expressions #74
981d5ac 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Correct coverage tag #74
5be2018 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve rule dumping #74
3192915 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add license expression to all rules #74
fc3283e 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Expression is always present in rules #74
10724b0 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Fix YAML notes format #74
7929d1f 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Use only expressions in tests #74
9ff3e14 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add license language tag #139
4d5f14a 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Update rules to use only expressions #74
fc78d68 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Update license-expression lib #74
5b8ca2e 
 There was a bug when checking expression containment

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Remove references to licenses keys & choices #74
e10e390 
 * use license_expression instead everywhere
 * streamline tests (remove negative tests that was useless and not
   working)

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Update CSV-related tests #74
0839769 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Copy link
Member Author

pombredanne commented May 3, 2018 •
edited
Loading

This PR adds support throughout ScanCode for license expressions as well as updates the licenses with the latest syncs from SPDX 3.1 and DejaCode. This is important change but mostly on the data side. This can be tested with the new --license-expression (which still requires the --license option).
A new list of license expressions detected in a given file is reported in this case (it is empty otherwise)

It is now ready for review. @MaJuRG @sschuberth @yash-nisar @haikoschol @DennisClark @tdruez feedback welcomed!
(Note: I reckon that's a lot of file changed, but the bulk is mostly in yaml data files changes)

@pombredanne
Update categories
cd6e805 
 * Either proprietary Free or Commercial

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Use unstated license for odd licenses
10b1618 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Deprecate duplicate license
aef3cde 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Update license names and format
63e0022 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Fix license name
5ab54de 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Do not show component license messages
eb9325d 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Treat duplicate license names as errors
49de27f 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Update license URLs and language #74
76e9517 
 create a proper language-specific record too

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Copy link
Member Author

Because it is fairly important and low impact in terms of external changes and API and all tests are green, I am merging this now.

@pombredanne pombredanne merged commit 10a82a0 into develop May 4, 2018
@pombredanne pombredanne deleted the 74-license-expressions branch May 4, 2018 08:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pombredanne @steven-esser