-
Notifications
You must be signed in to change notification settings - Fork 256
fix(cmd-version): fix handling of multiple prerelease token variants & git flow merges #1120
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
Merged
codejedi365
merged 14 commits into
python-semantic-release:master
from
codejedi365:fix/multiple-prerelease-token-mgmt
Dec 15, 2024
Merged
fix(cmd-version): fix handling of multiple prerelease token variants & git flow merges #1120
codejedi365
merged 14 commits into
python-semantic-release:master
from
codejedi365:fix/multiple-prerelease-token-mgmt
Dec 15, 2024
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
980c664
to
6534d31
Compare
6534d31
to
6610d85
Compare
In the case where there are alpha and beta releases, we must only consider the previous beta release even if alpha releases exist due to merging into beta release only branches which have no changes considerable changes from alphas but must be marked otherwise. Resolves: python-semantic-release#789
98fc20b
to
efae6c3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
Rationale
I first introduced the proper git flow repository builders and then found that PSR failed to determine the proper version at the key release points of Git Flow. I got it working by fixing the latest version determination component to only consider prerelease versions that were of equivalent prerelease token values. While I was refactoring I did improve the performance by removing the complex for loops and instead used functional programming list filtering and set's to perform
O(1)
lookups.How did you test?
Enabled the git flow repo rebuild tests which ensure that PSR will accurately version when merges are made from dev -> beta -> main