Allow overriding of git describe also in scripts (via OVERRIDE_GIT_DESCRIBE environment variable) #11179
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
…ride via OVERRIDE_GIT_DESCRIBE
Now coverting both empty, version only, version+dev only or complete OVERRIDE_GIT_DESCRIBE
Tishj
reviewed
Mar 15, 2024
| @@ -128,11 +128,39 @@ def get_relative_path(source_dir, target_file): | |||
| return target_file | |||
|
|
|||
|
|
|||
| def get_git_describe(): | |||
There was a problem hiding this comment.
Some useful generated simplification that I think would be nicer to work with:
from typing import NamedTuple
class VersionInfo(NamedTuple):
major: str
minor: str
patch: str
dev_version: str
def get_git_describe():
# Assume package_build.get_git_describe() returns a string like "v1.2.3-dev1-abcdef"
long_version = package_build.get_git_describe()
# Split the version and dev_version parts
version_parts, dev_version = long_version.split('-')[:-1], long_version.split('-')[-1]
major, minor, patch = version_parts[0].lstrip('v').split('.')
return VersionInfo(major, minor, patch, dev_version)
# Example usage:
version_info = get_git_describe()
print(version_info.major) # Print major version
print(version_info.minor) # Print minor version
print(version_info.patch) # Print patch version
print(version_info.dev_version) # Print development versionNot to be used verbatim obviously, but making a NamedTuple for this sounds like a good idea
There was a problem hiding this comment.
This is cool, but I don't feel very comfortable adding infrastructure around this.
Also connected: #11187, that is currently just a copy.
|
This seems to work properly, see for example the results of this run: https://github.com/duckdb/duckdb-test-staging/actions/runs/8298231890/job/22711776901 |
|
Thanks! |
github-actions bot
pushed a commit
to duckdb/duckdb-r
that referenced
this pull request
Mar 17, 2024
Merge pull request duckdb/duckdb#11179 from carlopi/override_git_describe_in_scripts
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.
Changes the scripts used by python build OR by amalgamation to use (if available) the environment variable OVERRIDE_GIT_DESCRIBE.
Idea is:
Code is a simple but a bit intricate (try / except and all), would love a proper review (ping to @Mause, @Mytherin or @Tishj).
I noticed that a similar role is covered by SETUPTOOLS_SCM_PRETEND_VERSION / SETUPTOOLS_SCM_PRETEND_HASH. Those variables keep having precedence as they had before, but also that might need a review.