Skip to content

Commit

Permalink
Remove deprecated global --isolated
Browse files Browse the repository at this point in the history
Because it causes a conflict with uv tool run --isolated when they are
combined.
  • Loading branch information
bluss committed Sep 14, 2024
1 parent 3060fd2 commit a4a1982
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
13 changes: 2 additions & 11 deletions crates/uv-cli/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,15 +204,6 @@ pub struct GlobalArgs {
#[arg(global = true, long, overrides_with("preview"), hide = true)]
pub no_preview: bool,

/// Avoid discovering a `pyproject.toml` or `uv.toml` file.
///
/// Normally, configuration files are discovered in the current directory,
/// parent directories, or user configuration directories.
///
/// This option is deprecated in favor of `--no-config`.
#[arg(global = true, long, hide = true)]
pub isolated: bool,

/// Show the resolved settings for the current command.
///
/// This option is used for debugging and development purposes.
Expand Down Expand Up @@ -2774,7 +2765,7 @@ pub struct AddArgs {
pub refresh: RefreshArgs,

/// Add the dependency to a specific package in the workspace.
#[arg(long, conflicts_with = "isolated")]
#[arg(long, conflicts_with = "no_config")]
pub package: Option<PackageName>,

/// Add the dependency to the specified Python script, rather than to a project.
Expand Down Expand Up @@ -2843,7 +2834,7 @@ pub struct RemoveArgs {
pub refresh: RefreshArgs,

/// Remove the dependencies from a specific package in the workspace.
#[arg(long, conflicts_with = "isolated")]
#[arg(long, conflicts_with = "no_config")]
pub package: Option<PackageName>,

/// Remove the dependency from the specified Python script, rather than from a project.
Expand Down
2 changes: 1 addition & 1 deletion crates/uv/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ async fn run(cli: Cli) -> Result<ExitStatus> {
}

// The `--isolated` argument is deprecated on preview APIs, and warns on non-preview APIs.
let deprecated_isolated = if cli.global_args.isolated {
let deprecated_isolated = if false {
match &*cli.command {
// Supports `--isolated` as its own argument, so we can't warn either way.
Commands::Tool(ToolNamespace {
Expand Down

0 comments on commit a4a1982

Please sign in to comment.