diff --git a/.github/workflows/scancode-release.yml b/.github/workflows/scancode-release.yml index d8b932463a..c28b46202d 100644 --- a/.github/workflows/scancode-release.yml +++ b/.github/workflows/scancode-release.yml @@ -350,6 +350,10 @@ jobs: - name: test install app archive run: | for f in `find dist -type f -name "*.zip"`; \ + do \ + unzip file.zip $f; \ + done + for f in `find dist -type f -name "*.tar.gz"`; \ do \ python etc/release/scancode_release_tests.py $f; \ done @@ -391,6 +395,10 @@ jobs: - name: test install app archive run: | for f in `find dist -type f -name "*.zip"`; \ + do \ + unzip file.zip $f; \ + done + for f in `find dist -type f -name "*.tar.gz"`; \ do \ python etc/release/scancode_release_tests.py $f; \ done @@ -575,7 +583,7 @@ jobs: run: shell: bash strategy: - fail-fast: true + fail-fast: false matrix: dist_names: ["wheels-3.9", "wheels-3.10", "wheels-3.11", "wheels-3.12", "wheels-3.13", sdists] diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b9c6c38fe4..22c4620477 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,50 +1,40 @@ Changelog ========= -- We now support new package manifest formats: +Next release +-------------- - - OpenWRT packages. - - Yocto/BitBake .bb recipes. -v33.0.0 (next next, roadmap) ----------------------------- +v32.4.1 - 2025-07-23 +-------------------- -- Fallback packages for non-native dependencies of SCTK. -- Dependencies for -- Support for copyright detection objects. +This is a patch release with bugfixes and improvements:: -- A new field in packages with the license category for the - detected license expression and also an API function to - compute license categories from license expressions. - See https://github.com/nexB/scancode-toolkit/issues/2897 +- Fix broken scancode release archives and release scripts + https://github.com/aboutcode-org/scancode-toolkit/issues/4469 -- More support for tabular output formats: New command-line - options for XSLX output, and the old `--csv` command line - option is removed. - See https://github.com/nexB/scancode-toolkit/issues/830 +- Support licenses from SPDX License List 3.27 + https://github.com/aboutcode-org/scancode-toolkit/pull/4468 -- `--unknown-licenses` is removed and this is always enabled - and only used in case of improper detections automatically. +- Add new licenses, license rules and license data updates + https://github.com/aboutcode-org/scancode-toolkit/pull/4478 -- File categorization support added, a post scan plugin tagging - files with priority levels for review, and also take advantage - of these in other summary plugins. - See https://github.com/nexB/scancode-toolkit/issues/1745 +- Use updated license-expression v30.4.4 with updated licenses + https://github.com/aboutcode-org/license-expression/releases/tag/v30.4.4 -- Update Dockerfile and test container build. - See https://github.com/aboutcode-org/scancode-toolkit/issues/3955 +- Use pygmars v1.0.0 with copyright detection performance + improvements by removing unnecessary regex substitutions. + https://github.com/aboutcode-org/scancode-toolkit/issues/4063 -- Update ABOUT files to adapt the ABOUT File Specification. - See https://github.com/aboutcode-org/scancode-toolkit/issues/4181 - -- Add licenses from SPDX License List 3.27 - - Total Licenses: 21 - - Old Licenses: 13 - - From rules: 4 - - From licenses: 9 - - New licenses: 8 - https://github.com/aboutcode-org/scancode-toolkit/pull/4468 +- Fix misc scancode doumentation related issues + https://github.com/aboutcode-org/scancode-toolkit/pull/4457 + https://github.com/aboutcode-org/scancode-toolkit/pull/4458 + https://github.com/aboutcode-org/scancode-toolkit/pull/4462 + https://github.com/aboutcode-org/scancode-toolkit/pull/4465 + https://github.com/aboutcode-org/scancode-toolkit/pull/4470 + https://github.com/aboutcode-org/scancode-toolkit/pull/4471 + https://github.com/aboutcode-org/scancode-toolkit/pull/4476 v32.4.0 - 2025-06-26 @@ -114,6 +104,9 @@ These are the details for the most important changes introduced:: because of a compatibility issue with Click https://github.com/aboutcode-org/scancode-toolkit/pull/4427 +- 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 -------------------- @@ -159,6 +152,9 @@ Bugfixes: - Fix npm package parsing bug for packages with workspaces. https://github.com/aboutcode-org/scancode.io/issues/1521 +- Update Dockerfile and test container build. + See https://github.com/aboutcode-org/scancode-toolkit/issues/3955 + New features/licenses: - Adds support for pnpm lock YAML v9 @@ -812,6 +808,8 @@ License detection: See https://github.com/nexB/scancode-toolkit/issues/3343 +- `--unknown-licenses` is removed and this is always enabled + and only used in case of improper detections automatically. v31.2.6 - 2023-04-25 ---------------------------------- diff --git a/configure b/configure index 5c5c64adb7..ac5ed59099 100755 --- a/configure +++ b/configure @@ -151,6 +151,7 @@ fi # Requirement arguments passed to pip and used by default or with --dev. REQUIREMENTS="--editable . --constraint requirements.txt" DEV_REQUIREMENTS="--editable .[dev,packages] --constraint requirements.txt --constraint requirements-dev.txt" +PROD_REQUIREMENTS="scancode_toolkit*.whl" # where we create a virtualenv VIRTUALENV_DIR=venv diff --git a/configure.bat b/configure.bat index 3314a31516..3a03807385 100644 --- a/configure.bat +++ b/configure.bat @@ -28,6 +28,7 @@ @rem # Requirement arguments passed to pip and used by default or with --dev. set "REQUIREMENTS=--editable . --constraint requirements.txt" set "DEV_REQUIREMENTS=--editable .[dev] --constraint requirements.txt --constraint requirements-dev.txt" +set "PROD_REQUIREMENTS=scancode_toolkit*.whl" @rem # where we create a virtualenv set "VIRTUALENV_DIR=venv" diff --git a/docs/source/getting-started/install.rst b/docs/source/getting-started/install.rst index b4a072f49b..525334caaa 100644 --- a/docs/source/getting-started/install.rst +++ b/docs/source/getting-started/install.rst @@ -304,8 +304,8 @@ Run the ``docker build`` source code checkout directory.:: For instance, :: C:\scancode-toolkit>git describe --tags - v32.4.0 - C:\scancode-toolkit>docker build --tag scancode-toolkit --tag scancode-toolkit:v32.4.0 . + v32.4.1 + C:\scancode-toolkit>docker build --tag scancode-toolkit --tag scancode-toolkit:v32.4.1 . Run using Docker diff --git a/requirements.txt b/requirements.txt index 00a9d8e8d3..912fee05ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -36,7 +36,7 @@ jaraco.functools==4.2.1 javaproperties==0.8.2 Jinja2==3.1.6 jsonstreams==0.6.0 -license-expression==30.4.3 +license-expression==30.4.4 lxml==5.4.0 MarkupSafe==3.0.2 more-itertools==10.7.0 diff --git a/setup-mini.cfg b/setup-mini.cfg index 291e422ba4..33532ca0aa 100644 --- a/setup-mini.cfg +++ b/setup-mini.cfg @@ -1,6 +1,6 @@ [metadata] name = scancode-toolkit-mini -version = 32.4.0 +version = 32.4.1 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 @@ -87,7 +87,7 @@ install_requires = javaproperties >= 0.5 jinja2 >= 2.7.0 jsonstreams >= 0.5.0 - license_expression >= 30.4.1 + license_expression >= 30.4.4 lxml >= 5.4.0 MarkupSafe >= 2.1.2 packageurl_python >= 0.9.0 diff --git a/setup.cfg b/setup.cfg index 31cf92b5ab..b0954ef901 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = scancode-toolkit -version = 32.4.0 +version = 32.4.1 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 @@ -88,7 +88,7 @@ install_requires = javaproperties >= 0.5 jinja2 >= 2.7.0 jsonstreams >= 0.5.0 - license_expression >= 30.4.1 + license_expression >= 30.4.4 lxml >= 5.4.0 MarkupSafe >= 2.1.2 packageurl_python >= 0.9.0 diff --git a/src/scancode_config.py b/src/scancode_config.py index b5a87b911c..9b6e2b7d07 100644 --- a/src/scancode_config.py +++ b/src/scancode_config.py @@ -134,12 +134,12 @@ def _create_dir(location): # See https://scancode-toolkit.readthedocs.io/en/latest/misc/versioning.html for # more information on versioning if not __version__: - __version__ = '32.4.0' + __version__ = '32.4.1' ####################### # used to warn user when the version is out of date # this is (year, month, day) -__release_date__ = datetime.datetime(2025, 6, 26) +__release_date__ = datetime.datetime(2025, 7, 23) # See https://scancode-toolkit.readthedocs.io/en/latest/misc/versioning.html # for more information on the data format version