Skip to content

Commit

Permalink
replace all git dependencies with official releases (#252)
Browse files Browse the repository at this point in the history
* fix: use cargo version of all dependencies

* fix: refer proper readme
  • Loading branch information
baszalmstra authored Aug 11, 2023
1 parent 593d5f9 commit 1f9214b
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 43 deletions.
60 changes: 36 additions & 24 deletions Cargo.lock

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

29 changes: 11 additions & 18 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["pixi contributors <[email protected]>"]
homepage = "https://github.com/prefix-dev/pixi"
repository = "https://github.com/prefix-dev/pixi"
license = "BSD-3-Clause"
readme = "docs/README.md"
readme = "README.md"

[features]
default = ["native-tls"]
Expand All @@ -22,7 +22,7 @@ clap = { version = "4.3.16", default-features = false, features = ["derive", "us
clap-verbosity-flag = "2.0.1"
clap_complete = "4.3.2"
console = { version = "0.15.7", features = ["windows-console-colors"] }
deno_task_shell = { git = "https://github.com/prefix-dev/deno_task_shell" }
deno_task_shell = "0.13.2"
# deno_task_shell = { path = "../deno_task_shell" }
dirs = "5.0.1"
dunce = "1.0.4"
Expand All @@ -35,21 +35,14 @@ itertools = "0.11.0"
miette = { version = "5.10.0", features = ["fancy", "supports-color", "supports-hyperlinks", "supports-unicode", "terminal_size", "textwrap"] }
minijinja = { version = "1.0.5", features = ["builtins"] }
once_cell = "1.18.0"
rattler = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main" }
rattler_conda_types = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main" }
rattler_digest = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main" }
rattler_networking = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main" }
rattler_repodata_gateway = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main", features = ["sparse"] }
rattler_shell = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main", features = ["sysinfo"] }
rattler_solve = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main", features = ["libsolv_rs"] }
rattler_virtual_packages = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main" }
#rattler = { default-features = false, path="../rattler/crates/rattler" }
#rattler_conda_types = { default-features = false, path="../rattler/crates/rattler_conda_types" }
#rattler_repodata_gateway = { default-features = false, path="../rattler/crates/rattler_repodata_gateway", features = ["sparse"] }
#rattler_shell = { default-features = false, path="../rattler/crates/rattler_shell", features = ["sysinfo"] }
#rattler_solve = { default-features = false, path="../rattler/crates/rattler_solve", features = ["libsolv_rs"] }
#rattler_virtual_packages = { default-features = false, path="../rattler/crates/rattler_virtual_packages" }
#rattler_networking = { default-features = false, path="../rattler/crates/rattler_networking" }
rattler = { version = "0.7.0", default-features = false }
rattler_conda_types = { version = "0.7.0", default-features = false }
rattler_digest = { version = "0.7.0", default-features = false }
rattler_networking = { version = "0.7.0", default-features = false }
rattler_repodata_gateway = { version = "0.7.0", default-features = false, features = ["sparse"] }
rattler_shell = { version = "0.7.0", default-features = false, features = ["sysinfo"] }
rattler_solve = { version = "0.7.0", default-features = false, features = ["libsolv_rs"] }
rattler_virtual_packages = { version = "0.7.0", default-features = false }
reqwest = { version = "0.11.18", default-features = false }
serde = "1.0.171"
serde_json = "1.0.103"
Expand All @@ -66,7 +59,7 @@ tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
url = "2.4.0"

[dev-dependencies]
rattler_digest = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main" }
rattler_digest = "0.7.0"
serde_json = "1.0.103"
tokio = { version = "1.29.1", features = ["rt"] }
toml = "0.7.6"
10 changes: 9 additions & 1 deletion src/cli/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::string::String;

use clap::Parser;
use deno_task_shell::parser::SequentialList;
use deno_task_shell::{execute_with_pipes, get_output_writer_and_handle, pipe, ShellState};
use deno_task_shell::{execute_with_pipes, pipe, ShellPipeWriter, ShellState};
use itertools::Itertools;
use miette::{miette, Context, IntoDiagnostic};
use rattler_conda_types::Platform;
Expand All @@ -18,6 +18,7 @@ use rattler_shell::{
activation::{ActivationVariables, Activator, PathModificationBehaviour},
shell::ShellEnum,
};
use tokio::task::JoinHandle;

/// Runs task in project.
#[derive(Default)]
Expand Down Expand Up @@ -272,3 +273,10 @@ async fn run_activation(

Ok(activator_result)
}

/// Helper function to create a pipe that we can get the output from.
fn get_output_writer_and_handle() -> (ShellPipeWriter, JoinHandle<String>) {
let (reader, writer) = pipe();
let handle = reader.pipe_to_string_handle();
(writer, handle)
}

0 comments on commit 1f9214b

Please sign in to comment.