Merge branch 'main' into python_test_deps

.github/workflows/end-to-end.yml

@@ -22,7 +22,6 @@ concurrency:
 env:
   RUST_LOG: info
   RUST_BACKTRACE: 1
-  RUSTFLAGS: "-D warnings"
   CARGO_TERM_COLOR: always
   RATTLER_BUILD_ENABLE_GITHUB_INTEGRATION: "true"
 
@@ -39,16 +38,14 @@ jobs:
       - name: Checkout source code
         uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
-      - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "1.75.0"
+          workspaces: ". -> target-pixi"
+          key: ${{ hashFiles('pixi.lock') }}
       - uses: prefix-dev/setup-pixi@v0.8.1
-      - if: runner.os == 'macOS'
-        run: pixi global install patchelf
       # build in release mode so that it's reasonably fast to run the tests
-      - run: cargo build --release
-      - run: cargo test --release -p rust-tests -- --test-threads 1
-      - run: pixi run end_to_end_test -s -v
+      - run: pixi run build-release
+      - run: pixi run test-ci
+      - run: pixi run test-end-to-end -s -v
         env:
           PREFIX_DEV_READ_ONLY_TOKEN: ${{ secrets.PREFIX_DEV_READ_ONLY_TOKEN }}
           ANACONDA_ORG_TEST_TOKEN: ${{ secrets.ANACONDA_ORG_TEST_TOKEN }}

.gitignore

@@ -11,3 +11,4 @@ site
 
 # pixi environments
 .pixi
+target-pixi

Cargo.toml

@@ -15,7 +15,7 @@ default-run = "rattler-build"
 rust-version = "1.80.0"
 
 [features]
-default = ['native-tls', 'recipe-generation']
+default = ['rustls-tls', 'recipe-generation']
 native-tls = [
     'reqwest/native-tls',
     'rattler/native-tls',

pixi.toml

@@ -6,10 +6,13 @@ channels = ["conda-forge"]
 platforms = ["linux-64", "win-64", "osx-64", "osx-arm64"]
 
 [tasks]
-build = "cargo build --release"
+build-release = "cargo build --release"
 install = "cargo install --path . --locked"
-end_to_end_test = "pytest test/end-to-end --snapshot-warn-unused --snapshot-details"
+test-end-to-end = { cmd = "pytest test/end-to-end --snapshot-warn-unused --snapshot-details", depends-on = [
+    "build-release",
+] }
 test = "cargo test"
+test-ci = "cargo test --release -p rust-tests -- --test-threads 1"
 lint = "pre-commit run --all"
 generate-cli-docs = "cargo add clap-markdown --git https://github.com/ruben-arts/clap-markdown --branch main && cargo run --bin generate-cli-docs --features generate-cli-docs > docs/reference/cli.md && cargo rm clap-markdown"
 update-snapshots = "pytest test/end-to-end --snapshot-update"
@@ -36,6 +39,24 @@ conda-package-handling = "2.2.0.*"
 requests = ">=2.32.2,<2.33"
 syrupy = "4.6.*"
 
+[target.linux-64.dependencies]
+clang = ">=18.1.8,<19.0"
+mold = ">=2.33.0,<3.0"
+patchelf = ">=0.17.2,<0.18"
+
+[target.osx-64.dependencies]
+patchelf = ">=0.18.0,<0.19"
+
+[target.osx-arm64.dependencies]
+patchelf = ">=0.18.0,<0.19"
+
+[target.linux-64.activation]
+scripts = ["scripts/activate.sh"]
+[target.osx-arm64.activation]
+scripts = ["scripts/activate.sh"]
+[target.win-64.activation]
+scripts = ["scripts/activate.bat"]
+
 [feature.docs.dependencies]
 mkdocs = "1.5.3.*"
 mkdocs-material = ">=9.5.16,<9.7"
@@ -45,5 +66,7 @@ mike = "2.0.0.*"
 
 [environments]
 # Using same solve group to keep the environment consistent in versions used and improving cache hits
-default = {solve-group = "default"}
-docs = {features = ["docs"], no-default-feature = true, solve-group = "default"}
+default = { solve-group = "default" }
+docs = { features = [
+    "docs",
+], no-default-feature = true, solve-group = "default" }

rust-tests/src/lib.rs

@@ -231,7 +231,7 @@ mod tests {
         assert!(pkg.join("info/index.json").exists());
         let index_json: HashMap<String, serde_json::Value> =
             serde_json::from_slice(&std::fs::read(pkg.join("info/index.json")).unwrap()).unwrap();
-        assert!(index_json.get("depends").is_none());
+        assert!(!index_json.contains_key("depends"));
     }
 
     #[test]
@@ -253,7 +253,7 @@ mod tests {
         assert!(pkg.join("info/index.json").exists());
         let index_json: HashMap<String, serde_json::Value> =
             serde_json::from_slice(&std::fs::read(pkg.join("info/index.json")).unwrap()).unwrap();
-        assert!(index_json.get("depends").is_none());
+        assert!(!index_json.contains_key("depends"));
     }
 
     fn get_package(folder: impl AsRef<Path>, mut glob_str: String) -> PathBuf {

scripts/activate.bat

@@ -0,0 +1,3 @@
+@echo off
+set CARGO_TARGET_DIR=target-pixi
+set RATTLER_BUILD_PATH="%PIXI_PROJECT_ROOT%\target-pixi\release\rattler-build.exe"

scripts/activate.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -Eeuo pipefail
+export CARGO_TARGET_DIR="target-pixi"
+export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER="clang"
+export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-C link-arg=-fuse-ld=$CONDA_PREFIX/bin/mold"
+
+# on macOS we need to set these rust flags
+export CARGO_TARGET_X86_64_APPLE_DARWIN_RUSTFLAGS="-C link-arg=-Wl,-rpath,$CONDA_PREFIX/lib"
+export CARGO_TARGET_AARCH64_APPLE_DARWIN_RUSTFLAGS="-C link-arg=-Wl,-rpath,$CONDA_PREFIX/lib"
+
+export RATTLER_BUILD_PATH="$PIXI_PROJECT_ROOT/target-pixi/release/rattler-build"
+

src/console_utils.rs

@@ -648,7 +648,7 @@ pub fn init_logging(
     Ok(log_handler)
 }
 
-/// check if we are on Github CI nad if the user has enabled the integration
+/// check if we are on Github CI and if the user has enabled the integration
 pub fn github_integration_enabled() -> bool {
     std::env::var("GITHUB_ACTIONS").is_ok()
         && std::env::var("RATTLER_BUILD_ENABLE_GITHUB_INTEGRATION") == Ok("true".to_string())

src/recipe/jinja.rs

@@ -1120,10 +1120,7 @@ mod tests {
         );
 
         assert_eq!(
-            jinja
-                .eval(&format!("(var | split('.'))[2]"))
-                .unwrap()
-                .to_string(),
+            jinja.eval("(var | split('.'))[2]").unwrap().to_string(),
             "3"
         );
     }