feat: use new gateway to get the repodata for global install #1767
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
nichmor
commented
Aug 8, 2024
crates/pixi_config/src/lib.rs
Outdated
| @@ -446,6 +447,12 @@ impl From<ConfigCliPrompt> for Config { | |||
| } | |||
| } | |||
|
|
|||
| impl From<Config> for rattler_repodata_gateway::ChannelConfig { | |||
| fn from(val: Config) -> Self { | |||
| from_pixi_config(&val) | |||
There was a problem hiding this comment.
I like from_pixi_config but I decided to use something more rusty for this
nichmor
commented
Aug 9, 2024
crates/pixi_config/src/gateway.rs
Outdated
| @@ -19,3 +22,19 @@ pub fn from_pixi_config(config: &Config) -> ChannelConfig { | |||
| per_channel: Default::default(), | |||
| } | |||
| } | |||
|
|
|||
| /// Constructs a [`Gateway`] from a [`ClientWithMiddleware`] and a [`Config`] | |||
| pub fn new_gateway(client: ClientWithMiddleware, config: Config) -> Gateway { | |||
There was a problem hiding this comment.
we have a gateway per project, I thought it would be nice to have an API for some more global gateway
nichmor
commented
Aug 9, 2024
baszalmstra
reviewed
Aug 9, 2024
crates/pixi_config/src/lib.rs
Outdated
Comment on lines
450
to
469
| #[cfg(feature = "rattler_repodata_gateway")] | ||
| impl From<Config> for rattler_repodata_gateway::ChannelConfig { | ||
| fn from(config: Config) -> Self { | ||
| let default_source_config = config | ||
| .repodata_config | ||
| .as_ref() | ||
| .map(|config| SourceConfig { | ||
| jlap_enabled: !config.disable_jlap.unwrap_or(false), | ||
| zstd_enabled: !config.disable_zstd.unwrap_or(false), | ||
| bz2_enabled: !config.disable_bzip2.unwrap_or(false), | ||
| cache_action: Default::default(), | ||
| }) | ||
| .unwrap_or_default(); | ||
|
|
||
| rattler_repodata_gateway::ChannelConfig { | ||
| default: default_source_config, | ||
| per_channel: Default::default(), | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
This is a duplicate of the existing from_pixi_config function.
There was a problem hiding this comment.
forgot to remove it! I want to keep it's implementation in this trait, so when you need to convert you just
call config.into()
wdyt?
crates/pixi_config/src/gateway.rs
Outdated
| @@ -19,3 +22,19 @@ pub fn from_pixi_config(config: &Config) -> ChannelConfig { | |||
| per_channel: Default::default(), | |||
| } | |||
| } | |||
|
|
|||
| /// Constructs a [`Gateway`] from a [`ClientWithMiddleware`] and a [`Config`] | |||
| pub fn new_gateway(client: ClientWithMiddleware, config: Config) -> Gateway { | |||
There was a problem hiding this comment.
Maybe this could be a function of Config?
baszalmstra
reviewed
Aug 12, 2024
src/cli/exec.rs
Outdated
Comment on lines
158
to
159
| .with_client(client.clone()) | ||
| .with_channel_config(from_pixi_config(config)) | ||
| .with_channel_config(config.into()) |
There was a problem hiding this comment.
Can you use the gateway function here?
baszalmstra
approved these changes
Aug 12, 2024
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.
This PR aims to change
pixi global installto use new repodata gateway.Partially close #1720 ( pixi search and pixi global update should also use it )