Skip to content

fix semver not fully covered #1548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

bearomorphism wants to merge 38 commits into commitizen-tools:master

from bearomorphism:bear-fix-semver-not-fully-covered

Open

fix semver not fully covered #1548

bearomorphism wants to merge 38 commits into commitizen-tools:master from bearomorphism:bear-fix-semver-not-fully-covered

Conversation

Copy link

Contributor

@bearomorphism bearomorphism commented Jun 12, 2025 •

edited

Loading

Description

Related issue: #950

Checklist

I have read the contributing guidelines
Better/correct test cases

@bearomorphism bearomorphism requested review from woile, Lee-W and noirbizarre as code owners

June 12, 2025 19:14

@bearomorphism bearomorphism marked this pull request as draft

June 12, 2025 19:14

@github-actions github-actions bot added pr-status: wait-for-review type: bug labels

@bearomorphism bearomorphism force-pushed the bear-fix-semver-not-fully-covered branch from 0972ba2 to 877fcd6 Compare

June 12, 2025 19:26

bearomorphism commented

View reviewed changes

tests/test_version_scheme_semver.py

Comment on lines +67 to +69

(("1.0.0-reallyweird", "PATCH", "reallyweird", 0, None), "1.0.0-reallyweird1"),

(("v0.7.1-release", "PATCH", "release", 0, None), "0.7.1-release1"),

(("v0.0.1-SNAPSHOT", "PATCH", "SNAPSHOT", 0, None), "0.0.1-snapshot1"),

Copy link

Contributor Author

@bearomorphism bearomorphism Jun 12, 2025 •

edited

Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Lee-W I'm not entirely sure if these test cases are correct. Could you help to review?

@bearomorphism bearomorphism force-pushed the bear-fix-semver-not-fully-covered branch from 877fcd6 to da46193 Compare

June 13, 2025 13:09

@codecov Codecov

Copy link

codecov bot commented Jun 13, 2025 •

edited

Loading

Codecov Report

❌ Patch coverage is 95.93909% with 8 lines in your changes missing coverage. Please review.
✅ Project coverage is 98.26%. Comparing base (120d514) to head (3081fff).
⚠️ Report is 802 commits behind head on master.

Files with missing lines	Patch %	Lines
commitizen/commands/init.py	88.05%	8 Missing ⚠️

Additional details and impacted files

@@ Coverage Diff @@
## master #1548 +/- ##
==========================================
+ Coverage 97.33% 98.26% +0.92% 
==========================================
 Files 42 58 +16 
 Lines 2104 2711 +607 
==========================================
+ Hits 2048 2664 +616 
+ Misses 56 47 -9

Flag	Coverage Δ
unittests	`98.26% <95.93%> (+0.92%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@bearomorphism bearomorphism changed the title ~~(削除) WIP fix semver not fully covered (削除ここまで)~~ (追記) fix semver not fully covered (追記ここまで)

@bearomorphism bearomorphism marked this pull request as ready for review

August 13, 2025 01:30

@Lee-W Lee-W added this to the 4.9.0 milestone

Lee-W reviewed

View reviewed changes

tests/test_version_scheme_semver.py

Comment on lines +67 to +69

(("1.0.0-reallyweird", "PATCH", "reallyweird", 0, None), "1.0.0-reallyweird1"),

(("v0.7.1-release", "PATCH", "release", 0, None), "0.7.1-release1"),

(("v0.0.1-SNAPSHOT", "PATCH", "SNAPSHOT", 0, None), "0.0.1-snapshot1"),

Copy link

Member

@Lee-W Lee-W Aug 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

(("1.0.0-reallyweird", "PATCH", "reallyweird", 0, None), "1.0.0-reallyweird1"),

(("v0.7.1-release", "PATCH", "release", 0, None), "0.7.1-release1"),

(("v0.0.1-SNAPSHOT", "PATCH", "SNAPSHOT", 0, None), "0.0.1-snapshot1"),

(("1.0.0-reallyweird", "PATCH", "reallyweird", 0, None), "1.0.1-reallyweird1"),

(("v0.7.1-release", "PATCH", "release", 0, None), "0.7.2-release1"),

(("v0.0.1-SNAPSHOT", "PATCH", "SNAPSHOT", 0, None), "0.0.2-snapshot1"),

I feel they probably should be this instead?

commitizen/version_schemes.py

@@ -153,11 +153,54 @@ def bump(

VersionScheme: TypeAlias = type[VersionProtocol]

# See https://github.com/pypa/packaging/blob/14b83e15dbb9caa87c63646ba7808b2b5e460ce6/src/packaging/version.py#L117

# TODO: add more test cases for this pattern

_VERSION_PATTERN = r"""^\s*

Copy link

Member

@Lee-W Lee-W Aug 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One thing to note is that Python does not use semver. It exists before semver

@Lee-W Lee-W added pr-status: wait-for-response and removed pr-status: wait-for-review labels

bearomorphism added 14 commits

August 28, 2025 10:28

@bearomorphism @Lee-W


 refactor(ParseArgs): simplify __call__ function body

8a35675

@bearomorphism @Lee-W


 refactor(ExpectedExit): make the constructor more compact

08f30d7

@bearomorphism @Lee-W


 refactor(ScmProvider): replace sorted with max

d669f6c

@bearomorphism @Lee-W


 refactor(git): remove redundant if branch

93df432

@bearomorphism @Lee-W


 fix(Bump): rewrite --get-next NotAllowed error message for consistency

c3e8bba

@bearomorphism @Lee-W


 fix(Changelog): fix _export_template variable type

27e35b8

Closes commitizen-tools#1503

@bearomorphism @Lee-W


 refactor(TagRules): extract tag_formats property and simplify list co...

e1cca8c

...mprehension

@bearomorphism @Lee-W


 refactor(Init): use ternary operator

d3a53c3

@bearomorphism @Lee-W


 refactor(bump): use a loop to shorten a series of similar NotAllowed ...

cb751d9

...exceptions

@bearomorphism @Lee-W


 fix: raise NoVersionSpecifiedError if version is None, and adjust cal...

0c81d46

...l sites of get_version

@bearomorphism @Lee-W


 docs(taplo): add toml formatter

904ffd6

@bearomorphism @Lee-W


 docs(pre-commit): add taplo to pre-commit hook

23c0b8a

@bearomorphism @Lee-W


 refactor(Changelog): remove unnecessary intermediate variables for be...

c4310ff

...tter readability

@bearomorphism @Lee-W


 refactor(changelog): shorten condition expression and early return

3812fc7

bearomorphism and others added 8 commits

August 28, 2025 10:28

@bearomorphism @Lee-W


 test(Init): cover _ask_tag test

@timsu92 @Lee-W


 fix(init): use pre-push as pre-commit stage

719b35c

Original "push" stage has been deprecated since pre-commit v3.2.0. See pre-commit/pre-commit#2732 and pre-commit/pre-commit#2808 for detailed information.

@timsu92 @Lee-W


 test(init): check "pre-" is showing in outputs

fb578ec

@bearomorphism @Lee-W


 refactor(Init): remove the variable values_to_add and the update_conf...

06993fe

...ig function for readability

@bearomorphism @Lee-W


 test(Init): improve test coverage on config initialization

1693ba9

@bearomorphism @Lee-W


 refactor(changelog): shorten generate_tree_from_commits

9b96722

@bearomorphism @Lee-W


 feat(check): add check against default branch

d8b135a

@ongdisheng @Lee-W


 test(changelog): ensure error on missing changelog template filename

b313847

@Lee-W Lee-W force-pushed the v4-9-0-test branch from 69db5b4 to b313847 Compare

August 28, 2025 02:28

timsu92 and others added 5 commits

August 30, 2025 12:25

@timsu92 @Lee-W


 fix(init): use pre-push as pre-commit stage

f69972e

Original "push" stage has been deprecated since pre-commit v3.2.0. See pre-commit/pre-commit#2732 and pre-commit/pre-commit#2808 for detailed information.

@bearomorphism @Lee-W


 refactor(changelog): simplify logic for get_oldest_and_newest_rev

a21796f

@bearomorphism @Lee-W


 refactor(changelog): add get_next_tag_name_after_version and test, ma...

4116dc5

...rk unused for get_smart_tag_range

@bearomorphism @Lee-W


 fix(changelog): mark get_smart_tag_range as deprecated

f800e9a


 style(pyproject.toml): fix toml format

c700d66

Copy link

Contributor Author

bearomorphism commented Sep 8, 2025

I will update this PR this week when I have bandwidth

Lee-W and others added 2 commits

September 8, 2025 16:34

@Lee-W @bearomorphism


 test(version_scheme): add test case "1.0.0-reallyweird" to semver

22c7bc6


 fix(BaseVersion): support more tag format

3081fff

@bearomorphism bearomorphism force-pushed the bear-fix-semver-not-fully-covered branch from da46193 to 3081fff Compare

September 8, 2025 08:34

@github-actions github-actions bot added the pr-status: wait-for-review label

@Lee-W Lee-W modified the milestones: 4.9.0, 4.9.1

@Lee-W Lee-W force-pushed the v4-9-0-test branch from c700d66 to 8b969db Compare

September 9, 2025 05:56

@Lee-W Lee-W deleted the branch commitizen-tools:master

September 9, 2025 06:09

@Lee-W Lee-W closed this

Copy link

Contributor Author

bearomorphism commented Sep 9, 2025

Maybe we can adjust the workflow. Several PRs got closed just because the target branch is deleted

@Lee-W Lee-W reopened this

@Lee-W Lee-W changed the base branch from v4-9-0-test to master

September 9, 2025 14:22

Copy link

Member

Lee-W commented Sep 9, 2025

Yep, this was a temporary workflow. we usually don't receive this many PR and don't review this fast. Maybe worth rethink it to make a rc to avoid what we encountered yesterday as well

@Lee-W Lee-W modified the milestones: 4.9.1, 4.9.2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr-status: wait-for-response pr-status: wait-for-review type: bug

4 participants

@bearomorphism @Lee-W @timsu92 @ongdisheng