Fix duckdb version handling again #43762
Merged
Conversation
This file contains 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
|
@glentner can you review this PR? This PR modifies the following package(s), for which you are listed as a maintainer:
|
tldahlgren
reviewed
Apr 22, 2024
- use f-string - fix version specs to address inconsistencies
Fix spec definitions further
|
@spackbot fix styles |
|
Let me see if I can fix that for you! |
|
I was able to run spack style --fix==> Running style checks on spack
selected: isort, black, flake8, mypy
==> Modified files
var/spack/repos/builtin/packages/duckdb/package.py
==> Running isort checks
isort checks were clean
==> Running black checks
reformatted var/spack/repos/builtin/packages/duckdb/package.py
All done! ✨ 🍰 ✨
1 file reformatted.
black checks were clean
==> Running flake8 checks
flake8 checks were clean
==> Running mypy checks
lib/spack/spack/version/version_types.py:145: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]" [arg-type]
lib/spack/spack/version/version_types.py:447: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]" [arg-type]
lib/spack/spack/version/version_types.py:476: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]" [arg-type]
Found 3 errors in 1 file (checked 621 source files)
mypy found errors
I've updated the branch with style fixes. |
|
@tldahlgren and @glentner I've adjusted based on the comments provided. |
tldahlgren
requested changes
Apr 29, 2024
tldahlgren
approved these changes
Apr 29, 2024
wdconinc
pushed a commit
that referenced
this pull request
May 4, 2024
* Added package to build Ollama * Update package.py Add license and documentation * [@spackbot] updating style on behalf of teaguesterling * We can now use OVERRIDE_GIT_DESCRIBE to set the version in DuckDB * Update duckdb/package.py - use f-string - fix version specs to address inconsistencies * Update package.py Fix spec definitions further * [@spackbot] updating style on behalf of teaguesterling --------- Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com>
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.
After 0.10.0, DuckDB added the
OVERRIDE_GIT_DESCRIBEvariable that we can set to force a version when we're not in a git repository. This simplifies the logic for setting up the build environment for new versions, but also breaks the old method for new versions. This PR adds the latest version and updates the logic.