Opt-out tool.uv.sources support for uv add
#4406
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
ibraheemdev
force-pushed
the
ibraheem/uv-add-sources
branch
from
4d0713f
to
d6865e0
Compare
ibraheemdev
commented
Jun 18, 2024
ibraheemdev
force-pushed
the
ibraheem/uv-add-sources
branch
from
7ce7ef0
to
6d478ad
Compare
ibraheemdev
force-pushed
the
ibraheem/uv-add-sources
branch
from
6d478ad
to
4dd414c
Compare
konstin
approved these changes
Jun 19, 2024
| url: url.to_url(), | ||
| subdirectory: subdirectory | ||
| .map(|path| { | ||
| let path = path.to_str().ok_or(SourceError::InvalidPath)?; |
There was a problem hiding this comment.
We normally just do to_string_lossy and skip the error handling
Comment on lines
-352
to
+520
| source = "git+https://github.com/astral-test/uv-public-pypackage?rev=0.0.1#0dacfd662c64cb4ceb16e6cf65a157a8b715b979" | ||
| source = "git+https://github.com/astral-test/uv-public-pypackage?tag=0.0.1#0dacfd662c64cb4ceb16e6cf65a157a8b715b979" |
There was a problem hiding this comment.
Odd that the lockfile is different, shouldn't we disambiguate before locking (or merge all to rev)?
ChannyClaus
pushed a commit
to ChannyClaus/uv
that referenced
this pull request
Jun 20, 2024
## Summary After this change, `uv add` will try to use `tool.uv.sources` for all source requirements. If a source cannot be resolved, i.e. an ambiguous Git reference is provided, it will error. Git references can be specified with the `--tag`, `--branch`, or `--rev` arguments. Editables are also supported with `--editable`. Users can opt-out of `tool.uv.sources` support with the `--raw` flag, which will force uv to use `project.dependencies`. Part of astral-sh#3959.
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.
Summary
After this change,
uv addwill try to usetool.uv.sourcesfor all source requirements. If a source cannot be resolved, i.e. an ambiguous Git reference is provided, it will error. Git references can be specified with the--tag,--branch, or--revarguments. Editables are also supported with--editable.Users can opt-out of
tool.uv.sourcessupport with the--rawflag, which will force uv to useproject.dependencies.Part of #3959.