Commit 4847e7d

bearomorphismLee-W

authored and

committed

refactor(bump_rule): get rid of a simple function

1 parent 0d2c499 commit 4847e7dCopy full SHA for 4847e7d

File tree

2 files changed

+17

-72

lines changed

commitizen
- bump_rule.py
tests
- test_bump_rule.py

2 files changed

+17

-72

lines changed

`‎commitizen/bump_rule.py`

Lines changed: 17 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,18 +70,15 @@ def get_highest_by_messages(`
`70`	`70`	`>>> VersionIncrement.get_highest_by_messages(commit_messages, lambda x: rule.extract_increment(x, False))`
`71`	`71`	`'MINOR'`
`72`	`72`	`"""`
`73`		`- return VersionIncrement.get_highest(`
`74`		`- extract_increment(line)`
`75`		`- for message in commit_messages`
`76`		`- for line in message.split("\n")`
	`73`	`+ return max(`
	`74`	`+ (`
	`75`	`+ extract_increment(line)`
	`76`	`+ for message in commit_messages`
	`77`	`+ for line in message.split("\n")`
	`78`	`+ ),`
	`79`	`+ default=VersionIncrement.NONE,`
`77`	`80`	`)`
`78`	`81`
`79`		`- @staticmethod`
`80`		`- def get_highest(`
`81`		`- increments: Iterable[VersionIncrement],`
`82`		`- ) -> VersionIncrement:`
`83`		`- return max(increments, default=VersionIncrement.NONE)`
`84`		`-`
`85`	`82`
`86`	`83`	`class BumpRule(Protocol):`
`87`	`84`	`"""A protocol defining the interface for version bump rules.`
`@@ -234,13 +231,16 @@ def extract_increment(`
`234`	`231`	`)`
`235`	`232`
`236`	`233`	`try:`
`237`		`- if ret := VersionIncrement.get_highest(`
`238`		`- (`
`239`		`- increment`
`240`		`- for name, increment in effective_bump_map.items()`
`241`		`- if m.group(name)`
`242`		`- ),`
`243`		`- ):`
	`234`	`+ if (`
	`235`	`+ ret := max(`
	`236`	`+ (`
	`237`	`+ increment`
	`238`	`+ for name, increment in effective_bump_map.items()`
	`239`	`+ if m.group(name)`
	`240`	`+ ),`
	`241`	`+ default=VersionIncrement.NONE,`
	`242`	`+ )`
	`243`	`+ ) is not VersionIncrement.NONE:`
`244`	`244`	`return ret`
`245`	`245`	`except IndexError:`
`246`	`246`	`pass`

`‎tests/test_bump_rule.py`

Lines changed: 0 additions & 55 deletions

Original file line number	Diff line number	Diff line change
`@@ -635,61 +635,6 @@ def test_with_find_increment_by_callable(self, custom_bump_rule):`
`635`	`635`	`)`
`636`	`636`
`637`	`637`
`638`		`-class TestGetHighest:`
`639`		`- def test_get_highest_with_major(self):`
`640`		`- increments = [`
`641`		`- VersionIncrement.PATCH,`
`642`		`- VersionIncrement.MINOR,`
`643`		`- VersionIncrement.MAJOR,`
`644`		`- ]`
`645`		`- assert VersionIncrement.get_highest(increments) == VersionIncrement.MAJOR`
`646`		`-`
`647`		`- def test_get_highest_with_minor(self):`
`648`		`- increments = [`
`649`		`- VersionIncrement.PATCH,`
`650`		`- VersionIncrement.MINOR,`
`651`		`- VersionIncrement.NONE,`
`652`		`- ]`
`653`		`- assert VersionIncrement.get_highest(increments) == VersionIncrement.MINOR`
`654`		`-`
`655`		`- def test_get_highest_with_patch(self):`
`656`		`- increments = [`
`657`		`- VersionIncrement.PATCH,`
`658`		`- VersionIncrement.NONE,`
`659`		`- VersionIncrement.NONE,`
`660`		`- ]`
`661`		`- assert VersionIncrement.get_highest(increments) == VersionIncrement.PATCH`
`662`		`-`
`663`		`- def test_get_highest_with_none(self):`
`664`		`- increments = [`
`665`		`- VersionIncrement.NONE,`
`666`		`- VersionIncrement.NONE,`
`667`		`- VersionIncrement.NONE,`
`668`		`- ]`
`669`		`- assert VersionIncrement.get_highest(increments) == VersionIncrement.NONE`
`670`		`-`
`671`		`- def test_get_highest_empty(self):`
`672`		`- increments = []`
`673`		`- assert VersionIncrement.get_highest(increments) == VersionIncrement.NONE`
`674`		`-`
`675`		`- def test_get_highest_mixed_order(self):`
`676`		`- increments = [`
`677`		`- VersionIncrement.MAJOR,`
`678`		`- VersionIncrement.PATCH,`
`679`		`- VersionIncrement.MINOR,`
`680`		`- ]`
`681`		`- assert VersionIncrement.get_highest(increments) == VersionIncrement.MAJOR`
`682`		`-`
`683`		`- def test_get_highest_with_none_values(self):`
`684`		`- increments = [`
`685`		`- VersionIncrement.NONE,`
`686`		`- VersionIncrement.MINOR,`
`687`		`- VersionIncrement.NONE,`
`688`		`- VersionIncrement.PATCH,`
`689`		`- ]`
`690`		`- assert VersionIncrement.get_highest(increments) == VersionIncrement.MINOR`
`691`		`-`
`692`		`-`
`693`	`638`	`class TestSafeCast:`
`694`	`639`	`def test_safe_cast_valid_strings(self):`
`695`	`640`	`assert VersionIncrement.safe_cast("MAJOR") == VersionIncrement.MAJOR`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 4847e7d

File tree

2 files changed

2 files changed

`‎commitizen/bump_rule.py`

`‎tests/test_bump_rule.py`

0 commit comments