Fix bumping only on the first few matches #386

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.

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

Jump to bottom

Merged

Lee-W merged 10 commits into master from fix-bumping-only-on-first-few-matches

May 26, 2021

Merged

Fix bumping only on the first few matches #386

Lee-W merged 10 commits into master from fix-bumping-only-on-first-few-matches

May 26, 2021

Conversation

Lee-W

Copy link

Member

@Lee-W Lee-W commented May 25, 2021 •

edited

Loading

Description

Fix bumping only on the first few matches
fix error due to bumping version file without eol through regex
- see tests/test_bump_update_version_in_files/test_multiplt_versions_to_bump_without_eol_.toml in 943d873 as example, our original bumping mechanism will not bump the last one.

Checklist

Add test cases to all the changes you introduce
Run ./script/format and ./script/test locally to ensure this change passes linter check and test
Test the changes on the local machine manually
Update the documentation for the changes

Expected behavior

Bump all version specified in version_files

Steps to Test This Pull Request

git clone //github.com/pedrorrivero/qrand
git checkout 0.3.0a0
cz bump

Additional context

Lee-W added 4 commits

May 25, 2021 19:45

@Lee-W


 test(bump): add test cast that fails to bump correctly

9f636bf

#383

@Lee-W


 fix(bump): fix offset error due to partially match

99f4d30

for examply, if what we want to bump is "version = 1.2.9", we still lookup up "version = 2.0.0" and changed the offset
this is fixed by changing offset only when matching is found
#383

@Lee-W


 build(poetry): add pytest-regression as dev dependency

@Lee-W


 test(bump): refactor test_multiplt_versions_to_bump through file_regr...

3f76cf1

...ession

@Lee-W Lee-W requested a review from woile

May 25, 2021 14:49

@Lee-W

Copy link

Member Author

Lee-W commented May 25, 2021

@woile I'm thinking of refactoring test through pytest-regressions like this commit. What do you think? Basically, it checks whether our result in this round is different from the previous round. By doing so, we can check whether the content is exactly the same instead of check only a few lines.

@Lee-W


 style(config): ignore TomlConfig._parse_setting type annotation

f076fea

@codecov

Copy link

codecov bot commented May 25, 2021 •

edited

Loading

Codecov Report

Merging #386 (801a715) into master (e107411) will increase coverage by 0.21%.
The diff coverage is 100.00%.

Impacted file tree graph

@@ Coverage Diff @@
## master #386 +/- ##
==========================================
+ Coverage 97.67% 97.89% +0.21% 
==========================================
 Files 39 39 
 Lines 1378 1375 -3 
==========================================
 Hits 1346 1346 
+ Misses 32 29 -3

Flag	Coverage Δ
unittests	`97.89% <100.00%> (+0.21%)`	⬆️

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

Impacted Files	Coverage Δ
commitizen/__version__.py	`100.00% <100.00%> (ø)`
commitizen/bump.py	`100.00% <100.00%> (ø)`
commitizen/config/toml_config.py	`100.00% <100.00%> (ø)`
commitizen/git.py	`100.00% <0.00%> (+3.37%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update aa0debe...801a715. Read the comment docs.

woile

woile reviewed

May 25, 2021

View reviewed changes

pyproject.toml Show resolved Hide resolved

woile

woile approved these changes

May 25, 2021

View reviewed changes

Lee-W added 4 commits

May 26, 2021 16:42

@Lee-W


 test(bump_update_verison_in_files): refactor test cases through pytes...

dfd4800

...t-regression

@Lee-W


 test(bump): add test case that fails when using regex with version fi...

943d873

...le without end of line
if we bump with version file with no end of line through regex, the last version will be ignored

@Lee-W


 fix(bump): fix error due to bumping version file without eol through ...

e0af6a2

...regex

@Lee-W


 test(bump): refactor file loading with extracted utility function

@Lee-W Lee-W force-pushed the fix-bumping-only-on-first-few-matches branch from 298ddb1 to 6564682 Compare

May 26, 2021 10:02

@Lee-W


 test(git): add test case for is_staging_clean

801a715

@Lee-W

Copy link

Member Author

Lee-W commented May 26, 2021 •

edited

Loading

@woile I accidentally find another bug and fixed it. Could you please check again? In tests/test_bump_update_version_in_files/test_multiplt_versions_to_bump_without_eol_.toml on 943d873, our original bumping mechanism will not bump the last line. This has been fixed on e0af6a2. If it looks good, I think we're ready to merge.

@woile

Copy link

Member

woile commented May 26, 2021

Niceee, LGTM!

@Lee-W Lee-W merged commit 9607874 into master

May 26, 2021

@Lee-W Lee-W deleted the fix-bumping-only-on-first-few-matches branch

May 26, 2021 14:11

@Lee-W Lee-W mentioned this pull request

May 26, 2021

Bump only updates the first match in a version_file #383

Closed

Labels

None yet

2 participants

@Lee-W @woile

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!

Fix bumping only on the first few matches #386

Fix bumping only on the first few matches #386

Uh oh!

Conversation

@Lee-W Lee-W commented May 25, 2021 •

edited

Loading

Uh oh!

Description

Checklist

Expected behavior

Steps to Test This Pull Request

Additional context

Uh oh!

Lee-W commented May 25, 2021

Uh oh!

codecov bot commented May 25, 2021 •

edited

Loading

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Lee-W commented May 26, 2021 •

edited

Loading

Uh oh!

Uh oh!

woile commented May 26, 2021

Uh oh!

Uh oh!

Uh oh!

Fix bumping only on the first few matches #386

Fix bumping only on the first few matches #386

Uh oh!

Conversation

@Lee-W Lee-W commented May 25, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist

Expected behavior

Steps to Test This Pull Request

Additional context

Uh oh!

Lee-W commented May 25, 2021

Uh oh!

codecov bot commented May 25, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Lee-W commented May 26, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

woile commented May 26, 2021

Uh oh!

Uh oh!

@Lee-W Lee-W commented May 25, 2021 •

edited

Loading

codecov bot commented May 25, 2021 •

edited

Loading

Lee-W commented May 26, 2021 •

edited

Loading