Skip to content

Commit 797d779

Browse files
authored
Merge branch 'develop' into fix-syntax-warning
2 parents 002e549 + 7d0d91a commit 797d779

File tree

2,264 files changed

+123259
-56205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,264 files changed

+123259
-56205
lines changed

CHANGELOG.rst

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,19 @@ 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-
- Fix Python ``SyntaxWarning`` in extractcode module.
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
48+
49+
- New and improved copyright detection with many false positive removed
50+
and refined detection added.
4151

52+
- Fix Python ``SyntaxWarning`` in textcode module.
4253

4354
v32.2.1 - 2024-07-02
4455
---------------------

azure-pipelines.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,33 @@ jobs:
7575
tests/licensedcode/test_detection_validate.py \
7676
-k TestValidateLicenseExtended5
7777
78+
79+
license_validate_ignorables_1: |
80+
venv/bin/pytest -n 3 -vvs --test-suite=validate \
81+
tests/licensedcode/test_detection_validate.py \
82+
-k TestValidateLicenseIgnorableClues1
83+
84+
license_validate_ignorables_2: |
85+
venv/bin/pytest -n 3 -vvs --test-suite=validate \
86+
tests/licensedcode/test_detection_validate.py \
87+
-k TestValidateLicenseIgnorableClues2
88+
89+
license_validate_ignorables_3: |
90+
venv/bin/pytest -n 3 -vvs --test-suite=validate \
91+
tests/licensedcode/test_detection_validate.py \
92+
-k TestValidateLicenseIgnorableClues3
93+
94+
license_validate_ignorables_4: |
95+
venv/bin/pytest -n 3 -vvs --test-suite=validate \
96+
tests/licensedcode/test_detection_validate.py \
97+
-k TestValidateLicenseIgnorableClues4
98+
99+
license_validate_ignorables_5: |
100+
venv/bin/pytest -n 3 -vvs --test-suite=validate \
101+
tests/licensedcode/test_detection_validate.py \
102+
-k TestValidateLicenseIgnorableClues5
103+
104+
78105
license_cache: |
79106
venv/bin/pytest -n 3 -vvs --test-suite=all \
80107
tests/licensedcode/test_zzzz_cache.py --reruns 2

etc/scripts/gen_copyright_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def create_copyright_tests(
9393
content = url
9494

9595
if end_line != 0:
96-
content = "".join(content.strip().splitlines()[start_line:end_line])
96+
content = "\n".join(content.strip().splitlines()[start_line:end_line])
9797

9898
with open(name, "w") as out:
9999
out.write(content)

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ chardet==5.0.0
1010
charset-normalizer==2.1.0
1111
click==8.1.7
1212
colorama==0.4.5
13-
commoncode==31.2.1
13+
commoncode==32.0.0
1414
construct==2.10.68
1515
container-inspector==31.1.0
1616
cryptography==42.0.5
@@ -54,7 +54,7 @@ ply==3.11
5454
publicsuffix2==2.20191221
5555
pyahocorasick==2.1.0
5656
pycparser==2.21
57-
pygmars==0.7.0
57+
pygmars==0.9.0
5858
Pygments==2.13.0
5959
pymaven-patch==0.3.2
6060
pyparsing==3.0.9

setup-mini.cfg

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ install_requires =
7070
chardet >= 3.0.0
7171
click >= 6.7, !=7.0
7272
colorama >= 0.3.9
73-
commoncode >= 31.0.3
73+
commoncode >= 32.0.0
7474
container-inspector >= 31.0.0
7575
debian-inspector >= 31.1.0
7676
dparse2 >= 0.7.0
@@ -100,7 +100,7 @@ install_requires =
100100
plugincode >= 32.0.0
101101
publicsuffix2
102102
pyahocorasick >= 2.0.0
103-
pygmars >= 0.7.0
103+
pygmars >= 0.9.0
104104
pygments
105105
pymaven_patch >= 0.2.8
106106
requests >= 2.7.0
@@ -112,7 +112,7 @@ install_requires =
112112
xmltodict >= 0.11.0
113113
zipp >= 3.0.0; python_version < "3.9"
114114
typecode >= 30.0.1
115-
# typecode[full] >= 30.0.0
115+
# typecode[full] >= 30.0.1
116116
# extractcode[full] >= 31.0.0
117117

118118

@@ -199,6 +199,7 @@ scancode_post_scan =
199199
filter-clues = cluecode.plugin_filter_clues:RedundantCluesFilter
200200
consolidate = summarycode.plugin_consolidate:Consolidator
201201
license-references = licensedcode.licenses_reference:LicenseReference
202+
todo = summarycode.todo:AmbiguousDetectionsToDoPlugin
202203
classify = summarycode.classify_plugin:FileClassifier
203204

204205

setup.cfg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ install_requires =
7070
chardet >= 3.0.0
7171
click >= 6.7, !=7.0
7272
colorama >= 0.3.9
73-
commoncode >= 31.0.3
73+
commoncode >= 32.0.0
7474
container-inspector >= 31.0.0
7575
debian-inspector >= 31.1.0
7676
dparse2 >= 0.7.0
@@ -100,7 +100,7 @@ install_requires =
100100
plugincode >= 32.0.0
101101
publicsuffix2
102102
pyahocorasick >= 2.0.0
103-
pygmars >= 0.7.0
103+
pygmars >= 0.9.0
104104
pygments
105105
pymaven_patch >= 0.2.8
106106
requests >= 2.7.0
@@ -138,9 +138,9 @@ testing =
138138

139139
docs =
140140
Sphinx == 5.1.0
141-
sphinx-rtd-theme >= 0.5.0
142-
doc8 >= 0.8.1
141+
sphinx_rtd_theme >= 0.5.1
143142
sphinx-reredirects >= 0.1.2
143+
doc8 >= 0.8.1
144144
sphinx-autobuild
145145
sphinx-rtd-dark-mode>=1.3.0
146146
sphinx-copybutton

0 commit comments

Comments
 (0)