From dc8eaa6980fdb74500e23d8329e3c2dd960e7dce Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Thu, 22 Aug 2024 15:08:30 +0530 Subject: [PATCH] Bump SPDX License List version in CHANGELOG Signed-off-by: Ayan Sinha Mahapatra --- CHANGELOG.rst | 8 ++++++++ src/licensedcode/data/licenses/x11-swapped.LICENSE | 2 +- src/scancode_config.py | 5 +++-- tests/formattedcode/data/spdx/license_known/expected.rdf | 2 +- tests/formattedcode/data/spdx/license_known/expected.tv | 2 +- .../data/spdx/license_known/expected_with_text.rdf | 2 +- .../data/spdx/license_known/expected_with_text.tv | 2 +- tests/formattedcode/data/spdx/license_ref/expected.rdf | 2 +- tests/formattedcode/data/spdx/license_ref/expected.tv | 2 +- .../data/spdx/license_ref/expected_with_text.rdf | 2 +- .../data/spdx/license_ref/expected_with_text.tv | 2 +- tests/formattedcode/data/spdx/or_later/expected.rdf | 2 +- tests/formattedcode/data/spdx/simple/expected.rdf | 2 +- tests/formattedcode/data/spdx/simple/expected.tv | 2 +- tests/formattedcode/data/spdx/tree/expected.rdf | 2 +- tests/formattedcode/data/spdx/tree/expected.tv | 2 +- tests/formattedcode/data/spdx/unicode/expected.rdf | 2 +- tests/formattedcode/data/spdx/unicode/expected.tv | 2 +- 18 files changed, 27 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index fe353d9fe0b..086fd2bc66e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -37,6 +37,14 @@ v33.0.0 (next next, roadmap) - Update link references of ownership from nexB to aboutcode-org See https://github.com/aboutcode-org/scancode-toolkit/issues/3885 +- New and updated licenses, including support for newly released + SPDX license list versions: + - SPDX License List 3.25.0: + This release of the SPDX license list had 9 new licenses + and exceptions, and out of them 5 were present as licenses + and 2 were present as rules already. There were 2 new + license/exception texts added, and also 1 license was deprecated. + For more details see https://github.com/aboutcode-org/scancode-toolkit/pull/3897 v32.2.1 - 2024-07-02 --------------------- diff --git a/src/licensedcode/data/licenses/x11-swapped.LICENSE b/src/licensedcode/data/licenses/x11-swapped.LICENSE index c84741d0224..ef1ca57e4a1 100644 --- a/src/licensedcode/data/licenses/x11-swapped.LICENSE +++ b/src/licensedcode/data/licenses/x11-swapped.LICENSE @@ -3,7 +3,7 @@ key: x11-swapped short_name: X11 swapped final paragraphs name: X11 swapped final paragraphs category: Permissive -owner: Unspecified +owner: Derick Eddington notes: | Added in SPDX license list 3.25 This was previously the license rule: x11-xconsortium_37.RULE diff --git a/src/scancode_config.py b/src/scancode_config.py index f6e1a52572c..976bcca2826 100644 --- a/src/scancode_config.py +++ b/src/scancode_config.py @@ -143,8 +143,9 @@ def _create_dir(location): # on the data format version __output_format_version__ = '3.2.0' -# -spdx_license_list_version = '3.24' +# see https://github.com/spdx/tools-python/issues/820 +# this is actually `3.25.0` +spdx_license_list_version = '3.25' ################################################################################ # USAGE MODE-, INSTALLATION- and IMPORT- and RUN-SPECIFIC DIRECTORIES diff --git a/tests/formattedcode/data/spdx/license_known/expected.rdf b/tests/formattedcode/data/spdx/license_known/expected.rdf index e5941055e2c..a88dfd87b27 100644 --- a/tests/formattedcode/data/spdx/license_known/expected.rdf +++ b/tests/formattedcode/data/spdx/license_known/expected.rdf @@ -94,7 +94,7 @@ "@rdf:resource": "http://spdx.org/licenses/CC0-1.0" }, "@rdf:about": "#SPDXRef-DOCUMENT", - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.24", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.25", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/license_known/expected.tv b/tests/formattedcode/data/spdx/license_known/expected.tv index 2bee4356a57..7e92ad41205 100644 --- a/tests/formattedcode/data/spdx/license_known/expected.tv +++ b/tests/formattedcode/data/spdx/license_known/expected.tv @@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney for any legal advice. ScanCode is a free software code scanning tool from nexB Inc. and others. Visit https://github.com/nexB/scancode-toolkit/ for support and download. -SPDX License List: 3.24 +SPDX License List: 3.25 ## Creation Information ## Package Information PackageName: scan diff --git a/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf b/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf index e5941055e2c..a88dfd87b27 100644 --- a/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf +++ b/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf @@ -94,7 +94,7 @@ "@rdf:resource": "http://spdx.org/licenses/CC0-1.0" }, "@rdf:about": "#SPDXRef-DOCUMENT", - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.24", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.25", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/license_known/expected_with_text.tv b/tests/formattedcode/data/spdx/license_known/expected_with_text.tv index 2bee4356a57..7e92ad41205 100644 --- a/tests/formattedcode/data/spdx/license_known/expected_with_text.tv +++ b/tests/formattedcode/data/spdx/license_known/expected_with_text.tv @@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney for any legal advice. ScanCode is a free software code scanning tool from nexB Inc. and others. Visit https://github.com/nexB/scancode-toolkit/ for support and download. -SPDX License List: 3.24 +SPDX License List: 3.25 ## Creation Information ## Package Information PackageName: scan diff --git a/tests/formattedcode/data/spdx/license_ref/expected.rdf b/tests/formattedcode/data/spdx/license_ref/expected.rdf index 928b80511f5..23da4d5767b 100644 --- a/tests/formattedcode/data/spdx/license_ref/expected.rdf +++ b/tests/formattedcode/data/spdx/license_ref/expected.rdf @@ -116,7 +116,7 @@ } } ], - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.24", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.25", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/license_ref/expected.tv b/tests/formattedcode/data/spdx/license_ref/expected.tv index 40917f1a1f9..e638c308db1 100644 --- a/tests/formattedcode/data/spdx/license_ref/expected.tv +++ b/tests/formattedcode/data/spdx/license_ref/expected.tv @@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney for any legal advice. ScanCode is a free software code scanning tool from nexB Inc. and others. Visit https://github.com/nexB/scancode-toolkit/ for support and download. -SPDX License List: 3.24 +SPDX License List: 3.25 ## Creation Information ## Package Information PackageName: scan diff --git a/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf b/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf index 89bb7331ec6..40a88ce0b0f 100644 --- a/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf +++ b/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf @@ -116,7 +116,7 @@ } } ], - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.24", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.25", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/license_ref/expected_with_text.tv b/tests/formattedcode/data/spdx/license_ref/expected_with_text.tv index d37b20db217..ffd906c0a15 100644 --- a/tests/formattedcode/data/spdx/license_ref/expected_with_text.tv +++ b/tests/formattedcode/data/spdx/license_ref/expected_with_text.tv @@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney for any legal advice. ScanCode is a free software code scanning tool from nexB Inc. and others. Visit https://github.com/nexB/scancode-toolkit/ for support and download. -SPDX License List: 3.24 +SPDX License List: 3.25 ## Creation Information ## Package Information PackageName: scan diff --git a/tests/formattedcode/data/spdx/or_later/expected.rdf b/tests/formattedcode/data/spdx/or_later/expected.rdf index b62bdb4db76..fdbb6500187 100644 --- a/tests/formattedcode/data/spdx/or_later/expected.rdf +++ b/tests/formattedcode/data/spdx/or_later/expected.rdf @@ -59,7 +59,7 @@ "@rdf:resource": "http://spdx.org/licenses/CC0-1.0" }, "@rdf:about": "#SPDXRef-DOCUMENT", - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.24", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.25", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/simple/expected.rdf b/tests/formattedcode/data/spdx/simple/expected.rdf index 6d106dd2566..ad33644f3a7 100644 --- a/tests/formattedcode/data/spdx/simple/expected.rdf +++ b/tests/formattedcode/data/spdx/simple/expected.rdf @@ -59,7 +59,7 @@ "@rdf:resource": "http://spdx.org/licenses/CC0-1.0" }, "@rdf:about": "#SPDXRef-DOCUMENT", - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.24", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.25", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/simple/expected.tv b/tests/formattedcode/data/spdx/simple/expected.tv index 31f779c35da..f3688013da0 100644 --- a/tests/formattedcode/data/spdx/simple/expected.tv +++ b/tests/formattedcode/data/spdx/simple/expected.tv @@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney for any legal advice. ScanCode is a free software code scanning tool from nexB Inc. and others. Visit https://github.com/nexB/scancode-toolkit/ for support and download. -SPDX License List: 3.24 +SPDX License List: 3.25 ## Creation Information ## Package Information PackageName: simple diff --git a/tests/formattedcode/data/spdx/tree/expected.rdf b/tests/formattedcode/data/spdx/tree/expected.rdf index 39c5d80cb23..efe1ffd4148 100644 --- a/tests/formattedcode/data/spdx/tree/expected.rdf +++ b/tests/formattedcode/data/spdx/tree/expected.rdf @@ -229,7 +229,7 @@ "@rdf:resource": "http://spdx.org/licenses/CC0-1.0" }, "@rdf:about": "#SPDXRef-DOCUMENT", - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.24", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.25", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/tree/expected.tv b/tests/formattedcode/data/spdx/tree/expected.tv index e4c9e36badd..37d1e5d870d 100644 --- a/tests/formattedcode/data/spdx/tree/expected.tv +++ b/tests/formattedcode/data/spdx/tree/expected.tv @@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney for any legal advice. ScanCode is a free software code scanning tool from nexB Inc. and others. Visit https://github.com/nexB/scancode-toolkit/ for support and download. -SPDX License List: 3.24 +SPDX License List: 3.25 ## Creation Information ## Package Information PackageName: scan diff --git a/tests/formattedcode/data/spdx/unicode/expected.rdf b/tests/formattedcode/data/spdx/unicode/expected.rdf index 265d8074f7f..801082cc752 100644 --- a/tests/formattedcode/data/spdx/unicode/expected.rdf +++ b/tests/formattedcode/data/spdx/unicode/expected.rdf @@ -68,7 +68,7 @@ "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.LICENSE" } }, - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.24", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.25", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/unicode/expected.tv b/tests/formattedcode/data/spdx/unicode/expected.tv index 09dc3b8cb7c..160f1b0be1e 100644 --- a/tests/formattedcode/data/spdx/unicode/expected.tv +++ b/tests/formattedcode/data/spdx/unicode/expected.tv @@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney for any legal advice. ScanCode is a free software code scanning tool from nexB Inc. and others. Visit https://github.com/nexB/scancode-toolkit/ for support and download. -SPDX License List: 3.24 +SPDX License List: 3.25 ## Creation Information ## Package Information PackageName: unicode