diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 15071ad..c246018 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,15 @@ Changelog ========= +v30.4.1 - 2025-01-10 +-------------------- + +This is a minor release without API changes: + +- Use latest skeleton +- Update license list to latest ScanCode and SPDX 3.26 + + v30.4.0 - 2024-10-21 -------------------- diff --git a/README.rst b/README.rst index 24dcb67..93a3fb5 100644 --- a/README.rst +++ b/README.rst @@ -25,8 +25,8 @@ SPDX and SBOM in general) as a way to express licensing precisely. simplify and normalize these license expressions (such as SPDX license expressions) using boolean logic like in: `GPL-2.0-or-later WITH Classpath-exception-2.0 AND MIT`. -It includes the license keys from SPDX https://spdx.org/licenses/ (version 3.25) -and ScanCode license DB (version 32.3.0, last published on 2024-10-24). +It includes the license keys from SPDX https://spdx.org/licenses/ (version 3.26) +and ScanCode LicenseDB (from scancode-toolkit version 32.3.1, last published on 2025-01-10). See https://scancode-licensedb.aboutcode.org/ to get started quickly. ``license-expression`` is both powerful and simple to use and is a used as the diff --git a/setup.cfg b/setup.cfg index bc38e3a..7818231 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = license-expression -version = 30.4.0 +version = 30.4.1 license = Apache-2.0 # description must be on ONE line https://github.com/pypa/setuptools/issues/1390 diff --git a/src/license_expression/data/license_key_index.json.ABOUT b/src/license_expression/data/license_key_index.json.ABOUT index 586fd4a..adc86b6 100644 --- a/src/license_expression/data/license_key_index.json.ABOUT +++ b/src/license_expression/data/license_key_index.json.ABOUT @@ -1,6 +1,6 @@ about_resource: scancode-licensedb-index.json download_url: https://raw.githubusercontent.com/aboutcode-org/scancode-licensedb/1e9ff1927b89bae4ca1356de77aa29cc18916025/docs/index.json -spdx_license_list_version: 3.25 +spdx_license_list_version: 3.26 name: scancode-licensedb-index.json license_expression: cc-by-4.0 copyright: Copyright (c) nexB Inc. and others. diff --git a/src/license_expression/data/scancode-licensedb-index.json b/src/license_expression/data/scancode-licensedb-index.json index 214f8f2..e6df30e 100644 --- a/src/license_expression/data/scancode-licensedb-index.json +++ b/src/license_expression/data/scancode-licensedb-index.json @@ -171,6 +171,18 @@ "html": "acroname-bdk.html", "license": "acroname-bdk.LICENSE" }, + { + "license_key": "activepieces-enterprise-2023", + "category": "Commercial", + "spdx_license_key": "LicenseRef-scancode-activepieces-enterprise-2023", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "activepieces-enterprise-2023.json", + "yaml": "activepieces-enterprise-2023.yml", + "html": "activepieces-enterprise-2023.html", + "license": "activepieces-enterprise-2023.LICENSE" + }, { "license_key": "activestate-community", "category": "Proprietary Free", @@ -1219,6 +1231,18 @@ "html": "any-osi.html", "license": "any-osi.LICENSE" }, + { + "license_key": "any-osi-perl-modules", + "category": "Unstated License", + "spdx_license_key": "any-OSI-perl-modules", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "any-osi-perl-modules.json", + "yaml": "any-osi-perl-modules.yml", + "html": "any-osi-perl-modules.html", + "license": "any-osi-perl-modules.LICENSE" + }, { "license_key": "aop-pd", "category": "Public Domain", @@ -1321,9 +1345,9 @@ { "license_key": "apache-patent-exception", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-apache-patent-exception", + "spdx_license_key": "mxml-exception", "other_spdx_license_keys": [ - "LicenseRef-scancode-apache-patent-provision-exception" + "LicenseRef-scancode-apache-patent-exception" ], "is_exception": true, "is_deprecated": false, @@ -2088,6 +2112,18 @@ "html": "autoopts-exception-2.0.html", "license": "autoopts-exception-2.0.LICENSE" }, + { + "license_key": "autosar-proprietary", + "category": "Proprietary Free", + "spdx_license_key": "LicenseRef-scancode-autosar-proprietary", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "autosar-proprietary.json", + "yaml": "autosar-proprietary.yml", + "html": "autosar-proprietary.html", + "license": "autosar-proprietary.LICENSE" + }, { "license_key": "avisynth-c-interface-exception", "category": "Copyleft Limited", @@ -4878,8 +4914,10 @@ { "license_key": "cc-pdm-1.0", "category": "Public Domain", - "spdx_license_key": "LicenseRef-scancode-cc-pdm-1.0", - "other_spdx_license_keys": [], + "spdx_license_key": "CC-PDM-1.0", + "other_spdx_license_keys": [ + "LicenseRef-scancode-cc-pdm-1.0" + ], "is_exception": false, "is_deprecated": false, "json": "cc-pdm-1.0.json", @@ -4890,8 +4928,10 @@ { "license_key": "cc-sa-1.0", "category": "Copyleft", - "spdx_license_key": "LicenseRef-scancode-cc-sa-1.0", - "other_spdx_license_keys": [], + "spdx_license_key": "CC-SA-1.0", + "other_spdx_license_keys": [ + "LicenseRef-scancode-cc-sa-1.0" + ], "is_exception": false, "is_deprecated": false, "json": "cc-sa-1.0.json", @@ -5247,6 +5287,18 @@ "html": "cfitsio.html", "license": "cfitsio.LICENSE" }, + { + "license_key": "cgal-linking-exception", + "category": "Copyleft Limited", + "spdx_license_key": "CGAL-linking-exception", + "other_spdx_license_keys": [], + "is_exception": true, + "is_deprecated": false, + "json": "cgal-linking-exception.json", + "yaml": "cgal-linking-exception.yml", + "html": "cgal-linking-exception.html", + "license": "cgal-linking-exception.LICENSE" + }, { "license_key": "cgic", "category": "Permissive", @@ -5466,8 +5518,10 @@ { "license_key": "click-license", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-click-license", - "other_spdx_license_keys": [], + "spdx_license_key": "MIT-Click", + "other_spdx_license_keys": [ + "LicenseRef-scancode-click-license" + ], "is_exception": false, "is_deprecated": false, "json": "click-license.json", @@ -6315,6 +6369,18 @@ "html": "cryptopp.html", "license": "cryptopp.LICENSE" }, + { + "license_key": "cryptoswift", + "category": "Permissive", + "spdx_license_key": "LicenseRef-scancode-cryptoswift", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "cryptoswift.json", + "yaml": "cryptoswift.yml", + "html": "cryptoswift.html", + "license": "cryptoswift.LICENSE" + }, { "license_key": "crystal-stacker", "category": "Permissive", @@ -6907,6 +6973,18 @@ "html": "divx-open-2.1.html", "license": "divx-open-2.1.LICENSE" }, + { + "license_key": "djangosnippets-tos", + "category": "CLA", + "spdx_license_key": "LicenseRef-scancode-djangosnippets-tos", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "djangosnippets-tos.json", + "yaml": "djangosnippets-tos.yml", + "html": "djangosnippets-tos.html", + "license": "djangosnippets-tos.LICENSE" + }, { "license_key": "dl-de-by-1-0-de", "category": "Permissive", @@ -7055,6 +7133,18 @@ "html": "docbook-schema.html", "license": "docbook-schema.LICENSE" }, + { + "license_key": "docbook-stylesheet", + "category": "Permissive", + "spdx_license_key": "DocBook-Stylesheet", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "docbook-stylesheet.json", + "yaml": "docbook-stylesheet.yml", + "html": "docbook-stylesheet.html", + "license": "docbook-stylesheet.LICENSE" + }, { "license_key": "dom4j", "category": "Permissive", @@ -8702,6 +8792,18 @@ "html": "freertos-exception-2.0.html", "license": "freertos-exception-2.0.LICENSE" }, + { + "license_key": "freertos-mit", + "category": "Permissive", + "spdx_license_key": "LicenseRef-scancode-freertos-mit", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "freertos-mit.json", + "yaml": "freertos-mit.yml", + "html": "freertos-mit.html", + "license": "freertos-mit.LICENSE" + }, { "license_key": "freetts", "category": "Permissive", @@ -9190,6 +9292,18 @@ "html": "generic-trademark.html", "license": "generic-trademark.LICENSE" }, + { + "license_key": "generic-xts", + "category": "Permissive", + "spdx_license_key": "generic-xts", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "generic-xts.json", + "yaml": "generic-xts.yml", + "html": "generic-xts.html", + "license": "generic-xts.LICENSE" + }, { "license_key": "genivia-gsoap", "category": "Commercial", @@ -10743,6 +10857,18 @@ "html": "gpl-3.0.html", "license": "gpl-3.0.LICENSE" }, + { + "license_key": "gpl-3.0-389-ds-base-exception", + "category": "Copyleft Limited", + "spdx_license_key": "GPL-3.0-389-ds-base-exception", + "other_spdx_license_keys": [], + "is_exception": true, + "is_deprecated": false, + "json": "gpl-3.0-389-ds-base-exception.json", + "yaml": "gpl-3.0-389-ds-base-exception.yml", + "html": "gpl-3.0-389-ds-base-exception.html", + "license": "gpl-3.0-389-ds-base-exception.LICENSE" + }, { "license_key": "gpl-3.0-aptana", "category": "Copyleft", @@ -11087,8 +11213,10 @@ { "license_key": "guile-exception-2.0", "category": "Copyleft Limited", - "spdx_license_key": "LicenseRef-scancode-guile-exception-2.0", - "other_spdx_license_keys": [], + "spdx_license_key": "harbour-exception", + "other_spdx_license_keys": [ + "LicenseRef-scancode-guile-exception-2.0" + ], "is_exception": true, "is_deprecated": false, "json": "guile-exception-2.0.json", @@ -12295,8 +12423,9 @@ { "license_key": "independent-module-linking-exception", "category": "Copyleft Limited", - "spdx_license_key": "LicenseRef-scancode-indie-module-linking-exception", + "spdx_license_key": "Independent-modules-exception", "other_spdx_license_keys": [ + "LicenseRef-scancode-indie-module-linking-exception", "LicenseRef-scancode-independent-module-linking-exception" ], "is_exception": true, @@ -12491,8 +12620,10 @@ { "license_key": "inno-setup", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-inno-setup", - "other_spdx_license_keys": [], + "spdx_license_key": "InnoSetup", + "other_spdx_license_keys": [ + "LicenseRef-scancode-inno-setup" + ], "is_exception": false, "is_deprecated": false, "json": "inno-setup.json", @@ -13794,6 +13925,18 @@ "html": "lance-norskog-license.html", "license": "lance-norskog-license.LICENSE" }, + { + "license_key": "lanl-bsd-3-variant", + "category": "Permissive", + "spdx_license_key": "LicenseRef-scancode-lanl-bsd-3-variant", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "lanl-bsd-3-variant.json", + "yaml": "lanl-bsd-3-variant.yml", + "html": "lanl-bsd-3-variant.html", + "license": "lanl-bsd-3-variant.LICENSE" + }, { "license_key": "larabie", "category": "Proprietary Free", @@ -15813,6 +15956,18 @@ "html": "minpack.html", "license": "minpack.LICENSE" }, + { + "license_key": "mips", + "category": "Permissive", + "spdx_license_key": "MIPS", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "mips.json", + "yaml": "mips.yml", + "html": "mips.html", + "license": "mips.LICENSE" + }, { "license_key": "mir-os", "category": "Permissive", @@ -19623,6 +19778,18 @@ "html": "oll-1.0.html", "license": "oll-1.0.LICENSE" }, + { + "license_key": "omg-bpmn-2.0", + "category": "Proprietary Free", + "spdx_license_key": "LicenseRef-scancode-omg-bpmn-2.0", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "omg-bpmn-2.0.json", + "yaml": "omg-bpmn-2.0.yml", + "html": "omg-bpmn-2.0.html", + "license": "omg-bpmn-2.0.LICENSE" + }, { "license_key": "on2-patent", "category": "Patent License", @@ -22903,6 +23070,18 @@ "html": "rockchip-proprietary-2022.html", "license": "rockchip-proprietary-2022.LICENSE" }, + { + "license_key": "rocket-master-terms-2022", + "category": "Commercial", + "spdx_license_key": "LicenseRef-scancode-rocket-master-terms-2022", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "rocket-master-terms-2022.json", + "yaml": "rocket-master-terms-2022.yml", + "html": "rocket-master-terms-2022.html", + "license": "rocket-master-terms-2022.LICENSE" + }, { "license_key": "rogue-wave", "category": "Commercial", @@ -23193,6 +23372,18 @@ "html": "safecopy-eula.html", "license": "safecopy-eula.LICENSE" }, + { + "license_key": "salesforcesans-font", + "category": "Proprietary Free", + "spdx_license_key": "LicenseRef-scancode-salesforcesans-font", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "salesforcesans-font.json", + "yaml": "salesforcesans-font.yml", + "html": "salesforcesans-font.html", + "license": "salesforcesans-font.LICENSE" + }, { "license_key": "san-francisco-font", "category": "Proprietary Free", @@ -23629,6 +23820,18 @@ "html": "sendmail-8.23.html", "license": "sendmail-8.23.LICENSE" }, + { + "license_key": "sendmail-open-source-1.1", + "category": "Permissive", + "spdx_license_key": "Sendmail-Open-Source-1.1", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "sendmail-open-source-1.1.json", + "yaml": "sendmail-open-source-1.1.yml", + "html": "sendmail-open-source-1.1.html", + "license": "sendmail-open-source-1.1.LICENSE" + }, { "license_key": "service-comp-arch", "category": "Permissive", @@ -23980,8 +24183,10 @@ { "license_key": "smail-gpl", "category": "Copyleft", - "spdx_license_key": "LicenseRef-scancode-smail-gpl", - "other_spdx_license_keys": [], + "spdx_license_key": "SMAIL-GPL", + "other_spdx_license_keys": [ + "LicenseRef-scancode-smail-gpl" + ], "is_exception": false, "is_deprecated": false, "json": "smail-gpl.json", @@ -24061,6 +24266,42 @@ "html": "snmp4j-smi.html", "license": "snmp4j-smi.LICENSE" }, + { + "license_key": "snowplow-cla-1.0", + "category": "Proprietary Free", + "spdx_license_key": "LicenseRef-scancode-snowplow-cla-1.0", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "snowplow-cla-1.0.json", + "yaml": "snowplow-cla-1.0.yml", + "html": "snowplow-cla-1.0.html", + "license": "snowplow-cla-1.0.LICENSE" + }, + { + "license_key": "snowplow-lula-1.0", + "category": "Proprietary Free", + "spdx_license_key": "LicenseRef-scancode-snowplow-lula-1.0", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "snowplow-lula-1.0.json", + "yaml": "snowplow-lula-1.0.yml", + "html": "snowplow-lula-1.0.html", + "license": "snowplow-lula-1.0.LICENSE" + }, + { + "license_key": "snowplow-person-academic-1.0", + "category": "Proprietary Free", + "spdx_license_key": "LicenseRef-scancode-snowplow-person-academic-1.0", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "snowplow-person-academic-1.0.json", + "yaml": "snowplow-person-academic-1.0.yml", + "html": "snowplow-person-academic-1.0.html", + "license": "snowplow-person-academic-1.0.LICENSE" + }, { "license_key": "snprintf", "category": "Permissive", @@ -24075,6 +24316,18 @@ "html": "snprintf.html", "license": "snprintf.LICENSE" }, + { + "license_key": "socketxx-2003", + "category": "Permissive", + "spdx_license_key": "LicenseRef-scancode-socketxx-2003", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "socketxx-2003.json", + "yaml": "socketxx-2003.yml", + "html": "socketxx-2003.html", + "license": "socketxx-2003.LICENSE" + }, { "license_key": "softerra-ldap-browser-eula", "category": "Proprietary Free", @@ -24472,8 +24725,10 @@ { "license_key": "stlport-4.5", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-stlport-4.5", - "other_spdx_license_keys": [], + "spdx_license_key": "Boehm-GC-without-fee", + "other_spdx_license_keys": [ + "LicenseRef-scancode-stlport-4.5" + ], "is_exception": false, "is_deprecated": false, "json": "stlport-4.5.json", @@ -25665,6 +25920,18 @@ "html": "tekhvc.html", "license": "tekhvc.LICENSE" }, + { + "license_key": "teleport-ce-2024", + "category": "Proprietary Free", + "spdx_license_key": "LicenseRef-scancode-teleport-ce-2024", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "teleport-ce-2024.json", + "yaml": "teleport-ce-2024.yml", + "html": "teleport-ce-2024.html", + "license": "teleport-ce-2024.LICENSE" + }, { "license_key": "telerik-eula", "category": "Commercial", @@ -25803,6 +26070,18 @@ "html": "things-i-made-public-license.html", "license": "things-i-made-public-license.LICENSE" }, + { + "license_key": "thirdeye", + "category": "Permissive", + "spdx_license_key": "ThirdEye", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "thirdeye.json", + "yaml": "thirdeye.yml", + "html": "thirdeye.html", + "license": "thirdeye.LICENSE" + }, { "license_key": "thomas-bandt", "category": "Free Restricted", @@ -26165,6 +26444,18 @@ "html": "truecrypt-3.1.html", "license": "truecrypt-3.1.LICENSE" }, + { + "license_key": "trustedqsl", + "category": "Permissive", + "spdx_license_key": "TrustedQSL", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "trustedqsl.json", + "yaml": "trustedqsl.yml", + "html": "trustedqsl.html", + "license": "trustedqsl.LICENSE" + }, { "license_key": "trustonic-proprietary-2013", "category": "Proprietary Free", @@ -26366,7 +26657,8 @@ "category": "Copyleft Limited", "spdx_license_key": "Ubuntu-font-1.0", "other_spdx_license_keys": [ - "LicenseRef-scancode-ubuntu-font-1.0" + "LicenseRef-scancode-ubuntu-font-1.0", + "LicenseRef-UFL-1.0" ], "is_exception": false, "is_deprecated": false, @@ -27680,6 +27972,18 @@ "html": "wthpl-1.0.html", "license": "wthpl-1.0.LICENSE" }, + { + "license_key": "wwl", + "category": "Permissive", + "spdx_license_key": "wwl", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "wwl.json", + "yaml": "wwl.yml", + "html": "wwl.html", + "license": "wwl.LICENSE" + }, { "license_key": "wxwidgets", "category": "Permissive",