From 5aee8b14b74767591cff93807cf8a3b244da3ec8 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Tue, 23 May 2023 01:48:48 +0530 Subject: [PATCH 1/3] Bump version to v32.0.0 Signed-off-by: Ayan Sinha Mahapatra --- setup-mini.cfg | 2 +- setup.cfg | 2 +- src/scancode_config.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup-mini.cfg b/setup-mini.cfg index 9e25bf676fa..c15813b9ab3 100644 --- a/setup-mini.cfg +++ b/setup-mini.cfg @@ -1,6 +1,6 @@ [metadata] name = scancode-toolkit -version = 32.0.0rc4 +version = 32.0.0 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 diff --git a/setup.cfg b/setup.cfg index c4cfc43dc76..92b478875cd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = scancode-toolkit -version = 32.0.0rc4 +version = 32.0.0 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 diff --git a/src/scancode_config.py b/src/scancode_config.py index 0e5b1a2a85a..218919a8a77 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.0.0rc4' + __version__ = '32.0.0' ####################### # used to warn user when the version is out of date From 80dac0f503dacff1a64eb3448e9669698230523c Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Tue, 23 May 2023 01:49:57 +0530 Subject: [PATCH 2/3] Update changelog and roadmap Signed-off-by: Ayan Sinha Mahapatra --- CHANGELOG.rst | 8 ++++---- ROADMAP.rst | 11 +++++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bd20fa71f8f..6a9e832fcd5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -12,8 +12,8 @@ v33.0.0 (next next, roadmap) - Yocto/BitBake .bb recipes. -v32.0.0 (next, roadmap) ------------------------ +v32.0.0 - 2023-05-23 +--------------------- Important API changes: ~~~~~~~~~~~~~~~~~~~~~~ @@ -21,8 +21,8 @@ Important API changes: This is a major release with major API and output format changes and signicant feature updates. -In particular changed to the output format for the licenses and packages, and -we changed some of the command line options. +In particular the output format has changed for the licenses and packages, and +also for some of the command line options. The output format version is now 3.0.0. diff --git a/ROADMAP.rst b/ROADMAP.rst index 7e9b44bdabe..e97fb4674cf 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -29,7 +29,8 @@ This is for SCTK first. Status: This has been completed in SCTK and also included in SCIO. We use an updated --summary option and a new license clarity score for this. -Some work is still in progress as part of 3.) "detections" +We also have LicenseDetections for resources/packages and a top level +unique license detections as a summary. 2. Package files. @@ -50,11 +51,15 @@ This has been completed in SCTK and also included in SCIO. - package: object of its own, and related set of files, not always in the same directory +This is completed in SCTK. + *License*: - many detections in a file at different locations, could be merged into a single reported license - same for primary licenses +This is completed in SCTK. + *Copyright*: - Copyright and author detection, which are tracked at the line level @@ -76,6 +81,7 @@ Roadmap - SCTK: add primary license field in package output and populate this based on package-type/ecosystem conventions. +- SCTK: also populate secondary license fields - SCIO: add primary license field in DiscoveredPackage models and feed it with the data from packages - SCIO: Do we track secondary? or is this just data aggregated on the fly. @@ -87,7 +93,7 @@ Roadmap - This is closely tied to the primary license detection and should focus on package manifests and key files. - +- Support copyright parsing from all package ecosystems. 3. Package files ~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -122,3 +128,4 @@ Roadmap - Revamp how common list of suprrious licenses are detected (this is a bug) - Use important key phrases for license detection https://github.com/nexB/scancode-toolkit/issues/2637 +This is mostly completed, for follow up see https://github.com/nexB/scancode-toolkit/issues/2878. From a8ae650885058d1ab55a9ce8e82adb34829a7184 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Tue, 23 May 2023 02:31:19 +0530 Subject: [PATCH 3/3] Update CHANGELOG with v32.1.0 roadmap Signed-off-by: Ayan Sinha Mahapatra --- CHANGELOG.rst | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6a9e832fcd5..f604ee16994 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,15 +2,40 @@ Changelog ========= v33.0.0 (next next, roadmap) - ---------------------------- - - We now support new package manifest formats: - OpenWRT packages. - Yocto/BitBake .bb recipes. +- Fallback packages for non-native dependencies of SCTK. +- Dependencies for +- Support for copyright detection objects. + +v32.1.0 (next, roadmap) +---------------------------- + +- 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 + +- 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 + +- `--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 + +- 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 v32.0.0 - 2023-05-23 ---------------------