Add uv toolchain list
#4163
Merged
Add uv toolchain list
#4163
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
zanieb
force-pushed
the
zb/toolchain-v-i
branch
2 times, most recently
from
b21b37c to
76eb48d
Compare
zanieb
commented
Jun 8, 2024
|
|
||
| /// List available toolchains. | ||
| #[allow(clippy::too_many_arguments)] | ||
| pub(crate) async fn list( |
There was a problem hiding this comment.
This implementation feels kind of sloppy. cc @snowsignal maybe a good one for you to critique :)
zanieb
commented
Jun 8, 2024
charliermarsh
approved these changes
Jun 9, 2024
zanieb
added a commit
that referenced
this pull request
Jun 10, 2024
Adds a command (following #4163) to download and install specific toolchains. While we fetch toolchains on demand, this is useful for, e.g., pre-downloading a toolchain in a Docker image build. ~I kind of think we should call this `install` instead of `fetch`~ I changed the name from `fetch` to `install`.
snowsignal
reviewed
Jun 10, 2024
Comment on lines
+29
to
+39
| let downloads = match includes { | ||
| ToolchainListIncludes::All => { | ||
| let request = PythonDownloadRequest::default(); | ||
| request.iter_downloads().collect() | ||
| } | ||
| ToolchainListIncludes::Installed => Vec::new(), | ||
| ToolchainListIncludes::Default => { | ||
| let request = PythonDownloadRequest::from_env()?; | ||
| request.iter_downloads().collect() | ||
| } | ||
| }; |
There was a problem hiding this comment.
This could be refactored to avoid an allocation:
let download_request = match includes {
ToolchainListIncludes::All => Some(PythonDownloadRequest::default()),
ToolchainListIncludes::Installed => None,
ToolchainListIncludes::Default => Some(PythonDownloadRequest::from_env()?)
};
let downloads = download_request
.as_ref()
.map(|request| request.iter_downloads())
.into_iter()
.flatten();
Comment on lines
+48
to
+63
| let mut output = Vec::new(); | ||
| for toolchain in installed { | ||
| output.push(( | ||
| toolchain.python_version().deref().version.clone(), | ||
| toolchain.key().to_owned(), | ||
| )); | ||
| } | ||
| for download in downloads { | ||
| output.push(( | ||
| download.python_version().deref().version.clone(), | ||
| download.key().to_owned(), | ||
| )); | ||
| } | ||
|
|
||
| output.sort(); | ||
| output.dedup(); |
There was a problem hiding this comment.
We could use BTreeSet here to skip the sorting / de-duplication steps.
let mut output = BTreeSet::new();
for toolchain in installed {
output.insert((
toolchain.python_version().version().clone(),
toolchain.key().to_owned(),
));
}
for download in downloads {
output.insert((
download.python_version().version().clone(),
download.key().to_owned(),
));
}
zanieb
added a commit
that referenced
this pull request
Jun 10, 2024
Amends #4163 with review from Jane, thank you! No behavior changes.
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.
Adds the
uv toolchainnamespace and alistcommand to get us started.Closes #4189