Merge pull request #3336 from nexB/release-prep-v32-rc4

Release prep V32.0.0rc4

Author: AyanSinhaMahapatra

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
 ----------------------------------
 

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

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

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