Update required phrases, rules and fix minor issues

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>

Author: AyanSinhaMahapatra

src/licensedcode/data/rules/bsd-new_1426.RULE

@@ -2,10 +2,9 @@
 license_expression: bsd-new
 is_license_text: yes
 is_continuous: yes
-skip_for_required_phrase_generation: yes
+minimum_coverage: 100
 ---
 
-{{
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -30,4 +29,3 @@ License: BSD-3-clause
  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-}}

src/licensedcode/data/rules/gfdl-1.3-invariants-only_13.RULE

@@ -1,8 +1,8 @@
 ---
 license_expression: gfdl-1.3-invariants-only
 is_license_reference: yes
-is_continuous: yes
+is_required_phrase: yes
 relevance: 95
 ---
 
-{{with the Invariant Sections being            }}
+with the Invariant Sections being

src/licensedcode/data/rules/gfdl-1.3-invariants-only_14.RULE

@@ -1,8 +1,8 @@
 ---
 license_expression: gfdl-1.3-invariants-only
 is_license_reference: yes
-is_continuous: yes
+is_required_phrase: yes
 relevance: 95
 ---
 
-{{the Invariant Sections being                 }}
+the Invariant Sections being

src/licensedcode/data/rules/gfdl-1.3-invariants-only_30.RULE

@@ -5,7 +5,7 @@ is_license_notice: yes
 
 Permission is granted to copy, distribute
 and/or modify this document under the terms of the {{GNU Free Documentation
-License, Version 1.3;}} {{with the Invariant Sections being}} LIST THEIR TITLES ,
+License, Version 1.3; with the Invariant Sections being}} LIST THEIR TITLES ,
 {{with the Front-Cover Texts being}} LIST , and {{with the Back-Cover Texts being}}
 LIST . A copy of the license is included in the section entitled "GNU Free
 Documentation License".

src/licensedcode/data/rules/mpl-1.1_or_gpl-2.0-plus_or_lgpl-2.1-plus_16.RULE

@@ -10,4 +10,20 @@ ignorable_urls:
 ---
 
 
-<licenses><license><name>MPL</name><url>http://www.mozilla.org/MPL/2.0/index.txt</url><distribution>repo</distribution></license><license><name>LGPL</name><url>http://www.gnu.org/licenses/lgpl-2.1.txt</url><distribution>repo</distribution></license><license><name>GPL</name><url>http://www.gnu.org/licenses/gpl-2.0.txt</url><distribution>repo</distribution></license></licenses>
+<licenses>
+    {{<license>
+        <name>MPL}}</name>
+        <url>{{http://www.mozilla.org/MPL/2.0/index.txt}}</url>
+        <distribution>repo</distribution>
+    </license>
+    {{<license>
+        <name>LGPL}}</name>
+        <url>{{http://www.gnu.org/licenses/lgpl-2.1.txt}}</url>
+        <distribution>repo</distribution>
+    </license>
+    {{<license>
+        <name>GPL}}</name>
+        <url>{{http://www.gnu.org/licenses/gpl-2.0.txt}}</url>
+        <distribution>repo</distribution>
+    </license>
+</licenses>

src/licensedcode/data/rules/mpl-1.1_or_gpl-2.0-plus_or_lgpl-2.1-plus_30.RULE

@@ -10,4 +10,20 @@ ignorable_urls:
 ---
 
 
-<licenses><license><name>MPL</name><url>http://www.mozilla.org/MPL/2.0/index.txt</url><distribution>repo</distribution></license><license><name>LGPL</name><url>https://www.gnu.org/licenses/lgpl-2.1.txt</url><distribution>repo</distribution></license><license><name>GPL</name><url>https://www.gnu.org/licenses/gpl-2.0.txt</url><distribution>repo</distribution></license></licenses>
+<licenses>
+    {{<license>
+        <name>MPL}}</name>
+        <url>{{http://www.mozilla.org/MPL/2.0/index.txt}}</url>
+        <distribution>repo</distribution>
+    </license>
+    {{<license>
+        <name>LGPL}}</name>
+        <url>{{https://www.gnu.org/licenses/lgpl-2.1.txt}}</url>
+        <distribution>repo</distribution>
+    </license>
+    {{<license>
+        <name>GPL}}</name>
+        <url>{{https://www.gnu.org/licenses/gpl-2.0.txt}}</url>
+        <distribution>repo</distribution>
+    </license>
+</licenses>

src/licensedcode/data/rules/mpl-1.1_or_gpl-3.0_or_lgpl-3.0_1.RULE

@@ -5,21 +5,21 @@ is_required_phrase: yes
 ignorable_urls:
     - http://www.gnu.org/licenses/gpl.txt
     - http://www.gnu.org/licenses/lgpl.txt
-    - https://www.mozilla.org/en-US/MPL/1.1/
+    - https://www.mozilla.org/en-US/MPL/1.1
 ---
 
 
 <licenses>
  <license>
- <name>Mozilla Public License Version 1.1</name>
- <url>https://www.mozilla.org/en-US/MPL/1.1/</url>
+ <name>{{Mozilla Public License Version 1.1}}</name>
+ <url>{{https://www.mozilla.org/en-US/MPL/1.1/}}</url>
  </license>
  <license>
- <name>GENERAL PUBLIC LICENSE, version 3 (GPL-3.0)</name>
- <url>http://www.gnu.org/licenses/gpl.txt</url>
+ <name>{{GENERAL PUBLIC LICENSE, version 3 (GPL-3.0)}}</name>
+ <url>{{http://www.gnu.org/licenses/gpl.txt}}</url>
  </license>
  <license>
- <name>GNU LESSER GENERAL PUBLIC LICENSE, version 3 (LGPL-3.0)</name>
- <url>http://www.gnu.org/licenses/lgpl.txt</url>
+ <name>{{GNU LESSER GENERAL PUBLIC LICENSE, version 3 (LGPL-3.0)}}</name>
+ <url>{{http://www.gnu.org/licenses/lgpl.txt}}</url>
  </license>
  </licenses>

src/licensedcode/index.py

@@ -1003,20 +1003,20 @@ def match_query(
 
         matchers = [
             # matcher, include_low in post-matching remaining matchable check
-            Matcher(function=get_spdx_id_matches, include_low=True, name='spdx_lid', keep_trucking=True),
-            Matcher(function=self.get_exact_matches, include_low=False, name='aho', keep_trucking=False),
+            Matcher(function=get_spdx_id_matches, include_low=True, name='spdx_lid', continue_matching=True),
+            Matcher(function=self.get_exact_matches, include_low=False, name='aho', continue_matching=False),
         ]
 
         if approximate:
-            matchers += [Matcher(function=approx, include_low=False, name='seq', keep_trucking=False), ]
+            matchers += [Matcher(function=approx, include_low=False, name='seq', continue_matching=False), ]
 
         already_matched_qspans = []
-        for mtcher in matchers:
+        for matcher in matchers:
             if TRACE:
                 logger_debug()
-                logger_debug(f'match_query: matching with matcher: {mtcher.name}')
+                logger_debug(f'match_query: matching with matcher: {matcher.name}')
 
-            matched = mtcher.function(
+            matched = matcher.function(
                 qry,
                 matched_qspans=already_matched_qspans,
                 existing_matches=matches,
@@ -1026,7 +1026,7 @@ def match_query(
             if TRACE:
                 self.debug_matches(
                     matches=matched,
-                    message=f'matched with: {mtcher.name}',
+                    message=f'matched with: {matcher.name}',
                     location=qry.location,
                     query_string=qry.query_string,
                 )
@@ -1050,14 +1050,14 @@ def match_query(
             already_matched_qspans.extend(
                 mtch.qspan for mtch in matched if mtch.coverage() == 100)
 
-            if not mtcher.keep_trucking:
+            if not matcher.continue_matching:
 
                 if not whole_query_run.is_matchable(
-                    include_low=mtcher.include_low,
+                    include_low=matcher.include_low,
                     qspans=already_matched_qspans,
                 ):
                     if TRACE:
-                        logger_debug('  match_query: no more matchable ... stop matching after matcher:', mtcher.name)
+                        logger_debug('  match_query: no more matchable ... stop matching after matcher:', matcher.name)
                     break
 
             # break if deadline has passed
@@ -1205,7 +1205,7 @@ class Matcher(NamedTuple):
     # whether to inlude low tokens when checking if there are matchable left
     include_low: bool
     # True if matching should continue after this matcher
-    keep_trucking: bool = True
+    continue_matching: bool = True
 
 
 def get_weak_rids(len_legalese, tids_by_rid, _idx):

src/licensedcode/plugin_license.py

@@ -220,8 +220,6 @@ def process_codebase(self, codebase, license_text=False, license_diagnostics=Fal
                     f'after : {license_expressions_after}'
                 )
 
-        # raise Exception()
-
         license_detections = collect_license_detections(
             codebase=codebase,
             include_license_clues=False

src/packagedcode/alpine.py

@@ -1376,11 +1376,11 @@ class ApkLicenseDetection:
 
     def to_dict(self):
         return dict(
-            declared_license=self.declared_license                        ,
-            cleaned_license=self.cleaned_license                         ,
-            mapped_license=self.mapped_license                          ,
-            license_detections=self.license_detections                            ,
-            license_expression=self.license_expression             ,
+            declared_license=self.declared_license,
+            cleaned_license=self.cleaned_license,
+            mapped_license=self.mapped_license,
+            license_detections=self.license_detections,
+            license_expression=self.license_expression,
         )