Merge branch 'main' into 5.0.0-dev

Author: jkowalleck

CHANGELOG.md

@@ -2,13 +2,43 @@
 
 
 
-## v4.6.1-alpha.1 (2024-09-23)
+## v4.6.1 (2024-09-30)
 
 ### Chore
 
-* chore: trusted publishing
+* chore: trusted publishing (#795)
 
-Signed-off-by: Jan Kowalleck <[email protected]> ([`07b5e83`](https://github.com/CycloneDX/cyclonedx-python/commit/07b5e83c18fd3c02f917bca1faa00d42e6665647))
+fixes #794
+
+---------
+
+Signed-off-by: Jan Kowalleck <[email protected]>
+Signed-off-by: semantic-release <[email protected]>
+Co-authored-by: semantic-release <[email protected]> ([`721f12d`](https://github.com/CycloneDX/cyclonedx-python/commit/721f12d1a5799e9766fd4da79f54fd11c5776824))
+
+### Documentation
+
+* docs: contrib and setup hint
+
+Signed-off-by: Jan Kowalleck <[email protected]> ([`2ae46ff`](https://github.com/CycloneDX/cyclonedx-python/commit/2ae46ff222067724d4f1e5e23335cd342f6775a6))
+
+### Fix
+
+* fix: help page for sub command "environment" on windows (#805)
+
+fixes #804
+
+---------
+
+Signed-off-by: Steve (Gadget) Barnes <[email protected]>
+Signed-off-by: Jan Kowalleck <[email protected]>
+Co-authored-by: Jan Kowalleck <[email protected]> ([`9e8a5d7`](https://github.com/CycloneDX/cyclonedx-python/commit/9e8a5d72045b3477e5523ed891493c29a584f35f))
+
+### Unknown
+
+* tests: consolidate cli runner (#806)
+
+Signed-off-by: Jan Kowalleck <[email protected]> ([`c7b5b1a`](https://github.com/CycloneDX/cyclonedx-python/commit/c7b5b1a37332b3991f3066d306cb179d6004fe5a))
 
 
 ## v4.6.0 (2024-09-20)

cyclonedx_py/__init__.py

@@ -17,7 +17,7 @@
 
 # !! version is managed by `semantic_release`
 # do not use typing here, or else `semantic_release` might have issues finding the variable
-__version__ = "4.6.1-alpha.1"  # noqa:Q000
+__version__ = "4.6.1"  # noqa:Q000
 
 # There is no stable/public API.
 # However, you might call the stable CLI instead, like so:

docs/conf.py

@@ -22,7 +22,7 @@
 
 # The full version, including alpha/beta/rc tags
 # !! version is managed by semantic_release
-release = "4.6.1-alpha.1"
+release = "4.6.1"
 
 # -- General configuration ---------------------------------------------------
 

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "poetry.core.masonry.api"
 [tool.poetry]
 # keep in sync with `cyclonedx_py/_internal/utils/cdx.py`
 name = "cyclonedx-bom"
-version = "4.6.1-alpha.1"
+version = "4.6.1"
 description = "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments"
 authors = [
   "Jan Kowalleck <[email protected]>",
@@ -92,7 +92,7 @@ isort = "5.13.2"
 autopep8 = "2.3.1"
 mypy = "1.11.2"
 bandit = "1.7.10"
-tox = "4.20.0"
+tox = "4.21.2"
 # min version required to be able to install some dependencies
 # see https://github.com/MichaelKim0407/flake8-use-fstring/issues/33
 setuptools = ">= 47.0.0"