Repository navigation
Pin named indexes in uv add - #7747
Merged
Merged
Conversation
charliermarsh
marked this pull request as ready for review
September 27, 2024 19:45
charliermarsh
force-pushed
the
charlie/index-api-uv-add
branch
from
September 28, 2024 19:03
b27fe75 to
3be98c9
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-pin
branch
from
September 28, 2024 19:03
9f79821 to
fc303b4
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-add
branch
from
September 28, 2024 23:17
3be98c9 to
1cfcecb
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-pin
branch
2 times, most recently
from
September 29, 2024 00:05
ead24e0 to
28a72df
Compare
zanieb
reviewed
Sep 30, 2024
zanieb
reviewed
Sep 30, 2024
Comment on lines
+5283
to
+5284
|
|
||
| [tool.uv.sources] | ||
| jinja2 = { index = "pytorch" } |
Member
There was a problem hiding this comment.
This is a little complicated in this test case because we're in the example "Adding a subsequent index with the same name should replace it."
Is it worth having a simpler test case that's not replacing an existing index at the same time?
charliermarsh
force-pushed
the
charlie/index-api-uv-add
branch
from
September 30, 2024 21:21
1cfcecb to
930ca2e
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-pin
branch
2 times, most recently
from
September 30, 2024 21:23
72a2676 to
515308e
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-add
branch
from
September 30, 2024 22:24
930ca2e to
b5043fe
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-pin
branch
from
September 30, 2024 22:24
515308e to
335105e
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-add
branch
from
October 1, 2024 00:48
b5043fe to
110fec4
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-pin
branch
from
October 1, 2024 00:48
335105e to
3086fb0
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-add
branch
from
October 1, 2024 00:52
110fec4 to
59e594e
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-pin
branch
from
October 1, 2024 00:52
3086fb0 to
c169cdc
Compare
konstin
approved these changes
Oct 1, 2024
charliermarsh
force-pushed
the
charlie/index-api-uv-add
branch
from
October 1, 2024 21:23
59e594e to
1eca84b
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-pin
branch
from
October 1, 2024 21:24
c169cdc to
93d692b
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-add
branch
from
October 2, 2024 01:09
1eca84b to
aa8d19a
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-pin
branch
from
October 2, 2024 01:09
93d692b to
21f49ae
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-add
branch
from
October 3, 2024 18:08
aa8d19a to
2908fc2
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-pin
branch
from
October 3, 2024 18:08
21f49ae to
aec724f
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-add
branch
from
October 15, 2024 22:44
2908fc2 to
29a7560
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-add
branch
from
October 15, 2024 22:50
29a7560 to
d47631a
Compare
charliermarsh
force-pushed
the
charlie/index-api-uv-pin
branch
2 times, most recently
from
October 15, 2024 23:15
3662c18 to
ea2bfbf
Compare
charliermarsh
enabled auto-merge (squash)
October 15, 2024 23:15
charliermarsh
disabled auto-merge
October 15, 2024 23:15
charliermarsh
force-pushed
the
charlie/index-api-uv-pin
branch
from
October 15, 2024 23:16
ea2bfbf to
bb7ff78
Compare
charliermarsh
enabled auto-merge (squash)
October 15, 2024 23:16
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Oct 18, 2024
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [astral-sh/uv](https://github.com/astral-sh/uv) | patch | `0.4.22` -> `0.4.24` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>astral-sh/uv (astral-sh/uv)</summary> ### [`v0.4.24`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#0424) [Compare Source](astral-sh/uv@0.4.23...0.4.24) ##### Bug fixes - Fix Python executable name in Windows free-threaded Python distributions ([#​8310](astral-sh/uv#8310)) - Redact index credentials from lockfile sources ([#​8307](astral-sh/uv#8307)) - Respect `UV_INDEX_` rather than `UV_HTTP_BASIC_` as documented ([#​8306](astral-sh/uv#8306)) - Improve sources deserialization errors ([#​8308](astral-sh/uv#8308)) ##### Documentation - Correct pytorch-to-torch reference in docs ([#​8291](astral-sh/uv#8291)) ### [`v0.4.23`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#0423) [Compare Source](astral-sh/uv@0.4.22...0.4.23) This release introduces a revamped system for defining package indexes, as an alternative to the existing pip-style `--index-url` and `--extra-index-url` configuration options. You can now define named indexes in your `pyproject.toml` file using the `[[tool.uv.index]]` table: ```toml [[tool.uv.index]] name = "pytorch" url = "https://download.pytorch.org/whl/cpu" ``` Packages can be pinned to a specific index via `tool.uv.sources`, to ensure that a given package is installed from the correct index. For example, to ensure that `torch` is *always* installed from the `pytorch` index: ```toml [tool.uv.sources] torch = { index = "pytorch" } [[tool.uv.index]] name = "pytorch" url = "https://download.pytorch.org/whl/cpu" ``` Indexes can also be marked as `explicit = true` to prevent packages from being installed from that index unless explicitly pinned. For example, to ensure that `torch` is installed from the `pytorch` index, but all other packages are installed from the default index: ```toml [tool.uv.sources] torch = { index = "pytorch" } [[tool.uv.index]] name = "pytorch" url = "https://download.pytorch.org/whl/cpu" explicit = true ``` To define an additional index outside a `pyproject.toml` file, use the `--index` command-line argument (or the `UV_INDEX` environment variable); to replace the default index (PyPI), use the `--default-index` command-line argument (or `UV_DEFAULT_INDEX`). These changes are entirely backwards-compatible with the deprecated `--index-url` and `--extra-index-url` options, which continue to work as before. See the [Index](https://docs.astral.sh/uv/configuration/indexes/) documentation for more. ##### Enhancements - Add index URLs when provided via `uv add --index` or `--default-index` ([#​7746](astral-sh/uv#7746)) - Add support for named and explicit indexes ([#​7481](astral-sh/uv#7481)) - Add templates for popular build backends ([#​7857](astral-sh/uv#7857)) - Allow multiple pinned indexes in `tool.uv.sources` ([#​7769](astral-sh/uv#7769)) - Allow users to incorporate Git tags into dynamic cache keys ([#​8259](astral-sh/uv#8259)) - Pin named indexes in `uv add` ([#​7747](astral-sh/uv#7747)) - Respect named `--index` and `--default-index` values in `tool.uv.sources` ([#​7910](astral-sh/uv#7910)) - Update to latest PubGrub version ([#​8245](astral-sh/uv#8245)) - Enable environment variable authentication for named indexes ([#​7741](astral-sh/uv#7741)) - Avoid showing lower-bound warning outside of explicit lock and sync ([#​8234](astral-sh/uv#8234)) - Improve logging during lock errors ([#​8258](astral-sh/uv#8258)) - Improve styling of `requires-python` warnings ([#​8240](astral-sh/uv#8240)) - Show hint in resolution failure on `Forbidden` (`403`) or `Unauthorized` (`401`) ([#​8264](astral-sh/uv#8264)) - Update to latest `cargo-dist` version (includes new installer features) ([#​8270](astral-sh/uv#8270)) - Warn when patch version in `requires-python` is implicitly `0` ([#​7959](astral-sh/uv#7959)) - Add more context on client errors during range requests ([#​8285](astral-sh/uv#8285)) ##### Bug fixes - Avoid writing duplicate index URLs with `--emit-index-url` ([#​8226](astral-sh/uv#8226)) - Fix error leading to out-of-bound panic in `uv-pep508` ([#​8282](astral-sh/uv#8282)) - Fix managed distributions of free-threaded Python on Windows ([#​8268](astral-sh/uv#8268)) - Fix selection of free-threaded interpreters during default Python discovery ([#​8239](astral-sh/uv#8239)) - Ignore sources in build requirements for non-source trees ([#​8235](astral-sh/uv#8235)) - Invalid cache when adding lower bound to lockfile ([#​8230](astral-sh/uv#8230)) - Respect index priority when storing credentials ([#​8256](astral-sh/uv#8256)) - Respect relative paths in `uv build` sources ([#​8237](astral-sh/uv#8237)) - Narrow what the pip3.<minor> logic drops from entry points. ([#​8273](astral-sh/uv#8273)) ##### Documentation - Add some additional notes to `--index-url` docs ([#​8267](astral-sh/uv#8267)) - Add upgrade note to README ([#​7937](astral-sh/uv#7937)) - Remove note that "only a single source may be defined for each dependency" ([#​8243](astral-sh/uv#8243)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
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
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
This PR adds an index pin with
uv addwhen the user provides exactly one named index. We don't pin if the user provides an unnamed index, or if they provide multiple indexes.We probably could pin on multiple indexes by writing the sources after resolution, if that's desirable. But we have no idea which index the user expects each package to come from.
Possible extensions:
uv add --no-pinto avoid this pinning.