From 736bae3d4396cf6c92722251b5ef804ae8a4e1ff Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Fri, 21 Apr 2023 02:43:54 +0530 Subject: [PATCH 1/2] Bump version for v32.0.0rc4 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 bcd87764ba4..9e25bf676fa 100644 --- a/setup-mini.cfg +++ b/setup-mini.cfg @@ -1,6 +1,6 @@ [metadata] name = scancode-toolkit -version = 32.0.0rc3 +version = 32.0.0rc4 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 2c20b02a312..5756e1767a1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = scancode-toolkit -version = 32.0.0rc3 +version = 32.0.0rc4 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 f2e149dcf0a..0e5b1a2a85a 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.0rc3' + __version__ = '32.0.0rc4' ####################### # used to warn user when the version is out of date From bcf919ee1592bf149d066c393556671d881619b3 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Fri, 21 Apr 2023 02:57:06 +0530 Subject: [PATCH 2/2] Add CHANGELOG entry for v31.2.5 Signed-off-by: Ayan Sinha Mahapatra --- CHANGELOG.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 88308440591..ba41bd9de63 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -197,6 +197,18 @@ License detection: See https://github.com/nexB/scancode-toolkit/issues/3219 +v31.2.5 - 2023-04-21 +---------------------------------- + +This is a minor backport release. + +This adds license rule changes and was requested here: +https://github.com/nexB/scancode-toolkit/issues/3310 +This was originally merged in #3218 and included in +the latest release v32.x, and is also being backported +now to v31.2.x + + v31.2.4 - 2023-01-09 ----------------------------------