Skip to content

Commit c54321a

Browse files
committed
Merge latest 4190-license-licence branch
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
2 parents dc22bc2 + d81f2b5 commit c54321a

File tree

81 files changed

+3271
-313
lines changed

Some content is hidden

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

81 files changed

+3271
-313
lines changed

.github/ISSUE_TEMPLATE/--doc-report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
2-
name: "Documentation Improvement"
2+
name: Documentation Improvement
33
about: Your suggestions for improving the scancode-toolkit Documentation.
44
title: ''
5-
labels: 'documentation'
5+
labels: documentation
66
assignees: ''
77

88
---
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: New License Request
3+
about: Request a new license for scancode detection purposes
4+
title: 'New license request: '
5+
labels: new-license
6+
assignees: DennisClark
7+
8+
---
9+
10+
**License Name**
11+
The full name of the license, preferably as provided by the original authors.
12+
13+
**License Homepage URL**
14+
The primary and/or most reliable URL that contains the text of this license and/or information about it. This is ideally a web page dedicated to the license, but it may also be a source file that contains the license text.
15+
16+
**Reference URLs**
17+
Optionally provide URLs that contain references to the license.
18+
19+
**License Notes**
20+
Optionally describe any aspects of the license that deserve special attention.

.github/workflows/about-files-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ permissions:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-24.04
1111

1212
strategy:
1313
max-parallel: 4
1414
matrix:
15-
python-version: [3.9]
15+
python-version: [3.11]
1616

1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020

2121
- name: Set up Python ${{ matrix.python-version }}
2222
uses: actions/setup-python@v4

CHANGELOG.rst

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
Changelog
22
=========
33

4-
v33.0.0 (next next, roadmap)
5-
----------------------------
6-
74
- We now support new package manifest formats:
85

96
- OpenWRT packages.
107
- Yocto/BitBake .bb recipes.
118

129

10+
v33.0.0 (next next, roadmap)
11+
----------------------------
12+
1313
- Fallback packages for non-native dependencies of SCTK.
1414
- Dependencies for
1515
- Support for copyright detection objects.
@@ -26,9 +26,14 @@ v33.0.0 (next next, roadmap)
2626

2727
- `--unknown-licenses` is removed and this is always enabled
2828
and only used in case of improper detections automatically.
29-
Also tag all license rules with required phrases to improve
30-
license detection and reduce false positives.
31-
See https://github.com/nexB/scancode-toolkit/issues/3300
29+
30+
- All license rules have been tagged with required phrases to improve detection accuracy
31+
and reduce false positives. See https://github.com/nexB/scancode-toolkit/issues/3300
32+
33+
- Equivalent words like license and licence, as well as plurals are now treated as the same in
34+
license detection. With this, many redundant rules have been deprecated.
35+
36+
- The license detection accuracy of Maven POMS has been improved fixing corner cases.
3237

3338
- File categorization support added, a post scan plugin tagging
3439
files with priority levels for review, and also take advantage
@@ -41,6 +46,7 @@ v33.0.0 (next next, roadmap)
4146
- Update ABOUT files to adapt the ABOUT File Specification.
4247
See https://github.com/aboutcode-org/scancode-toolkit/issues/4181
4348

49+
4450
v32.3.3 - 2025-03-06
4551
--------------------
4652

azure-pipelines.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- template: etc/ci/azure-posix.yml
1515
parameters:
1616
job_name: core_tests
17-
image_name: ubuntu-20.04
17+
image_name: ubuntu-24.04
1818
python_versions: ['3.10']
1919
test_suites:
2020
misc_and_scancode: |
@@ -197,8 +197,8 @@ jobs:
197197

198198
- template: etc/ci/azure-posix.yml
199199
parameters:
200-
job_name: ubuntu20_test_all_supported_click_versions
201-
image_name: ubuntu-20.04
200+
job_name: ubuntu22_test_all_supported_click_versions
201+
image_name: ubuntu-22.04
202202
python_versions: ['3.9', '3.10', '3.11', '3.12']
203203
python_architecture: x64
204204
test_suites:
@@ -225,8 +225,8 @@ jobs:
225225

226226
- template: etc/ci/azure-posix.yml
227227
parameters:
228-
job_name: ubuntu20_cpython_latest_from_pip
229-
image_name: ubuntu-20.04
228+
job_name: ubuntu24_cpython_latest_from_pip
229+
image_name: ubuntu-24.04
230230
python_versions: ['3.9', '3.10', '3.11', '3.12']
231231
test_suites:
232232
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py

0 commit comments

Comments
 (0)