Skip to content
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

update regex to match all iterations #6839

Merged
merged 5 commits into from
Feb 2, 2023
Merged

update regex to match all iterations #6839

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af0b608
update regex to match all iterations
emmyoop Feb 1, 2023
4ac3dc5
convert to num to match all adapters
emmyoop Feb 2, 2023
8a7ffe6
add comments, remove extra .
emmyoop Feb 2, 2023
2463bc0
clarify with more comments
emmyoop Feb 2, 2023
70f5a91
Update .bumpversion.cfg
emmyoop Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions .bumpversion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
[bumpversion]
current_version = 1.5.0a1
parse = (?P<major>\d+)
\.(?P<minor>\d+)
\.(?P<patch>\d+)
((?P<prekind>a|b|rc)
(?P<pre>\d+) # pre-release version num
)(\.(?P<nightly>[a-z..0-9]+)

# `parse` allows parsing the version into the parts we need to check. There are some
# unnamed groups and that's okay because they do not need to be audited. If any part
# of the version passed in does not match the regex, it will fail.
emmyoop marked this conversation as resolved.
Show resolved Hide resolved
# expected matches: `1.5.0`, `1.5.0a1`, `1.5.0a1.dev123457+nightly`
# excepted failures: `1`, `1.5`, `1.5.2-a1`, `text1.5.0`
parse = (?P<major>[\d]+) # major version number
\.(?P<minor>[\d]+) # minor version number
\.(?P<patch>[\d]+) # patch version number
(((?P<prekind>a|b|rc) # optional pre-release type
?(?P<num>[\d]+?)) # optional pre-release version number
\.?(?P<nightly>[a-z0-9]+\+[a-z]+)? # optional nightly release indicator
Copy link
Contributor

Choose a reason for hiding this comment

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

would need to give this some thought but I think we want 1.5.0a1 to be valid but 1.5.0a to be invalid right?

Copy link
Contributor

Choose a reason for hiding this comment

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

the + in ?(?P<num>[\d]+?)) should handle that.

Copy link
Contributor

Choose a reason for hiding this comment

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

I missed the parenthesis

Copy link
Member Author

Choose a reason for hiding this comment

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

@colin-rogers-dbt 1.5.0a is not valid because of the ? in the middle. it means what come before is optional, but if it's filled, what's after is required.
((?P<prekind>a|b|rc)?(?P<num>[\d]+?))

)?
serialize =
{major}.{minor}.{patch}{prekind}{pre}.{nightly}
{major}.{minor}.{patch}{prekind}{pre}
{major}.{minor}.{patch}{prekind}{num}.{nightly}
{major}.{minor}.{patch}{prekind}{num}
{major}.{minor}.{patch}
commit = False
tag = False
Expand All @@ -23,7 +29,7 @@ values =
rc
final

[bumpversion:part:pre]
[bumpversion:part:num]
first_value = 1

[bumpversion:part:nightly]
Expand Down