From a937f7debe14dd8f0f7b581492d9d101508060b8 Mon Sep 17 00:00:00 2001
From: Corey Oordt <coreyoordt@gmail.com>
Date: Fri, 25 Aug 2023 07:45:25 -0500
Subject: [PATCH] Fixed configuration files !minor

---
 .changelog-config.yaml |  7 -------
 pyproject.toml         | 10 +++-------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/.changelog-config.yaml b/.changelog-config.yaml
index 9e725e73..838db4e9 100644
--- a/.changelog-config.yaml
+++ b/.changelog-config.yaml
@@ -104,34 +104,27 @@ valid_author_tokens:
 # Rules applied to commits to determine the type of release to suggest.
 release_hint_rules:
   - match_result: dev
-    no_match_result: no-release
     branch: ^((?!master|main).)*$
   - match_result: patch
-    no_match_result: no-release
     path: requirements/prod.in
     branch: master|main
   - match_result: patch
-    no_match_result: no-release
     grouping: Other
     path: bumpversion/*
     branch: master|main
   - match_result: patch
-    no_match_result: no-release
     grouping: Fixes
     path: bumpversion/*
     branch: master|main
   - match_result: minor
-    no_match_result: no-release
     grouping: Updates
     path: bumpversion/*
     branch: master|main
   - match_result: minor
-    no_match_result: no-release
     grouping: New
     path: bumpversion/*
     branch: master|main
   - match_result: major
-    no_match_result: no-release
     grouping: Breaking Changes
     path: bumpversion/*
     branch: master|main
diff --git a/pyproject.toml b/pyproject.toml
index 070b7534..34ed65fd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,9 +1,5 @@
 [build-system]
-
-requires = [
-    "setuptools >= 40.9.0",
-    "wheel",
-]
+requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -216,9 +212,9 @@ commit_args = "--no-verify"
 tag = true
 tag_name = "{new_version}"
 allow_dirty = true
-parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)(\\.(?P<dev>dev\\d+))?"
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)(\\.(?P<dev>dev)\\d+\\+[-_a-zA-Z0-9]+)?"
 serialize = [
-    "{major}.{minor}.{patch}.{dev}{distance_to_latest_tag}",
+    "{major}.{minor}.{patch}.{dev}{distance_to_latest_tag}+{short_branch_name}",
     "{major}.{minor}.{patch}"
 ]
 message = "Version updated from {current_version} to {new_version}"