diff --git a/.github/workflows/docs-ci.yml b/.github/workflows/docs-ci.yml index 3f97e9b66b..44b1352ccd 100644 --- a/.github/workflows/docs-ci.yml +++ b/.github/workflows/docs-ci.yml @@ -7,19 +7,19 @@ permissions: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: max-parallel: 4 matrix: - python-version: [3.9] + python-version: [3.12] steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/scancode-release.yml b/.github/workflows/scancode-release.yml index f3c18cf065..5b3e530702 100644 --- a/.github/workflows/scancode-release.yml +++ b/.github/workflows/scancode-release.yml @@ -25,7 +25,7 @@ jobs: contents: read # to fetch code (actions/checkout) name: Build PyPI wheels - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 defaults: run: @@ -37,10 +37,10 @@ jobs: pyver: ["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 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.pyver }} @@ -48,7 +48,7 @@ jobs: run: etc/release/scancode-create-pypi-wheel.sh - name: Collect built wheels for ${{ matrix.pyver }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels-${{ matrix.pyver }} path: dist/*.whl @@ -59,7 +59,7 @@ jobs: contents: read # to fetch code (actions/checkout) name: Build PyPI sdist archives - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 defaults: run: @@ -69,18 +69,18 @@ jobs: fail-fast: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.12" - name: Install requirements then build main and mini sdist run: etc/release/scancode-create-pypi-sdist.sh - name: Collect built sdist - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: sdists path: dist/*.tar.gz @@ -91,7 +91,7 @@ jobs: contents: read # to fetch code (actions/checkout) name: Build app Release for linux - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 defaults: run: @@ -103,11 +103,11 @@ jobs: pyver: ["3.9", "3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: git fetch --prune --unshallow - name: Set up Python on ${{ matrix.pyver }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.pyver }} @@ -115,7 +115,7 @@ jobs: run: etc/release/scancode-create-release-app-linux.sh ${{ matrix.pyver }} - name: Collect built linux app for python ${{ matrix.pyver }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: linux_app_py_${{ matrix.pyver }} path: release/* @@ -126,7 +126,7 @@ jobs: contents: read # to fetch code (actions/checkout) name: Build app Release for mac - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 defaults: run: @@ -138,11 +138,11 @@ jobs: pyver: ["3.9", "3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: git fetch --prune --unshallow - name: Set up Python on ${{ matrix.pyver }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.pyver }} @@ -150,7 +150,7 @@ jobs: run: etc/release/scancode-create-release-app-macos.sh ${{ matrix.pyver }} - name: Collect built mac app for python ${{ matrix.pyver }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: macos_app_py_${{ matrix.pyver }} path: release/* @@ -161,7 +161,7 @@ jobs: contents: read # to fetch code (actions/checkout) name: Build app Release for windows - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 defaults: run: @@ -173,11 +173,11 @@ jobs: pyver: ["3.9", "3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: git fetch --prune --unshallow - name: Set up Python on ${{ matrix.pyver }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.pyver }} @@ -185,7 +185,7 @@ jobs: run: etc/release/scancode-create-release-app-windows.sh ${{ matrix.pyver }} - name: Collect built windows app for python ${{ matrix.pyver }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: windows_app_py_${{ matrix.pyver }} path: release/* @@ -196,7 +196,7 @@ jobs: contents: read # to fetch code (actions/checkout) name: Build app source - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 defaults: run: @@ -205,19 +205,19 @@ jobs: fail-fast: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: git fetch --prune --unshallow - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.12" - name: Build source archive with deps run: etc/release/scancode-create-release-app-sources.sh - name: Collect built source app tarball - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: source_app path: release/* @@ -239,19 +239,19 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14] + os: [ubuntu-24.04, ubuntu-24.04, macos-13, macos-14] pyver: ["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 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.pyver }} - name: Download wheels artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: wheels-${{ matrix.pyver }} path: dist @@ -289,15 +289,15 @@ jobs: pyver: ["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 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.pyver }} - name: Download wheels artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: wheels-${{ matrix.pyver }} path: dist @@ -330,19 +330,19 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-22.04, ubuntu-24.04] + os: [ubuntu-24.04, ubuntu-24.04] pyver: ["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 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.pyver }} - name: Download a single artifact linux_app_py_${{ matrix.pyver }} - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: linux_app_py_${{ matrix.pyver }} path: dist @@ -375,15 +375,15 @@ jobs: pyver: ["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 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.pyver }} - name: Download a single artifact macos_app_py_${{ matrix.pyver }} - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: macos_app_py_${{ matrix.pyver }} path: dist @@ -416,15 +416,15 @@ jobs: pyver: ["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 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.pyver }} - name: Download a single artifact windows_app_py_${{ matrix.pyver }} - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: windows_app_py_${{ matrix.pyver }} path: dist @@ -447,7 +447,7 @@ jobs: - build_scancode_for_release_linux - build_scancode_for_release_macos - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 defaults: run: shell: bash @@ -456,79 +456,79 @@ jobs: steps: - name: Download a single artifact source_app - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: source_app path: dist - name: Download a single artifact macos_app for python 3.9 - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: macos_app_py_3.9 path: dist - name: Download a single artifact macos_app for python 3.10 - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: macos_app_py_3.10 path: dist - name: Download a single artifact macos_app for python 3.11 - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: macos_app_py_3.11 path: dist - name: Download a single artifact macos_app for python 3.12 - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: macos_app_py_3.12 path: dist - name: Download a single artifact linux_app for python 3.9 - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: linux_app_py_3.9 path: dist - name: Download a single artifact linux_app for python 3.10 - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: linux_app_py_3.10 path: dist - name: Download a single artifact linux_app for python 3.11 - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: linux_app_py_3.11 path: dist - name: Download a single artifact linux_app for python 3.12 - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: linux_app_py_3.12 path: dist - name: Download a single artifact windows_app for python 3.9 - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: windows_app_py_3.9 path: dist - name: Download a single artifact windows_app for python 3.10 - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: windows_app_py_3.10 path: dist - name: Download a single artifact windows_app for python 3.11 - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: windows_app_py_3.11 path: dist - name: Download a single artifact windows_app for python 3.12 - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: windows_app_py_3.12 path: dist @@ -538,7 +538,7 @@ jobs: ls -al dist - name: Create release and publish archives - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: draft: true files: dist/* @@ -552,7 +552,7 @@ 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-22.04 + runs-on: ubuntu-24.04 defaults: run: shell: bash @@ -563,12 +563,12 @@ jobs: steps: - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9 - name: Download a single artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ matrix.dist_names }} path: dist diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 91521e9c6e..684b6e17c5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -38,7 +38,28 @@ v33.0.0 (next next, roadmap) - Update Dockerfile and test container build. See https://github.com/aboutcode-org/scancode-toolkit/issues/3955 -v32.3.2 - 2024-01-20 + +v32.3.3 - 2025-03-06 +-------------------- + +This is a patch release with license and package detection +improvements, bugfixes and with new and updated license detection rules +and new licenses added. + +- Add new and updated licenses and license rules + https://github.com/aboutcode-org/scancode-toolkit/pull/4165 + https://github.com/aboutcode-org/scancode-toolkit/issues/3819 + +- Bump commoncode to v32.2.1 and pin bs4 to fix copyright scan issues + https://github.com/aboutcode-org/scancode-toolkit/pull/4149 + https://github.com/aboutcode-org/scancode-toolkit/pull/4176 + +- Refactor and fix package assembly for pypi installed wheels + and fix pypi manifest parsing + https://github.com/aboutcode-org/scancode-toolkit/pull/4171 + + +v32.3.2 - 2025-01-20 -------------------- This is a patch release with license and package detection diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7f3f89f6e4..c83a76aed5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -120,8 +120,8 @@ jobs: - template: etc/ci/azure-posix.yml parameters: - job_name: ubuntu20_cpython - image_name: ubuntu-20.04 + job_name: ubuntu24_cpython + image_name: ubuntu-24.04 python_architecture: x64 python_versions: ['3.9', '3.10', '3.11', '3.12'] test_suites: diff --git a/requirements.txt b/requirements.txt index 4fed6d9376..43a0b90bc1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ chardet==5.0.0 charset-normalizer==2.1.0 click==8.1.7 colorama==0.4.5 -commoncode==32.2.0 +commoncode==32.2.1 construct==2.10.68 container-inspector==31.1.0 cryptography==42.0.5 diff --git a/setup-mini.cfg b/setup-mini.cfg index 05a143fd01..6141fc24ae 100644 --- a/setup-mini.cfg +++ b/setup-mini.cfg @@ -1,6 +1,6 @@ [metadata] name = scancode-toolkit-mini -version = 32.3.2 +version = 32.3.3 license = Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft # description must be on ONE line https://github.com/pypa/setuptools/issues/1390 @@ -69,7 +69,7 @@ install_requires = chardet >= 3.0.0 click >= 6.7, !=7.0, !=8.1.8 colorama >= 0.3.9 - commoncode >= 32.2.0 + commoncode >= 32.2.1 container-inspector >= 31.0.0 debian-inspector >= 31.1.0 dparse2 >= 0.7.0 diff --git a/setup.cfg b/setup.cfg index c4af850ce1..786b0275e1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = scancode-toolkit -version = 32.3.2 +version = 32.3.3 license = Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft # description must be on ONE line https://github.com/pypa/setuptools/issues/1390 @@ -69,7 +69,7 @@ install_requires = chardet >= 3.0.0 click >= 6.7, !=7.0, !=8.1.8 colorama >= 0.3.9 - commoncode >= 32.2.0 + commoncode >= 32.2.1 container-inspector >= 31.0.0 debian-inspector >= 31.1.0 dparse2 >= 0.7.0 diff --git a/src/scancode_config.py b/src/scancode_config.py index b63919af33..cfe24d5def 100644 --- a/src/scancode_config.py +++ b/src/scancode_config.py @@ -132,7 +132,7 @@ def _create_dir(location): # 4. hardcoded This is the default, fallback version in case package is not installed or we # do not have a proper version otherwise. if not __version__: - __version__ = '32.3.2' + __version__ = '32.3.3' ####################### # used to warn user when the version is out of date diff --git a/tests/scancode/test_api.py b/tests/scancode/test_api.py index 1d60312460..bcecff581f 100644 --- a/tests/scancode/test_api.py +++ b/tests/scancode/test_api.py @@ -53,9 +53,9 @@ def test_get_file_info_include_size(self): info = api.get_file_info(test_dir) expected = [ ('size', 0), - ('sha1', 0), - ('md5', 0), - ('sha256', 0), + ('sha1', None), + ('md5', None), + ('sha256', None), ('mime_type', 'inode/x-empty'), ('file_type', 'empty'), ('programming_language', None),