Merge latest 4190-license-licence branch

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

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

@@ -1,8 +1,8 @@
 ---
-name: "Documentation Improvement"
+name: Documentation Improvement
 about: Your suggestions for improving the scancode-toolkit Documentation.
 title: ''
-labels: 'documentation'
+labels: documentation
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/new-license-request.md

@@ -0,0 +1,20 @@
+---
+name: New License Request
+about: Request a new license for scancode detection purposes
+title: 'New license request: '
+labels: new-license
+assignees: DennisClark
+
+---
+
+**License Name**
+The full name of the license, preferably as provided by the original authors.
+
+**License Homepage URL**
+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.
+
+**Reference URLs**
+Optionally provide URLs that contain references to the license.
+ 
+**License Notes**
+Optionally describe any aspects of the license that deserve special attention.

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

@@ -7,16 +7,16 @@ permissions:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.9]
+        python-version: [3.11]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4

CHANGELOG.rst

@@ -1,15 +1,15 @@
 Changelog
 =========
 
-v33.0.0 (next next, roadmap)
-----------------------------
-
 - We now support new package manifest formats:
 
   - OpenWRT packages.
   - Yocto/BitBake .bb recipes.
 
 
+v33.0.0 (next next, roadmap)
+----------------------------
+
 - Fallback packages for non-native dependencies of SCTK.
 - Dependencies for
 - Support for copyright detection objects.
@@ -26,9 +26,14 @@ v33.0.0 (next next, roadmap)
 
 - `--unknown-licenses` is removed and this is always enabled
   and only used in case of improper detections automatically.
-  Also tag all license rules with required phrases to improve
-  license detection and reduce false positives.
-  See https://github.com/nexB/scancode-toolkit/issues/3300
+
+- All license rules have been tagged with required phrases to improve detection accuracy
+  and reduce false positives. See https://github.com/nexB/scancode-toolkit/issues/3300
+
+- Equivalent words like license and licence, as well as plurals are now treated as the same in
+  license detection. With this, many redundant rules have been deprecated.
+
+- The license detection accuracy of Maven POMS has been improved fixing corner cases.
 
 - File categorization support added, a post scan plugin tagging
   files with priority levels for review, and also take advantage
@@ -41,6 +46,7 @@ v33.0.0 (next next, roadmap)
 - Update ABOUT files to adapt the ABOUT File Specification.
   See https://github.com/aboutcode-org/scancode-toolkit/issues/4181
 
+
 v32.3.3 - 2025-03-06
 --------------------
 

azure-pipelines.yml

@@ -14,7 +14,7 @@ jobs:
     - template: etc/ci/azure-posix.yml
       parameters:
           job_name: core_tests
-          image_name: ubuntu-20.04
+          image_name: ubuntu-24.04
           python_versions: ['3.10']
           test_suites:
               misc_and_scancode: |
@@ -197,8 +197,8 @@ jobs:
 
     - template: etc/ci/azure-posix.yml
       parameters:
-          job_name: ubuntu20_test_all_supported_click_versions
-          image_name: ubuntu-20.04
+          job_name: ubuntu22_test_all_supported_click_versions
+          image_name: ubuntu-22.04
           python_versions: ['3.9', '3.10', '3.11', '3.12']
           python_architecture: x64
           test_suites:
@@ -225,8 +225,8 @@ jobs:
 
     - template: etc/ci/azure-posix.yml
       parameters:
-          job_name: ubuntu20_cpython_latest_from_pip
-          image_name: ubuntu-20.04
+          job_name: ubuntu24_cpython_latest_from_pip
+          image_name: ubuntu-24.04
           python_versions: ['3.9', '3.10', '3.11', '3.12']
           test_suites:
               all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py