Skip to content

Use the 'release-branch-semver' version scheme for setuptools_scm#3828

Merged
seisman merged 1 commit intomainfrom
fix/setuptools_scm
Mar 2, 2025
Merged

Use the 'release-branch-semver' version scheme for setuptools_scm#3828
seisman merged 1 commit intomainfrom
fix/setuptools_scm

Conversation

@seisman
Copy link
Member

@seisman seisman commented Feb 28, 2025 •
edited
Loading

See #3828 for the original issue report.

Upstream explainations at https://setuptools-scm.readthedocs.io/en/latest/extending/#setuptools_scmversion_scheme.

Semantic versioning for projects with release branches. The same as guess-next-dev (incrementing the pre-release or micro segment) however when on a release branch: a branch whose name (ignoring namespace) parses as a version that matches the most recent tag up to the minor segment. Otherwise if on a non-release branch, increments the minor segment and sets the micro segment to zero, then appends .devN

With the release-branch-semver version scheme, the next dev version is v0.15.0.dev0 rather than v0.14.1.dev0 after we release v0.14.0.

@seisman seisman mentioned this pull request Feb 28, 2025
Closed
@seisman seisman added maintenance Boring but important stuff for the core devs needs review This PR has higher priority and needs review. labels Feb 28, 2025
@michaelgrund michaelgrund added final review call This PR requires final review and approval from a second reviewer and removed needs review This PR has higher priority and needs review. labels Feb 28, 2025
@seisman
Copy link
Member Author

seisman commented Feb 28, 2025

@weiji14 Hopefully you have time to review this PR and issue #3826, since you may have more experience with package versioning.

@seisman seisman added this to the 0.15.0 milestone Feb 28, 2025
weiji14
weiji14 approved these changes Mar 2, 2025
View reviewed changes
Copy link
Member

@weiji14 weiji14 left a comment

Choose a reason for hiding this comment

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

Sorry for the late reply, too much work+travel during the past two weeks. Using release-branch-semver seems ok, having v0.15.0.devX as the next dev version instead of v0.14.1.devX makes sense, given that PyGMT doesn't do patch releases that often.

@seisman seisman removed the final review call This PR requires final review and approval from a second reviewer label Mar 2, 2025
@seisman seisman merged commit c33be01 into main Mar 2, 2025
10 checks passed
@seisman seisman deleted the fix/setuptools_scm branch March 2, 2025 22:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@michaelgrund michaelgrund michaelgrund approved these changes

@weiji14 weiji14 weiji14 approved these changes

Assignees

No one assigned

Labels

maintenance Boring but important stuff for the core devs

Projects

None yet

Milestone

0.15.0

Development

Successfully merging this pull request may close these issues.

3 participants

@seisman @michaelgrund @weiji14