refactor(bump_rule): get rid of a simple function

bearomorphism · bearomorphism · commit b57628a62bca · 2025-08-24T22:36:38.000+08:00
diff --git a/commitizen/bump_rule.py b/commitizen/bump_rule.py
@@ -70,18 +70,15 @@ def get_highest_by_messages(
 >>> VersionIncrement.get_highest_by_messages(commit_messages, lambda x: rule.extract_increment(x, False))
 'MINOR'
 """
- return VersionIncrement.get_highest(
- extract_increment(line)
- for message in commit_messages
- for line in message.split("\n")
+ return max(
+ (
+ extract_increment(line)
+ for message in commit_messages
+ for line in message.split("\n")
+ ),
+ default=VersionIncrement.NONE,
 )
 
- @staticmethod
- def get_highest(
- increments: Iterable[VersionIncrement],
- ) -> VersionIncrement:
- return max(increments, default=VersionIncrement.NONE)
-
 
 class BumpRule(Protocol):
 """A protocol defining the interface for version bump rules.
@@ -234,13 +231,16 @@ def extract_increment(
 )
 
 try:
- if ret := VersionIncrement.get_highest(
- (
- increment
- for name, increment in effective_bump_map.items()
- if m.group(name)
- ),
- ):
+ if (
+ ret := max(
+ (
+ increment
+ for name, increment in effective_bump_map.items()
+ if m.group(name)
+ ),
+ default=VersionIncrement.NONE,
+ )
+ ) is not VersionIncrement.NONE:
 return ret
 except IndexError:
 pass
diff --git a/tests/test_bump_rule.py b/tests/test_bump_rule.py
@@ -635,61 +635,6 @@ def test_with_find_increment_by_callable(self, custom_bump_rule):
 )
 
 
-class TestGetHighest:
- def test_get_highest_with_major(self):
- increments = [
- VersionIncrement.PATCH,
- VersionIncrement.MINOR,
- VersionIncrement.MAJOR,
- ]
- assert VersionIncrement.get_highest(increments) == VersionIncrement.MAJOR
-
- def test_get_highest_with_minor(self):
- increments = [
- VersionIncrement.PATCH,
- VersionIncrement.MINOR,
- VersionIncrement.NONE,
- ]
- assert VersionIncrement.get_highest(increments) == VersionIncrement.MINOR
-
- def test_get_highest_with_patch(self):
- increments = [
- VersionIncrement.PATCH,
- VersionIncrement.NONE,
- VersionIncrement.NONE,
- ]
- assert VersionIncrement.get_highest(increments) == VersionIncrement.PATCH
-
- def test_get_highest_with_none(self):
- increments = [
- VersionIncrement.NONE,
- VersionIncrement.NONE,
- VersionIncrement.NONE,
- ]
- assert VersionIncrement.get_highest(increments) == VersionIncrement.NONE
-
- def test_get_highest_empty(self):
- increments = []
- assert VersionIncrement.get_highest(increments) == VersionIncrement.NONE
-
- def test_get_highest_mixed_order(self):
- increments = [
- VersionIncrement.MAJOR,
- VersionIncrement.PATCH,
- VersionIncrement.MINOR,
- ]
- assert VersionIncrement.get_highest(increments) == VersionIncrement.MAJOR
-
- def test_get_highest_with_none_values(self):
- increments = [
- VersionIncrement.NONE,
- VersionIncrement.MINOR,
- VersionIncrement.NONE,
- VersionIncrement.PATCH,
- ]
- assert VersionIncrement.get_highest(increments) == VersionIncrement.MINOR
-
-
 class TestSafeCast:
 def test_safe_cast_valid_strings(self):
 assert VersionIncrement.safe_cast("MAJOR") == VersionIncrement.MAJOR

-Original file line number
+Diff line change
  >>> VersionIncrement.get_highest_by_messages(commit_messages, lambda x: rule.extract_increment(x, False))
  'MINOR'
  """
 -returnVersionIncrement.get_highest(
 -extract_increment(line)
 -formessageincommit_messages
 -forlineinmessage.split("\n")
 +returnmax(
 + (
 +extract_increment(line)
 +formessageincommit_messages
 +forlineinmessage.split("\n")
 + ),
 +default=VersionIncrement.NONE,
+ )
 -@staticmethod
 -defget_highest(
 -increments: Iterable[VersionIncrement],
 - ) ->VersionIncrement:
 -returnmax(increments, default=VersionIncrement.NONE)
+-
 classBumpRule(Protocol):
 """A protocol defining the interface for version bump rules.
+ )
 try:
 -ifret:=VersionIncrement.get_highest(
 - (
 -increment
 -forname, incrementineffective_bump_map.items()
 -ifm.group(name)
 - ),
 - ):
 +if (
 +ret:=max(
 + (
 +increment
 +forname, incrementineffective_bump_map.items()
 +ifm.group(name)
 + ),
 +default=VersionIncrement.NONE,
 + )
 + ) isnotVersionIncrement.NONE:
 returnret
 exceptIndexError:
 pass
-Original file line number
+Diff line change
+ )
 -classTestGetHighest:
 -deftest_get_highest_with_major(self):
 -increments= [
 -VersionIncrement.PATCH,
 -VersionIncrement.MINOR,
 -VersionIncrement.MAJOR,
 - ]
 -assertVersionIncrement.get_highest(increments) ==VersionIncrement.MAJOR
+-
 -deftest_get_highest_with_minor(self):
 -increments= [
 -VersionIncrement.PATCH,
 -VersionIncrement.MINOR,
 -VersionIncrement.NONE,
 - ]
 -assertVersionIncrement.get_highest(increments) ==VersionIncrement.MINOR
+-
 -deftest_get_highest_with_patch(self):
 -increments= [
 -VersionIncrement.PATCH,
 -VersionIncrement.NONE,
 -VersionIncrement.NONE,
 - ]
 -assertVersionIncrement.get_highest(increments) ==VersionIncrement.PATCH
+-
 -deftest_get_highest_with_none(self):
 -increments= [
 -VersionIncrement.NONE,
 -VersionIncrement.NONE,
 -VersionIncrement.NONE,
 - ]
 -assertVersionIncrement.get_highest(increments) ==VersionIncrement.NONE
+-
 -deftest_get_highest_empty(self):
 -increments= []
 -assertVersionIncrement.get_highest(increments) ==VersionIncrement.NONE
+-
 -deftest_get_highest_mixed_order(self):
 -increments= [
 -VersionIncrement.MAJOR,
 -VersionIncrement.PATCH,
 -VersionIncrement.MINOR,
 - ]
 -assertVersionIncrement.get_highest(increments) ==VersionIncrement.MAJOR
+-
 -deftest_get_highest_with_none_values(self):
 -increments= [
 -VersionIncrement.NONE,
 -VersionIncrement.MINOR,
 -VersionIncrement.NONE,
 -VersionIncrement.PATCH,
 - ]
 -assertVersionIncrement.get_highest(increments) ==VersionIncrement.MINOR
+-
+-
 classTestSafeCast:
 deftest_safe_cast_valid_strings(self):
 assertVersionIncrement.safe_cast("MAJOR") ==VersionIncrement.MAJOR