Merge pull request #3030 from nexB/early-summer-q3-license-updates2

Improve license detection with rules and licenses

Author: pombredanne

etc/scripts/licenses/synclic.py

@@ -530,6 +530,7 @@ class DejaSource(ExternalLicensesSource):
         "is_deprecated",
         "is_exception",
         # not yet
+        # "notes",
         # "standard_notice",
     )
     non_updatable_attributes = ("notes",)
@@ -601,6 +602,8 @@ def build_license(self, mapping, *args, **kwargs):
         key = mapping["key"]
         standard_notice = mapping.get("standard_notice") or ""
         standard_notice = clean_text(standard_notice)
+        # notes = mapping.get("reference_notes") or ""
+        # notes = clean_text(notes)
 
         deprecated = not mapping.get("is_active")
         spdx_license_key = mapping.get("spdx_license_key") or None
@@ -629,6 +632,7 @@ def build_license(self, mapping, *args, **kwargs):
             is_exception=mapping.get("is_exception", False),
             is_deprecated=deprecated,
             standard_notice=standard_notice,
+            # notes=notes,
         )
         text = mapping["full_text"] or ""
         # normalize EOL to POSIX
@@ -994,6 +998,7 @@ def update_external(_attrib, _sc_val, _ext_val):
                 update_scancode(attrib, scancode_value, external_value)
             continue
 
+        # We merge sequences
         if isinstance(scancode_value, (list, tuple)) and isinstance(external_value, (list, tuple)):
             normalized_scancode_value = set(s for s in scancode_value if s and s.strip())
             normalize_external_value = set(s for s in external_value if s and s.strip())
@@ -1034,8 +1039,7 @@ def update_external(_attrib, _sc_val, _ext_val):
             continue
 
         if isinstance(scancode_value, str) and isinstance(external_value, str):
-            # keep the stripped and normalized spaces value
-            # normalized spaces
+            # make value stripped and with normalized spaces
             normalized_scancode_value = " ".join(scancode_value.split())
             normalize_external_value = " ".join(external_value.split())
 
@@ -1165,9 +1169,9 @@ def synchronize_licenses(
 
         # the matching key exists on both sides: merge/update both licenses
         scancode_updated, external_updated = merge_licenses(
-            scancode_license,
-            external_license,
-            external_source.updatable_attributes,
+            scancode_license=scancode_license,
+            external_license=external_license,
+            updatable_attributes=external_source.updatable_attributes,
             from_spdx=use_spdx_key,
         )
 

foo.html

@@ -0,0 +1,7 @@
+from licensedcode.cache import get_index
+idx = get_index()
+file= "sample.license.txt"
+matches = idx.match(location=file)
+for match in matches:
+    ht = match.get_highlighted_text()
+    print(ht)

ht.py

@@ -0,0 +1,27 @@
+Copyright (c) Django Software Foundation and individual contributors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of FOOBAR conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    3. Neither the name of Django nor the names of its contributors may be used
+       to endorse or promote products derived from this software without
+       specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 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.

sample.license.txt

@@ -1,6 +1,6 @@
 key: anti-capitalist-1.4
 short_name: ACSL v. 1.4
-name: ANTI-CAPITALIST SOFTWARE LICENSE (v 1.4)
+name: Anti-Capitalist Software License (v 1.4)
 category: Free Restricted
 owner: Everest Pipkin and Ramsey Nasser
 homepage_url: https://anticapitalist.software/

src/licensedcode/data/licenses/anti-capitalist-1.4.yml

@@ -2,7 +2,8 @@ key: app-s2p
 short_name: App::s2p License
 name: App::s2p License
 category: Permissive
-owner: Unspecified
+owner: Fedora
+homepage_url: https://fedoraproject.org/wiki/Licensing/App-s2p
 spdx_license_key: App-s2p
 other_urls:
     - https://fedoraproject.org/wiki/Licensing/App-s2p

src/licensedcode/data/licenses/app-s2p.yml

@@ -2,7 +2,7 @@ key: bohl-0.2
 short_name: BOHL-0.2
 name: The Balloon Open Hardware License v0.2
 category: Permissive
-owner: The Balloon
+owner: iTechnic
 spdx_license_key: LicenseRef-scancode-bohl-0.2
 text_urls:
     - https://web.archive.org/web/20140426215620/http://www.balloonboard.org/docs/Balloon_License_0v2.pdf

src/licensedcode/data/licenses/bohl-0.2.yml

@@ -2,7 +2,7 @@ key: cc-by-nc-sa-2.0-fr
 language: fr
 short_name: CC-BY-NC-SA-2.0-FR
 name: Creative Commons Attribution-NonCommercial-ShareAlike 2.0 France
-category: Free Restricted
+category: Source-available
 owner: Creative Commons
 spdx_license_key: CC-BY-NC-SA-2.0-FR
 other_urls:

src/licensedcode/data/licenses/cc-by-nc-sa-2.0-fr.yml

@@ -2,7 +2,7 @@ key: cc-by-nc-sa-3.0-de
 language: de
 short_name: CC-BY-NC-SA-3.0-DE
 name: Creative Commons Attribution Non Commercial Share Alike 3.0 Germany
-category: Free Restricted
+category: Source-available
 owner: Creative Commons
 spdx_license_key: CC-BY-NC-SA-3.0-DE
 other_urls:

src/licensedcode/data/licenses/cc-by-nc-sa-3.0-de.yml

@@ -1,7 +1,7 @@
 key: cc-by-sa-1.0
 short_name: CC-BY-SA-1.0
 name: Creative Commons Attribution Share Alike License 1.0
-category: Permissive
+category: Copyleft Limited
 owner: Creative Commons
 homepage_url: http://creativecommons.org/licenses/by-sa/1.0/
 spdx_license_key: CC-BY-SA-1.0