Skip to content

Commit dc8eaa6

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
committed
Bump SPDX License List version in CHANGELOG
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
1 parent d76977d commit dc8eaa6

File tree

18 files changed

+27
-18
lines changed

18 files changed

+27
-18
lines changed

‎CHANGELOG.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@ v33.0.0 (next next, roadmap)
3737
- Update link references of ownership from nexB to aboutcode-org
3838
See https://github.com/aboutcode-org/scancode-toolkit/issues/3885
3939

40+
- New and updated licenses, including support for newly released
41+
SPDX license list versions:
42+
- SPDX License List 3.25.0:
43+
This release of the SPDX license list had 9 new licenses
44+
and exceptions, and out of them 5 were present as licenses
45+
and 2 were present as rules already. There were 2 new
46+
license/exception texts added, and also 1 license was deprecated.
47+
For more details see https://github.com/aboutcode-org/scancode-toolkit/pull/3897
4048

4149
v32.2.1 - 2024-07-02
4250
---------------------

‎src/licensedcode/data/licenses/x11-swapped.LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ key: x11-swapped
33
short_name: X11 swapped final paragraphs
44
name: X11 swapped final paragraphs
55
category: Permissive
6-
owner: Unspecified
6+
owner: Derick Eddington
77
notes: |
88
Added in SPDX license list 3.25
99
This was previously the license rule: x11-xconsortium_37.RULE

‎src/scancode_config.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,9 @@ def _create_dir(location):
143143
# on the data format version
144144
__output_format_version__ = '3.2.0'
145145

146-
#
147-
spdx_license_list_version = '3.24'
146+
# see https://github.com/spdx/tools-python/issues/820
147+
# this is actually `3.25.0`
148+
spdx_license_list_version = '3.25'
148149

149150
################################################################################
150151
# USAGE MODE-, INSTALLATION- and IMPORT- and RUN-SPECIFIC DIRECTORIES

‎tests/formattedcode/data/spdx/license_known/expected.rdf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
"@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
9595
},
9696
"@rdf:about": "#SPDXRef-DOCUMENT",
97-
"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",
97+
"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",
9898
"spdx:name": "SPDX Document created by ScanCode Toolkit",
9999
"spdx:specVersion": "SPDX-2.2"
100100
},

‎tests/formattedcode/data/spdx/license_known/expected.tv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney
1010
for any legal advice.
1111
ScanCode is a free software code scanning tool from nexB Inc. and others.
1212
Visit https://github.com/nexB/scancode-toolkit/ for support and download.
13-
SPDX License List: 3.24</text>
13+
SPDX License List: 3.25</text>
1414
## Creation Information
1515
## Package Information
1616
PackageName: scan

‎tests/formattedcode/data/spdx/license_known/expected_with_text.rdf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
"@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
9595
},
9696
"@rdf:about": "#SPDXRef-DOCUMENT",
97-
"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",
97+
"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",
9898
"spdx:name": "SPDX Document created by ScanCode Toolkit",
9999
"spdx:specVersion": "SPDX-2.2"
100100
},

‎tests/formattedcode/data/spdx/license_known/expected_with_text.tv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney
1010
for any legal advice.
1111
ScanCode is a free software code scanning tool from nexB Inc. and others.
1212
Visit https://github.com/nexB/scancode-toolkit/ for support and download.
13-
SPDX License List: 3.24</text>
13+
SPDX License List: 3.25</text>
1414
## Creation Information
1515
## Package Information
1616
PackageName: scan

‎tests/formattedcode/data/spdx/license_ref/expected.rdf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
}
117117
}
118118
],
119-
"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",
119+
"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",
120120
"spdx:name": "SPDX Document created by ScanCode Toolkit",
121121
"spdx:specVersion": "SPDX-2.2"
122122
},

‎tests/formattedcode/data/spdx/license_ref/expected.tv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney
1010
for any legal advice.
1111
ScanCode is a free software code scanning tool from nexB Inc. and others.
1212
Visit https://github.com/nexB/scancode-toolkit/ for support and download.
13-
SPDX License List: 3.24</text>
13+
SPDX License List: 3.25</text>
1414
## Creation Information
1515
## Package Information
1616
PackageName: scan

‎tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
}
117117
}
118118
],
119-
"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",
119+
"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",
120120
"spdx:name": "SPDX Document created by ScanCode Toolkit",
121121
"spdx:specVersion": "SPDX-2.2"
122122
},

0 commit comments

Comments
 (0)