Merge remote-tracking branch 'upstream/develop' into misc-license-updates

Author: pombredanne

.github/workflows/docs-ci.yml

@@ -7,7 +7,7 @@ permissions:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       max-parallel: 4

.github/workflows/scancode-release.yml

@@ -25,7 +25,7 @@ jobs:
       contents: read # to fetch code (actions/checkout)
 
     name: Build PyPI wheels
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     defaults:
       run:
@@ -34,10 +34,10 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-       pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+       pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python on ${{ matrix.pyver }}
         uses: actions/setup-python@v4
@@ -59,7 +59,7 @@ jobs:
       contents: read # to fetch code (actions/checkout)
 
     name: Build PyPI sdist archives
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     defaults:
       run:
@@ -69,7 +69,7 @@ jobs:
       fail-fast: true
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v4
@@ -91,7 +91,7 @@ jobs:
       contents: read # to fetch code (actions/checkout)
 
     name: Build app Release for linux
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     defaults:
       run:
@@ -100,10 +100,10 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-       pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+       pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python on ${{ matrix.pyver }}
         uses: actions/setup-python@v4
@@ -125,7 +125,7 @@ jobs:
       contents: read # to fetch code (actions/checkout)
 
     name: Build app Release for mac
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     defaults:
       run:
@@ -134,10 +134,10 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-       pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+       pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python on ${{ matrix.pyver }}
         uses: actions/setup-python@v4
@@ -159,7 +159,7 @@ jobs:
       contents: read # to fetch code (actions/checkout)
 
     name: Build app Release for windows
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     defaults:
       run:
@@ -168,10 +168,10 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-       pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+       pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python on ${{ matrix.pyver }}
         uses: actions/setup-python@v4
@@ -193,7 +193,7 @@ jobs:
       contents: read # to fetch code (actions/checkout)
 
     name: Build app source
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     defaults:
       run:
@@ -202,7 +202,7 @@ jobs:
       fail-fast: true
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v4
@@ -235,11 +235,11 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
-        pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        os: [ubuntu-22.04, ubuntu-22.04, macos-11, macos-12]
+        pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.pyver }} on ${{ matrix.os }}
         uses: actions/setup-python@v4
@@ -282,10 +282,10 @@ jobs:
       fail-fast: true
       matrix:
        os: [windows-2019, windows-2022]
-       pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+       pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.pyver }} on ${{ matrix.os }}
         uses: actions/setup-python@v4
@@ -326,11 +326,11 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
-        pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        os: [ubuntu-22.04, ubuntu-22.04]
+        pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.pyver }} on ${{ matrix.os }}
         uses: actions/setup-python@v4
@@ -368,10 +368,10 @@ jobs:
       fail-fast: true
       matrix:
         os: [macos-11, macos-12]
-        pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.pyver }} on ${{ matrix.os }}
         uses: actions/setup-python@v4
@@ -409,10 +409,10 @@ jobs:
       fail-fast: true
       matrix:
         os: [windows-2019, windows-2022]
-        pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.pyver }} on ${{ matrix.os }}
         uses: actions/setup-python@v4
@@ -443,7 +443,7 @@ jobs:
       - build_scancode_for_release_linux
       - build_scancode_for_release_macos
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     defaults:
       run:
         shell: bash
@@ -457,12 +457,6 @@ jobs:
           name: source_app
           path: dist
 
-      - name: Download a single artifact macos_app for python 3.7
-        uses: actions/download-artifact@v3
-        with:
-          name: macos_app_py_3.7
-          path: dist
-
       - name: Download a single artifact macos_app for python 3.8
         uses: actions/download-artifact@v3
         with:
@@ -487,10 +481,10 @@ jobs:
           name: macos_app_py_3.11
           path: dist
 
-      - name: Download a single artifact linux_app for python 3.7
+      - name: Download a single artifact macos_app for python 3.12
         uses: actions/download-artifact@v3
         with:
-          name: linux_app_py_3.7
+          name: macos_app_py_3.12
           path: dist
 
       - name: Download a single artifact linux_app for python 3.8
@@ -517,10 +511,10 @@ jobs:
           name: linux_app_py_3.11
           path: dist
 
-      - name: Download a single artifact windows_app for python 3.7
+      - name: Download a single artifact linux_app for python 3.12
         uses: actions/download-artifact@v3
         with:
-          name: windows_app_py_3.7
+          name: linux_app_py_3.12
           path: dist
 
       - name: Download a single artifact windows_app for python 3.8
@@ -547,6 +541,12 @@ jobs:
           name: windows_app_py_3.11
           path: dist
 
+      - name: Download a single artifact windows_app for python 3.12
+        uses: actions/download-artifact@v3
+        with:
+          name: windows_app_py_3.12
+          path: dist
+
       - name: Mock GH release
         run: |
           ls -al dist
@@ -566,14 +566,14 @@ jobs:
       - smoke_test_install_and_run_pypi_wheels_on_windows
       - smoke_test_install_and_run_pypi_wheels_on_posix
       - publish_to_gh_release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     defaults:
       run:
         shell: bash
     strategy:
       fail-fast: true
       matrix:
-        dist_names: ["wheels-3.7", "wheels-3.8", "wheels-3.9", "wheels-3.10", "wheels-3.11", sdists]
+        dist_names: ["wheels-3.8", "wheels-3.9", "wheels-3.10", "wheels-3.11", "wheels-3.12", sdists]
 
     steps:
       - name: Set up Python
@@ -592,6 +592,6 @@ jobs:
           ls -al dist
 
       - name: Publish distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}

.gitignore

@@ -108,7 +108,6 @@ TAGS
 Procfile
 local.cfg
 geckodriver.log
-var
 .metaflow
 selenium
 /dist/

CHANGELOG.rst

@@ -37,6 +37,12 @@ v33.0.0 (next next, roadmap)
 v32.1.0 (next, roadmap)
 ----------------------------
 
+New CLI options:
+
+- A new CLI option ``--package-only`` has been added which performs
+  a faster package scan by skipping the package assembly step and
+  also skipping license/copyright detection on package metadata.
+
 Major API/other changes:
 
 - Output Format Version updated to 3.1.0 (minor version bump)
@@ -89,11 +95,32 @@ Changes in Output Data Structure:
     is_license_notice, is_license_intro etc, as applicable).
 
 - New and updated licenses, including support for newly released
-  SPDX license list version 3.22. This release of the SPDX license
-  list had 48 new licenses, and several of them we already had as
-  licenses/rules, and these has been modified to be consistent with
-  the SPDX list. And the rest have been added as new licenses.
-  For more details see https://github.com/nexB/scancode-toolkit/pull/3554
+  SPDX license list versions:
+  - SPDX License List 3.22:
+    This release of the SPDX license list had 48 new licenses,
+    and several of them we already had as licenses/rules, and
+    these has been modified to be consistent with the SPDX list.
+    And the rest have been added as new licenses.
+    For more details see https://github.com/nexB/scancode-toolkit/pull/3554
+
+  - SPDX License List 3.23:
+    This release of the SPDX license list had 43 new licenses,
+    and out of them 22 were present as licenses and 10 were
+    present as rules already. There were 4 new license/exception
+    texts added, and the rest were either texts with small variations,
+    additions to texts or several rule texts together.
+    For more details see https://github.com/nexB/scancode-toolkit/pull/3653
+
+  - We also have lots of other misc new licenses and rules added to
+    LicenseDB, see PRs below for more details:
+    https://github.com/nexB/scancode-toolkit/pull/3663
+    https://github.com/nexB/scancode-toolkit/pull/3642
+    https://github.com/nexB/scancode-toolkit/pull/3586
+    https://github.com/nexB/scancode-toolkit/pull/3584
+    https://github.com/nexB/scancode-toolkit/pull/3575
+    https://github.com/nexB/scancode-toolkit/pull/3570
+    https://github.com/nexB/scancode-toolkit/pull/3568
+    https://github.com/nexB/scancode-toolkit/pull/3562
 
 - Improve debian namespace detection based on clues and fix
   namespace and qualifier bugs for debian purls.

INSTALL.rst

@@ -16,7 +16,7 @@ Prerequisites
 -------------
 
 Before installing ScanCode make sure you have  installed these prerequisites.
-The main one is to have Python installed version 3.7, 3.8, 3.9 or 3.10
+The main one is to have Python installed version 3.8, 3.9, 3.10, 3.11 or 3.12
 
 - For Linux(Ubuntu): ``sudo apt install python3.8-dev bzip2 xz-utils zlib1g libxml2-dev libxslt1-dev``
 - For MacOS: Install Python 3.x from https://www.python.org/

README.rst

@@ -140,7 +140,7 @@ Installation
 
 Before installing ScanCode make sure that you have installed the prerequisites
 properly. This means installing Python 3.8 for x86/64 architectures.
-We support Python 3.8, 3.9, 3.10 and 3.11.
+We support Python 3.8, 3.9, 3.10, 3.11 and 3.12.
 
 See `prerequisites <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#prerequisites>`_
 for detailed information on the support platforms and Python versions.