Skip to content

Commit e795bc6

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
authored
Merge pull request #4090 from aboutcode-org/bump-dependencies
Release scancode-toolkit v32.3.2
2 parents 1250647 + b5cad93 commit e795bc6

20 files changed

+61
-24
lines changed

‎CHANGELOG.rst

+38-1
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,47 @@ v33.0.0 (next next, roadmap)
3838
- Update Dockerfile and test container build.
3939
See https://github.com/aboutcode-org/scancode-toolkit/issues/3955
4040

41+
v32.3.2 - 2024-01-20
42+
--------------------
43+
44+
This is a patch release with license and package detection
45+
improvements, bugfixes and with new and updated license detection rules
46+
and new licenses added.
47+
48+
Bugfixes:
49+
50+
- Fix package resource assignment for JAVA jars in scancode.io
51+
https://github.com/aboutcode-org/scancode-toolkit/pull/3983
52+
53+
- Fix missing spdx license expression in license detections
54+
https://github.com/aboutcode-org/scancode-toolkit/issues/4015
55+
56+
- Enforce --path as a required parameter for scancode-license-data
57+
console script.
58+
https://github.com/aboutcode-org/scancode-toolkit/issues/4024
59+
60+
- Fix conda environment.yaml parsing errors.
61+
https://github.com/aboutcode-org/scancode-toolkit/pull/4078
62+
63+
- Fix npm package parsing bug for packages with workspaces.
64+
https://github.com/aboutcode-org/scancode.io/issues/1521
65+
66+
New features/licenses:
67+
68+
- Adds support for pnpm lock YAML v9
69+
https://github.com/pnpm/spec/blob/master/lockfile/9.0.md
70+
71+
- Add licenses from SPDX License List 3.26
72+
https://github.com/aboutcode-org/scancode-toolkit/issues/4045
73+
74+
- Add assembly and identification of conda package files in
75+
root filesystem installations
76+
https://github.com/aboutcode-org/scancode-toolkit/issues/4083
77+
4178
v32.3.1 - 2024-01-06
4279
--------------------
4380

44-
This is a minor release with license and package detection
81+
This is a patch release with license and package detection
4582
improvements, bugfixes and with new and updated license detection rules
4683
and new licenses added.
4784

‎requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jaraco.functools==4.1.0
3535
javaproperties==0.8.1
3636
Jinja2==3.1.3
3737
jsonstreams==0.6.0
38-
license-expression==30.4.0
38+
license-expression==30.4.1
3939
lxml==5.1.0
4040
MarkupSafe==2.1.5
4141
more-itertools==8.13.0

‎setup-mini.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = scancode-toolkit-mini
3-
version = 32.3.1
3+
version = 32.3.2
44
license = Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft
55

66
# description must be on ONE line https://github.com/pypa/setuptools/issues/1390
@@ -84,7 +84,7 @@ install_requires =
8484
javaproperties >= 0.5
8585
jinja2 >= 2.7.0
8686
jsonstreams >= 0.5.0
87-
license_expression >= 30.4.0
87+
license_expression >= 30.4.1
8888
lxml >= 4.9.2
8989
MarkupSafe >= 2.1.2
9090
packageurl_python >= 0.9.0

‎setup.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = scancode-toolkit
3-
version = 32.3.1
3+
version = 32.3.2
44
license = Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft
55

66
# description must be on ONE line https://github.com/pypa/setuptools/issues/1390
@@ -84,7 +84,7 @@ install_requires =
8484
javaproperties >= 0.5
8585
jinja2 >= 2.7.0
8686
jsonstreams >= 0.5.0
87-
license_expression >= 30.4.0
87+
license_expression >= 30.4.1
8888
lxml >= 4.9.2
8989
MarkupSafe >= 2.1.2
9090
packageurl_python >= 0.9.0

‎src/scancode_config.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -132,20 +132,20 @@ def _create_dir(location):
132132
# 4. hardcoded This is the default, fallback version in case package is not installed or we
133133
# do not have a proper version otherwise.
134134
if not __version__:
135-
__version__ = '32.3.1'
135+
__version__ = '32.3.2'
136136

137137
#######################
138138
# used to warn user when the version is out of date
139139
# this is (year, month, day)
140-
__release_date__ = datetime.datetime(2025, 1, 6)
140+
__release_date__ = datetime.datetime(2025, 1, 20)
141141

142142
# See https://github.com/nexB/scancode-toolkit/issues/2653 for more information
143143
# on the data format version
144144
__output_format_version__ = '4.0.0'
145145

146146
# see https://github.com/spdx/tools-python/issues/820
147147
# this is actually `3.25.0`
148-
spdx_license_list_version = '3.25'
148+
spdx_license_list_version = '3.26'
149149

150150
################################################################################
151151
# USAGE MODE-, INSTALLATION- and IMPORT- and RUN-SPECIFIC DIRECTORIES

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

+1-1
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.25",
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.26",
9898
"spdx:name": "SPDX Document created by ScanCode Toolkit",
9999
"spdx:specVersion": "SPDX-2.2"
100100
},

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

+1-1
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.25</text>
13+
SPDX License List: 3.26</text>
1414
## Creation Information
1515
## Package Information
1616
PackageName: scan

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

+1-1
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.25",
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.26",
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

+1-1
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.25</text>
13+
SPDX License List: 3.26</text>
1414
## Creation Information
1515
## Package Information
1616
PackageName: scan

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

+1-1
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.25",
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.26",
120120
"spdx:name": "SPDX Document created by ScanCode Toolkit",
121121
"spdx:specVersion": "SPDX-2.2"
122122
},

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

+1-1
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.25</text>
13+
SPDX License List: 3.26</text>
1414
## Creation Information
1515
## Package Information
1616
PackageName: scan

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

+1-1
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.25",
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.26",
120120
"spdx:name": "SPDX Document created by ScanCode Toolkit",
121121
"spdx:specVersion": "SPDX-2.2"
122122
},

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

+1-1
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.25</text>
13+
SPDX License List: 3.26</text>
1414
## Creation Information
1515
## Package Information
1616
PackageName: scan

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
6060
},
6161
"@rdf:about": "#SPDXRef-DOCUMENT",
62-
"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",
62+
"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.26",
6363
"spdx:name": "SPDX Document created by ScanCode Toolkit",
6464
"spdx:specVersion": "SPDX-2.2"
6565
},

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
6060
},
6161
"@rdf:about": "#SPDXRef-DOCUMENT",
62-
"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",
62+
"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.26",
6363
"spdx:name": "SPDX Document created by ScanCode Toolkit",
6464
"spdx:specVersion": "SPDX-2.2"
6565
},

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

+1-1
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.25</text>
13+
SPDX License List: 3.26</text>
1414
## Creation Information
1515
## Package Information
1616
PackageName: simple

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
"@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
230230
},
231231
"@rdf:about": "#SPDXRef-DOCUMENT",
232-
"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",
232+
"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.26",
233233
"spdx:name": "SPDX Document created by ScanCode Toolkit",
234234
"spdx:specVersion": "SPDX-2.2"
235235
},

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

+1-1
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.25</text>
13+
SPDX License List: 3.26</text>
1414
## Creation Information
1515
## Package Information
1616
PackageName: scan

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.LICENSE"
6969
}
7070
},
71-
"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",
71+
"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.26",
7272
"spdx:name": "SPDX Document created by ScanCode Toolkit",
7373
"spdx:specVersion": "SPDX-2.2"
7474
},

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

+1-1
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.25</text>
13+
SPDX License List: 3.26</text>
1414
## Creation Information
1515
## Package Information
1616
PackageName: unicode

0 commit comments

Comments
 (0)