Merge pull request #2921 from nexB/spring-2022-license-updates

Spring 2022 license updates

Author: pombredanne

etc/scripts/licenses/synclic.py

@@ -523,6 +523,7 @@ class DejaSource(ExternalLicensesSource):
         "category",
         "owner",
         "text_urls",
+        "language",
         "osi_url",
         "faq_url",
         "other_urls",
@@ -668,7 +669,8 @@ def fetch_spdx_license_details(
     def patch_spdx_license(self, api_url, license_key, spdx_license_key):
         """
         PATCH the DejaCode ``license_key`` to set the ``spdx_license_key``
-        using the DejaCode API Raise an exception on failure.
+        using the DejaCode API.
+        Raise an exception on failure.
         """
         headers = {
             "Authorization": f"Token {self.api_key}",
@@ -891,6 +893,7 @@ def license_to_dict(lico):
         name=lico.name,
         owner=lico.owner,
         is_exception=lico.is_exception,
+        language=lico.language or "en",
         full_text=lico.text,
         spdx_license_key=lico.spdx_license_key,
         reference_notes=lico.notes,
@@ -1351,6 +1354,7 @@ def synchronize_licenses(
 
     added_to_external = [externals_by_key[k] for k in added_to_external]
     updated_in_external = [externals_by_key[k] for k in updated_in_external]
+    external_source.externals_by_key = externals_by_key
     return added_to_external, updated_in_external
 
 
@@ -1439,9 +1443,6 @@ def cli(
             api_url = external_source.api_base_url
             api_key = external_source.api_key
             for i, new_lic in enumerate(added_to_external):
-                if i == 2:
-                    break
-
                 if new_lic.key in dejacode_special_skippable_keys:
                     continue
                 if TRACE:
@@ -1451,8 +1452,6 @@ def cli(
         if update_external:
             externals_by_key = external_source.externals_by_key
             for i, modified_lic in enumerate(updated_in_external):
-                if i == 2:
-                    break
                 if modified_lic.key in dejacode_special_skippable_keys:
                     continue
                 mold = license_to_dict(modified_lic)

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

@@ -4,4 +4,4 @@ name: ANTI-CAPITALIST SOFTWARE LICENSE (v 1.4)
 category: Free Restricted
 owner: Everest Pipkin and Ramsey Nasser
 homepage_url: https://anticapitalist.software/
-spdx_license_key: LicenseRef-scancode-anti-capitalist-1.4    
+spdx_license_key: LicenseRef-scancode-anti-capitalist-1.4

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

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

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

@@ -2,8 +2,8 @@ key: bohl-0.2
 short_name: BOHL-0.2
 name: The Balloon Open Hardware License v0.2
 category: Permissive
-spdx_license_key: LicenseRef-scancode-bohl-0.2
 owner: The Balloon
+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
 ignorable_copyrights:

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

@@ -1,9 +1,9 @@
 key: cc-by-3.0-de
 language: de
-category: Permissive
-owner: Creative Commons
 short_name: Creative Commons Attribution 3.0 Germany
 name: Creative Commons Attribution 3.0 Germany
+category: Permissive
+owner: Creative Commons
 spdx_license_key: CC-BY-3.0-DE
 other_urls:
     - https://creativecommons.org/licenses/by/3.0/de/legalcode

src/licensedcode/data/licenses/cc-by-3.0-nl.yml

@@ -1,9 +1,9 @@
 key: cc-by-3.0-nl
 language: nl
-category: Permissive
-owner: Creative Commons
 short_name: Creative Commons Attribution 3.0 Netherlands
 name: Creative Commons Attribution 3.0 Netherlands
+category: Permissive
+owner: Creative Commons
 spdx_license_key: CC-BY-3.0-NL
 other_urls:
     - https://creativecommons.org/licenses/by/3.0/nl/legalcode

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

@@ -1,9 +1,9 @@
 key: cc-by-nc-3.0-de
 language: de
 short_name: CC-BY-NC-3.0-DE
+name: Creative Commons Attribution Non Commercial 3.0 Germany
 category: Free Restricted
 owner: Creative Commons
-name: Creative Commons Attribution Non Commercial 3.0 Germany
 spdx_license_key: CC-BY-NC-3.0-DE
 other_urls:
     - https://creativecommons.org/licenses/by-nc/3.0/de/legalcode

src/licensedcode/data/licenses/cc-by-nc-nd-2.0-at.yml

@@ -5,7 +5,6 @@ name: Creative Commons Namensnennung - Nicht-kommerziell - Keine Bearbeitung 2.0
 category: Free Restricted
 owner: Creative Commons
 homepage_url: https://creativecommons.org/licenses/by-nc-nd/2.0/
+spdx_license_key: LicenseRef-scancode-cc-by-nc-nd-2.0-at
 text_urls:
     - https://creativecommons.org/licenses/by-nc-nd/2.0/legalcode.at
-spdx_license_key: LicenseRef-scancode-cc-by-nc-nd-2.0-at
-    

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

@@ -1,9 +1,9 @@
 key: cc-by-nc-nd-3.0-de
 language: de
-category: Free Restricted
-owner: Creative Commons
 short_name: CC-BY-NC-ND-3.0-DE
 name: Creative Commons Attribution Non Commercial No Derivatives 3.0 Germany
+category: Free Restricted
+owner: Creative Commons
 spdx_license_key: CC-BY-NC-ND-3.0-DE
 other_urls:
     - https://creativecommons.org/licenses/by-nc-nd/3.0/de/legalcode

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

@@ -1,9 +1,9 @@
 key: cc-by-nc-sa-2.0-fr
 language: fr
-category: Free Restricted
-owner: Creative Commons
 short_name: CC-BY-NC-SA-2.0-FR
 name: Creative Commons Attribution-NonCommercial-ShareAlike 2.0 France
+category: Free Restricted
+owner: Creative Commons
 spdx_license_key: CC-BY-NC-SA-2.0-FR
 other_urls:
     - https://creativecommons.org/licenses/by-nc-sa/2.0/fr/legalcode