feat: add option and env variable to disable zstd and bz2 (prefix-dev…

…#364)

Cargo.toml

@@ -99,15 +99,15 @@ pre-build = [
 ]
 
 [patch.crates-io]
-# rattler = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-# rattler_conda_types = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-# rattler_digest = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-# rattler_networking = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-# rattler_repodata_gateway = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-# rattler_shell = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-# rattler_solve = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-# rattler_virtual_packages = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-# rattler_package_streaming = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_conda_types = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_digest = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_networking = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_repodata_gateway = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_shell = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_solve = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_virtual_packages = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_package_streaming = { git = "https://github.com/mamba-org/rattler", branch = "main" }
 
 # rattler = { path = "../rattler/crates/rattler" }
 # rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" }

src/main.rs

@@ -72,6 +72,14 @@ struct CommonOpts {
     /// Output directory for build artifacts. Defaults to `./output`.
     #[clap(long, env = "CONDA_BLD_PATH")]
     output_dir: Option<PathBuf>,
+
+    /// Enable support for repodata.json.zst
+    #[clap(long, env = "RATTLER_ZSTD", default_value = "true", hide = true)]
+    use_zstd: bool,
+
+    /// Enable support for repodata.json.bz2
+    #[clap(long, env = "RATTLER_BZ2", default_value = "true", hide = true)]
+    use_bz2: bool,
 }
 
 #[derive(Parser)]
@@ -286,6 +294,8 @@ async fn run_build_from_args(args: BuildOpts, multi_progress: MultiProgress) ->
         multi_progress_indicator: multi_progress,
         no_clean: args.keep_build,
         no_test: args.no_test,
+        use_zstd: args.common.use_zstd,
+        use_bz2: args.common.use_bz2,
     };
 
     let mut subpackages = BTreeMap::new();
@@ -412,6 +422,8 @@ async fn rebuild_from_args(args: RebuildOpts) -> miette::Result<()> {
         multi_progress_indicator: MultiProgress::new(),
         no_clean: true,
         no_test: args.no_test,
+        use_zstd: args.common.use_zstd,
+        use_bz2: args.common.use_bz2,
     };
 
     output

src/test.rs

@@ -341,7 +341,7 @@ pub async fn run_test(package_file: &Path, config: &TestConfiguration) -> Result
         client: AuthenticatedClient::default(),
         multi_progress_indicator: MultiProgress::new(),
         no_clean: config.keep_test_prefix,
-        no_test: false,
+        ..Default::default()
     };
 
     tracing::info!("Creating test environment in {:?}", prefix);

src/tool_configuration.rs

@@ -19,6 +19,12 @@ pub struct Configuration {
 
     /// Whether to skip the test phase
     pub no_test: bool,
+
+    /// Whether to use zstd
+    pub use_zstd: bool,
+
+    /// Whether to use bzip2
+    pub use_bz2: bool,
 }
 
 impl Default for Configuration {
@@ -37,6 +43,8 @@ impl Default for Configuration {
             ),
             no_clean: false,
             no_test: false,
+            use_zstd: true,
+            use_bz2: true,
         }
     }
 }