update regex to match all iterations #6839

emmyoop · 2023-02-01T23:39:50Z

Description

The existing regex (new since nightly releases were added) had a bug and did not recognize versions without any kind of prerelease (ie. 1.5.0).

This change passes for the following

1.5.0
1.5.0a1
1.5.0a1.dev123457+nightly

and fails for

1.5
1
1.5.2-a1

Tested with release here

Checklist

I have read the contributing guide and understand what's expected of me
I have signed the CLA
I have run this code in development and it appears to resolve the stated issue
This PR includes tests, or tests are not required/relevant for this PR
I have opened an issue to add/update docs, or docs changes are not required/relevant for this PR
I have run changie new to create a changelog entry

github-actions · 2023-02-01T23:40:13Z

Thank you for your pull request! We could not find a changelog entry for this change. For details on how to document a change, see the contributing guide.

emmyoop · 2023-02-02T02:05:57Z

Once this is merged it needs to be added to all the core release backports (#6792, #6791, #6790 ) and also backported to 1.4.latest since that one was already merged.

nathaniel-may

Only found one true issue.

It could be worth commenting each line for the next person who might have to edit this. Also adding the examples in the PR description as a comment could help as well.

Two additional notes:

depending on how this matching is applied you may want to have start and stop anchors (^, $) to prevent matching in the middle of bad strings. e.g. - 1.2.3.4.5.6 matches twice: once on 1.2.3 and again on 4.5.6
There are also two unnamed groups. Namely the two groups quantified by ? that for the string 1.5.0a1.dev123457+nightly would match a1.dev123457+nightly and a1. I don't suspect this is an issue, but I wanted to make sure you were aware it still matches as an unnamed group since every other group is named.

.bumpversion.cfg

emmyoop · 2023-02-02T17:35:09Z

@nathaniel-may

depending on how this matching is applied you may want to have start and stop anchors (^, $) to prevent matching in the middle of bad strings. e.g. - 1.2.3.4.5.6 matches twice: once on 1.2.3 and again on 4.5.6

bumpversion doesn't need this. If there is anything that falls outside the match it will fail. Tested here

There are also two unnamed groups. Namely the two groups quantified by ? that for the string 1.5.0a1.dev123457+nightly would match a1.dev123457+nightly and a1. I don't suspect this is an issue, but I wanted to make sure you were aware it still matches as an unnamed group since every other group is named.

It is not an issue. I've added a comment to clarify in the code.

colin-rogers-dbt · 2023-02-02T17:35:39Z

.bumpversion.cfg

+	\.(?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


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?

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

I missed the parenthesis

@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]+?))

nathaniel-may

Looks good!

.bumpversion.cfg

Co-authored-by: Nathaniel May <nathaniel.may@fishtownanalytics.com>

* update regex to match all iterations * convert to num to match all adapters * add comments, remove extra . * clarify with more comments * Update .bumpversion.cfg Co-authored-by: Nathaniel May <nathaniel.may@fishtownanalytics.com> --------- Co-authored-by: Nathaniel May <nathaniel.may@fishtownanalytics.com> # Conflicts: # .bumpversion.cfg

* [CI/CD] Update release workflow and introduce workflow for nightly releases (#6602) * Add release workflows * Update nightly-release.yml * Set default `test_run` value to `true` * Update .bumpversion.cfg * Resolve review comment - Update workflow docs - Change workflow name - Set `test_run` default value to `true` * Update Slack secret * PyPI * Update release workflow (#6778) - Update AWS secrets - Rework condition for Slack notification * update regex to match all iterations (#6839) * update regex to match all iterations * convert to num to match all adapters * add comments, remove extra . * clarify with more comments * Update .bumpversion.cfg Co-authored-by: Nathaniel May <nathaniel.may@fishtownanalytics.com> --------- Co-authored-by: Nathaniel May <nathaniel.may@fishtownanalytics.com> # Conflicts: # .bumpversion.cfg * put back correct version --------- Co-authored-by: Emily Rockman <emily.rockman@dbtlabs.com>

…6846) * update regex to match all iterations (#6839) * update regex to match all iterations * convert to num to match all adapters * add comments, remove extra . * clarify with more comments * Update .bumpversion.cfg Co-authored-by: Nathaniel May <nathaniel.may@fishtownanalytics.com> --------- Co-authored-by: Nathaniel May <nathaniel.may@fishtownanalytics.com> # Conflicts: # .bumpversion.cfg * put back correct version * put back correct version

update regex to match all iterations

af0b608

cla-bot bot added the cla:yes label Feb 1, 2023

emmyoop added the Skip Changelog Skips GHA to check for changelog file label Feb 2, 2023

emmyoop marked this pull request as ready for review February 2, 2023 15:41

emmyoop requested a review from a team as a code owner February 2, 2023 15:41

emmyoop requested review from nathaniel-may and McKnight-42 February 2, 2023 15:41

convert to num to match all adapters

4ac3dc5

nathaniel-may reviewed Feb 2, 2023

View reviewed changes

.bumpversion.cfg Outdated Show resolved Hide resolved

emmyoop added 2 commits February 2, 2023 11:15

add comments, remove extra .

8a7ffe6

clarify with more comments

2463bc0

emmyoop requested a review from nathaniel-may February 2, 2023 17:35

colin-rogers-dbt reviewed Feb 2, 2023

View reviewed changes

nathaniel-may approved these changes Feb 2, 2023

View reviewed changes

.bumpversion.cfg Outdated Show resolved Hide resolved

colin-rogers-dbt approved these changes Feb 2, 2023

View reviewed changes

Update .bumpversion.cfg

70f5a91

Co-authored-by: Nathaniel May <nathaniel.may@fishtownanalytics.com>

This was referenced Feb 2, 2023

update regex for version bump dbt-labs/dbt-snowflake#444

Merged

update regex for version bump dbt-labs/dbt-spark#630

Merged

update regex for version bump dbt-labs/dbt-bigquery#511

Merged

update regex for version bump dbt-labs/dbt-redshift#304

Merged

emmyoop merged commit 2245d8d into main Feb 2, 2023

emmyoop deleted the er/fix-version-bump branch February 2, 2023 18:16

emmyoop mentioned this pull request Feb 2, 2023

[BACKPORT] 1.4.latest update regex to match all iterations (#6839) #6846

Merged

iknox-fa restored the er/fix-version-bump branch February 3, 2023 16:25

colin-rogers-dbt mentioned this pull request Mar 10, 2023

backport 7115 to 1.4.latest #7152

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update regex to match all iterations #6839

update regex to match all iterations #6839

emmyoop commented Feb 1, 2023 •

edited

Loading

github-actions bot commented Feb 1, 2023

emmyoop commented Feb 2, 2023

nathaniel-may left a comment •

edited

Loading

emmyoop commented Feb 2, 2023

colin-rogers-dbt Feb 2, 2023

nathaniel-may Feb 2, 2023

colin-rogers-dbt Feb 2, 2023

emmyoop Feb 2, 2023

nathaniel-may left a comment

update regex to match all iterations #6839

update regex to match all iterations #6839

Conversation

emmyoop commented Feb 1, 2023 • edited Loading

Description

Checklist

github-actions bot commented Feb 1, 2023

emmyoop commented Feb 2, 2023

nathaniel-may left a comment • edited Loading

Choose a reason for hiding this comment

emmyoop commented Feb 2, 2023

colin-rogers-dbt Feb 2, 2023

Choose a reason for hiding this comment

nathaniel-may Feb 2, 2023

Choose a reason for hiding this comment

colin-rogers-dbt Feb 2, 2023

Choose a reason for hiding this comment

emmyoop Feb 2, 2023

Choose a reason for hiding this comment

nathaniel-may left a comment

Choose a reason for hiding this comment

emmyoop commented Feb 1, 2023 •

edited

Loading

nathaniel-may left a comment •

edited

Loading