Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update auth to use rattler cli by @kassoulait #986

Merged
merged 1 commit into from
Mar 15, 2024
Merged

feat: update auth to use rattler cli by @kassoulait #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions src/cli/mod.rs
View file
Open in desktop
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
Loading