Fix issue #1022: version_keyword should override infer_version when config differs #1174
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
… infer_version This test demonstrates the bug where version_keyword with specific configuration (like calver-by-date) doesn't properly override the version already set by infer_version. The test intentionally fails to show the current behavior vs the desired behavior where version_keyword should always win when it provides additional configuration. Test uses SETUPTOOLS_SCM_PRETEND_METADATA to ensure deterministic calver dates.
…en config differs When infer_version sets a version first, version_keyword should be able to override it if it brings additional configuration (like a different version_scheme). This commit implements a marker system: - infer_version sets _setuptools_scm_version_set_by_infer=True when it sets a version - version_keyword checks this marker and: - If no overrides: uses infer_version result (no warning) - If overrides present: clears version and recalculates with new config - If version set by other means: warns as before This allows proper integration behavior where version_keyword can override infer_version when the user provides specific configuration like calver schemes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes #1022
Allows version_keyword to properly override infer_version when user provides specific configuration like calver schemes, regardless of hook execution order.