Skip to content

Commit

Permalink
feat: update auth to use rattler cli by @kassoulait (#986)
Browse files Browse the repository at this point in the history
  • Loading branch information
ruben-arts authored Mar 15, 2024
1 parent d1fb48f commit 1b71b5f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 126 deletions.
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
platform-host = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
platform-tags = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
pypi-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
rattler = { version = "0.19.2", default-features = false }
rattler = { version = "0.19.2", default-features = false, features = ["cli-tools"] }
rattler_conda_types = { version = "0.20.1", default-features = false }
rattler_digest = { version = "0.19.1", default-features = false }
rattler_lock = { version = "0.20.1", default-features = false }
Expand Down
122 changes: 0 additions & 122 deletions src/cli/auth.rs

This file was deleted.

5 changes: 2 additions & 3 deletions src/cli/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use tracing_subscriber::prelude::__tracing_subscriber_SubscriberExt;
use tracing_subscriber::{filter::LevelFilter, util::SubscriberInitExt, EnvFilter};

pub mod add;
pub mod auth;
pub mod completion;
pub mod global;
pub mod info;
Expand Down Expand Up @@ -64,7 +63,7 @@ pub enum Command {
ShellHook(shell_hook::Args),
#[clap(alias = "g")]
Global(global::Args),
Auth(auth::Args),
Auth(rattler::cli::auth::Args),
#[clap(alias = "i")]
Install(install::Args),
Task(task::Args),
Expand Down Expand Up @@ -219,7 +218,7 @@ pub async fn execute_command(command: Command) -> miette::Result<()> {
Command::Add(cmd) => add::execute(cmd).await,
Command::Run(cmd) => run::execute(cmd).await,
Command::Global(cmd) => global::execute(cmd).await,
Command::Auth(cmd) => auth::execute(cmd).await,
Command::Auth(cmd) => rattler::cli::auth::execute(cmd).await.into_diagnostic(),
Command::Install(cmd) => install::execute(cmd).await,
Command::Shell(cmd) => shell::execute(cmd).await,
Command::ShellHook(cmd) => shell_hook::execute(cmd).await,
Expand Down

0 comments on commit 1b71b5f

Please sign in to comment.