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

Update rules with required phrases automatically #3924

Open
wants to merge 82 commits into
base: develop
Choose a base branch
from
Open

Update rules with required phrases automatically #3924

wants to merge 82 commits into from

Conversation

AyanSinhaMahapatra
Copy link
Member

@AyanSinhaMahapatra AyanSinhaMahapatra commented Sep 17, 2024 •
edited
Loading

This is a continuation of #3254 with added required phrases in license rules after review and further manual curations. Also contains improvements in required phrase collection and marking.

Reference: #2637 #2878

Tasks

  • Reviewed contribution guidelines
  • PR is descriptively titled 📑 and links the original issue above 🔗
  • Tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR
    Run tests locally to check for errors.
  • Commits are in uniquely-named feature branch and has no merge conflicts 📁

@AyanSinhaMahapatra
Add script for adding required phrases automatically
aa9374c 
Add a script which can add required phrases in already existing rules
automatically from required phrases already present in other rules and
license field names. This can be done one license expression at a time.

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add required phrases automatically for mit rules
72f290f 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add required phrases at bsd-new rules automatically
bd14127 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add required phrases automatically for gpl-2.0
20a7860 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add required phrases for gpl-2.0-only rules automatically
0a44594 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Skip creating required phrase rules for generic licenses
435255b 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra AyanSinhaMahapatra changed the title Update rules with required phrases auto Update rules with required phrases automatically Sep 17, 2024
@AyanSinhaMahapatra
Add required phrases for genreic license rules automtaically
12eaccf 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add required phrases to gpl-1.0-plus rules automatically
ece8c33 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add required phrases automatically on gpl/lgpl rules
be94a84 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add more required phrases automatically in permissive rules
584b554 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add required phrases automatically to gpl-3.0 rules
c778ce0 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add required phrases for lgpl rules automatically
f5e9593 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add required phrases for agpl rules automatically
63c23f0 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add required phrases to bsd rules automatically
40ced0c 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add required phrases in lgpl rules automatically
518116d 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra AyanSinhaMahapatra force-pushed the update-rules-with-required-phrases-auto branch from ea221d4 to 518116d Compare September 18, 2024 13:43
@AyanSinhaMahapatra
Add required phrases automatically for cc rules
3583ac6 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra AyanSinhaMahapatra mentioned this pull request Sep 18, 2024
Closed
4 tasks
@pombredanne
Copy link
Member

I am pushing shortly a few updates:

  • decouple the creation of new rules from updating existing rules in a separate CLI
  • ensure we skip more rules in the whole process: any rule that cannot be matched approximately and not only tiny rules, and also false positives
  • ensure that no rule get a required phrase addition that would break in the middle of a URL, email, or copyright. This will be done to check that no required phrase injection changes the set of ignorables of a rule and makes the URL not longer a proper URL for instance.
  • extend "skipping" the collection of required phrases flag to skip a rule from both required phrases collection AND injection. This allow to handle exceptions more easily.

@pombredanne
Improve license detection rules
1994095 
Do not damage rules with URLs

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve required phrases in paths
4d1b8ac 
Ensure that the leading /usr is not broken with {{ required phrase }}
markers.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve required phrases in paths
ef5101e 
Ensure that /usr paths are not broken with {{ required phrase }}
markers.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve required phrases in URLs
8e615bb 
Ensure that URLs are not broken with {{ required phrase }} markers.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Correct rule syntax
6831e90 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Move back required-phrase related code
e05ca6f 
This is code that belongs to required_phrase.py, not to tokenize.py

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Use correct syntax for rules
94cffc9 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Apache Software Foundation is not required phrase
62643cb 
This creates many false positives.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Remove duplicate imports
7150b82 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve license models
83eadec 
This helps with required phrases handling, addition and generation

* Add new Rule.source attribute to track the "source" of a license rule
  like when adding a new required phrase to a rule
* Add new Rule.is_tiny computed attribute to ytrack tiny, very small
  rules
* Add new Rule.is_approx_matchable property for rules that can only be
  matched exactly
* Add new Rule.is_generic for rules that contain "generic" licenses
* Support required_phrases-related fields in Rule.validate()
* Update index.py accordingly

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Consider license clues in gibberrish filter
848dab1 
filter_invalid_matches_to_single_word_gibberish() also considers
license_clues as eligible for gibberish filtering.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Use correct dry_run argument name in tests
4cfaa8a 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Update license test expectation
2607e0d 
This is a more correct result

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Consider clues in false positive filter
243ba18 
is_candidate_false_positive() now also considers
license_clues as eligible for false poistive filtering.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Fix comment content
10e0181 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add required phrase to MIT rule
f6d7fe6 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve license test results
2fd0dd7 
Adjust with latest license code detection for required phrases

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve license rules and license tests
f6b7196 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Rename new rules to resolve merge conflicts
1802857 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Merge latest develop
68c92a2 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve rule ignorables and requried phrases
4b41c62 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Adapt license test expectations
34d8b4e 
This after merging the latest develop and taking into account updates
with required phrases.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Do not debug trace by default
5659d1c 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve license detection results
f4c0c6b 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Refine license detection rules
fc46065 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve license detection results
cb271b8 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add new license rule for LGPL
4f15de1 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve GPL detection
28e871f 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve license detection tests
46135a4 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add new GPL rules
5635edf 
Seen in Debian copyright files

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve MPL tri-license detection
28e1acb 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add new DCO licenses
584e3d6 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add new license detection rules
160e95b 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Improve license detection tests
e5bff98 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Relax required phrase filtering
6eff903 
Only process stopwords this for "is_continuous" rules

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Correct license test expectation
e3fc9c9 
Some rules now have a "is_required_phrase" flag

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Correct license rule expression
94a4d35 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Update expected license test result
4718fed 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@AyanSinhaMahapatra AyanSinhaMahapatra mentioned this pull request Nov 5, 2024
Open
@jloehel jloehel mentioned this pull request Nov 28, 2024
Open
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
@AyanSinhaMahapatra @pombredanne