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

Spring 2022 license updates

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

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

@@ -1,9 +1,9 @@
 key: cc-by-nc-sa-3.0-de
-category: Free Restricted
-owner: Creative Commons
 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
+owner: Creative Commons
 spdx_license_key: CC-BY-NC-SA-3.0-DE
 other_urls:
     - https://creativecommons.org/licenses/by-nc-sa/3.0/de/legalcode

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

@@ -1,10 +1,10 @@
 key: cc-by-nc-sa-3.0-igo
 short_name: CC-BY-NC-SA-3.0-IGO
 name: Creative Commons Attribution Non Commercial Share Alike 3.0 IGO
-spdx_license_key: CC-BY-NC-SA-3.0-IGO
 category: Source-available
 owner: Creative Commons
 homepage_url: http://creativecommons.org/licenses/by-nc-sa/3.0/igo/
+spdx_license_key: CC-BY-NC-SA-3.0-IGO
 text_urls:
     - https://creativecommons.org/licenses/by-nc-sa/3.0/igo/legalcode
 other_urls:

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

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

src/licensedcode/data/licenses/cc-by-sa-2.1-jp.yml

@@ -1,5 +1,5 @@
 key: cc-by-sa-2.1-jp
-language: jp
+language: ja
 short_name: Creative Commons Attribution Share Alike 2.1 Japan
 name: Creative Commons Attribution Share Alike 2.1 Japan
 category: Copyleft Limited

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

@@ -1,12 +1,12 @@
 key: cc-by-sa-3.0-de
 language: de
-category: Copyleft Limited
 short_name: CC-BY-SA-3.0-DE
 name: Creative Commons Attribution Share Alike 3.0 Germany
+category: Copyleft Limited
+owner: Creative Commons
 spdx_license_key: CC-BY-SA-3.0-DE
 other_urls:
     - https://creativecommons.org/licenses/by-sa/3.0/de/legalcode
 ignorable_urls:
     - https://creativecommons.org/
     - https://creativecommons.org/compatiblelicenses
-owner: Creative Commons

src/licensedcode/data/licenses/cecill-1.0-en.yml

@@ -1,5 +1,4 @@
 key: cecill-1.0-en
-language: en
 short_name: CeCILL 1.0 English
 name: CeCILL Free Software License Agreement v1.0 English
 category: Copyleft

src/licensedcode/data/licenses/cecill-2.0-fr.yml

@@ -1,6 +1,7 @@
 key: cecill-2.0-fr
 short_name: CeCILL 2.0 French
 name: CeCILL Free Software License Agreement v2.0 French
+language: fr
 category: Copyleft Limited
 owner: CeCILL
 homepage_url: http://www.cecill.info/licences.en.html

src/licensedcode/data/licenses/cecill-2.1-fr.yml

@@ -2,6 +2,7 @@ key: cecill-2.1-fr
 short_name: CeCILL 2.1 French
 name: CeCILL Free Software License Agreement v2.1 French
 category: Copyleft Limited
+language: fr
 owner: CeCILL
 homepage_url: http://www.cecill.info/licences/Licence_CeCILL_V2.1-fr.html
 spdx_license_key: LicenseRef-scancode-cecill-2.1-fr

src/licensedcode/data/licenses/cecill-2.1.yml

@@ -5,6 +5,7 @@ category: Copyleft Limited
 owner: CeCILL
 homepage_url: http://www.cecill.info/licences/Licence_CeCILL_V2.1-fr.html
 spdx_license_key: CECILL-2.1
+osi_license_key: CECILL-2.1
 text_urls:
     - http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.html
     - http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
@@ -15,4 +16,3 @@ other_urls:
     - http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.html
 ignorable_urls:
     - http://www.cecill.info/index.en.html
-osi_license_key: CECILL-2.1

src/licensedcode/data/licenses/cecill-b-en.yml

@@ -1,5 +1,4 @@
 key: cecill-b-en
-language: en
 short_name: CeCILL-B License English
 name: CeCILL-B Free Software License Agreement English
 category: Permissive

src/licensedcode/data/licenses/cecill-c-en.yml

@@ -4,9 +4,7 @@ name: CeCILL-C Free Software License Agreement English
 category: Copyleft
 owner: CeCILL
 homepage_url: http://www.cecill.info/licences/Licence_CeCILL-C_V1-en.html
-notes: |
-    This is the English translation of 
-    http://www.cecill.info/licences/Licence_CeCILL-C_V1-fr.html
+notes: "This is the English translation of \nhttp://www.cecill.info/licences/Licence_CeCILL-C_V1-fr.html\n"
 spdx_license_key: LicenseRef-scancode-cecill-c-en
 text_urls:
     - http://www.cecill.info/licences/Licence_CeCILL-C_V1-en.html

src/licensedcode/data/licenses/cpol-1.0.yml

@@ -4,11 +4,11 @@ name: Code Project Open License (CPOL) 1.0
 category: Free Restricted
 owner: Code Project
 homepage_url: http://www.codeproject.com/info/cpol10.aspx
+notes: this license had a short life and was quickly replaced by version 1.02. Yet there are
+    some example of usage in the wild.
 spdx_license_key: LicenseRef-scancode-cpol-1.0
 text_urls:
     - http://www.codeproject.com/info/CPOL.zip
     - http://www.codeproject.com/info/cpol10.aspx
     - https://web.archive.org/web/20080107184757/https://www.codeproject.com/info/cpol10.aspx
-notes: this license had a short life and was quickly replaced by version 1.02.
- Yet there are some example of usage in the wild.
-minimum_coverage: 95
+minimum_coverage: 95

src/licensedcode/data/licenses/defensive-patent-1.1.yml

@@ -1,10 +1,10 @@
 key: defensive-patent-1.1
 short_name: Defensive Patent License v1.1
 name: Defensive Patent License v1.1
-owner: DPL
 category: Copyleft
-spdx_license_key: LicenseRef-scancode-defensive-patent-1.1
+owner: DPL
 homepage_url: https://www.defensivepatentlicense.org/
+spdx_license_key: LicenseRef-scancode-defensive-patent-1.1
 text_urls:
     - https://www.defensivepatentlicense.org/license
 ignorable_urls:

src/licensedcode/data/licenses/dl-de-by-2-0-en.yml

@@ -7,6 +7,5 @@ homepage_url: http://www.govdata.de/dl-de/by-2-0
 other_urls:
     - https://www.dcat-ap.de/def/licenses/
 spdx_license_key: LicenseRef-scancode-dl-de-by-2-0-en
-notes:
 ignorable_urls:
   - http://www.govdata.de/dl-de/by-2-0

src/licensedcode/data/licenses/google-analytics-tos-2019.yml

@@ -10,11 +10,10 @@ other_urls:
     - http://www.google.com/privacy.html
     - https://support.google.com/analytics/#topic=3544906
 ignorable_urls:
-  - http://www.google.com/analytics
-  - http://www.google.com/analytics/policies
-  - http://www.google.com/analytics/policies/
-  - http://www.google.com/policies/privacy/partners
-  - https://support.google.com/marketingplatform/answer/9047313
-  - https://www.google.com/analytics/terms
-  - https://www.google.com/policies/privacy
-
+    - http://www.google.com/analytics
+    - http://www.google.com/analytics/policies
+    - http://www.google.com/analytics/policies/
+    - http://www.google.com/policies/privacy/partners
+    - https://support.google.com/marketingplatform/answer/9047313
+    - https://www.google.com/analytics/terms
+    - https://www.google.com/policies/privacy

src/licensedcode/data/licenses/google-maps-tos-2018-02-07.yml

@@ -8,17 +8,16 @@ spdx_license_key: LicenseRef-scancode-google-maps-tos-2018-02-07
 text_urls:
     - https://developers.google.com/maps/terms-20180207
 minimum_coverage: 90
-ignorable_authors:
-  - the U.S. Department of State. Remove
 ignorable_copyrights:
-  - (c) Google Australia Pty Ltd.
+    - (c) Google Australia Pty Ltd.
 ignorable_holders:
-  - Google Australia Pty Ltd.
+    - Google Australia Pty Ltd.
+ignorable_authors:
+    - the U.S. Department of State. Remove
 ignorable_urls:
-  - http://developers.google.com/maps/maps-api-list
-  - http://developers.google.com/maps/terms
-  - http://www.google.com/intl/en/about/company/software-principles.html
-  - http://www.google.com/policies/privacy
-  - https://developers.google.com/products/
-  - https://www.google.com/maps
-
+    - http://developers.google.com/maps/maps-api-list
+    - http://developers.google.com/maps/terms
+    - http://www.google.com/intl/en/about/company/software-principles.html
+    - http://www.google.com/policies/privacy
+    - https://developers.google.com/products/
+    - https://www.google.com/maps

src/licensedcode/data/licenses/google-maps-tos-2018-05-01.yml

@@ -9,28 +9,27 @@ text_urls:
     - https://cloud.google.com/maps-platform/terms/index-20180501
 minimum_coverage: 90
 ignorable_authors:
-  - the U.S. Department
-  - the United States Department of State
-ignorable_emails:
-  - [email protected]
+    - the U.S. Department
+    - the United States Department of State
 ignorable_urls:
-  - https://cloud.google.com/maps-platform/pricing/sheet/
-  - https://cloud.google.com/maps-platform/terms
-  - https://cloud.google.com/maps-platform/terms/aup
-  - https://cloud.google.com/maps-platform/terms/maps-controller-terms
-  - https://cloud.google.com/maps-platform/terms/maps-deprecation
-  - https://cloud.google.com/maps-platform/terms/maps-prohibited-territories
-  - https://cloud.google.com/maps-platform/terms/maps-service-terms
-  - https://cloud.google.com/maps-platform/terms/maps-services
-  - https://cloud.google.com/maps-platform/terms/sla
-  - https://cloud.google.com/maps-platform/terms/tssg
-  - https://developers.google.com/maps
-  - https://developers.google.com/maps/terms
-  - https://www.google.com/about/company/user-consent-policy.html
-  - https://www.google.com/dmca.html
-  - https://www.google.com/help/legalnotices_maps.html
-  - https://www.google.com/permissions/geoguidelines.html#geotrademark
-  - https://www.google.com/permissions/geoguidelines.html#geotrademarkpolicy
-  - https://www.google.com/permissions/trademark/brand-terms.html
-  - https://www.google.com/policies/privacy
-
+    - https://cloud.google.com/maps-platform/pricing/sheet/
+    - https://cloud.google.com/maps-platform/terms
+    - https://cloud.google.com/maps-platform/terms/aup
+    - https://cloud.google.com/maps-platform/terms/maps-controller-terms
+    - https://cloud.google.com/maps-platform/terms/maps-deprecation
+    - https://cloud.google.com/maps-platform/terms/maps-prohibited-territories
+    - https://cloud.google.com/maps-platform/terms/maps-service-terms
+    - https://cloud.google.com/maps-platform/terms/maps-services
+    - https://cloud.google.com/maps-platform/terms/sla
+    - https://cloud.google.com/maps-platform/terms/tssg
+    - https://developers.google.com/maps
+    - https://developers.google.com/maps/terms
+    - https://www.google.com/about/company/user-consent-policy.html
+    - https://www.google.com/dmca.html
+    - https://www.google.com/help/legalnotices_maps.html
+    - https://www.google.com/permissions/geoguidelines.html#geotrademark
+    - https://www.google.com/permissions/geoguidelines.html#geotrademarkpolicy
+    - https://www.google.com/permissions/trademark/brand-terms.html
+    - https://www.google.com/policies/privacy
+ignorable_emails:
+    - [email protected]