Merge branch 'main' into feature/virtual_package_from_lockfile

.github/workflows/ci.yml

@@ -69,7 +69,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up pixi
-        uses: prefix-dev/[email protected].1
+        uses: prefix-dev/[email protected].3
         with:
           environments: lint
       - name: pre-commit
@@ -99,7 +99,24 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Machete
-        uses: bnjbvr/cargo-machete@main
+        uses: bnjbvr/[email protected]
+
+  # Checks for duplicate version of package
+  cargo-vendor:
+    name: Cargo Vendor
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: prefix-dev/[email protected]
+        with:
+          cache: ${{ github.ref == 'refs/heads/main' }}
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: ". -> target/pixi"
+          key: ${{ hashFiles('pixi.lock') }}
+          save-if: ${{ github.ref == 'refs/heads/main' }}
+      - name: Test cargo vendor
+        run: cargo vendor --locked
 
   #
   # Run tests on important platforms.
@@ -113,7 +130,7 @@ jobs:
     runs-on: 8core_ubuntu_latest_runner
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/[email protected].1
+      - uses: prefix-dev/[email protected].3
         with:
           cache: ${{ github.ref == 'refs/heads/main' }}
       - uses: Swatinem/rust-cache@v2
@@ -135,7 +152,7 @@ jobs:
     runs-on: macos-14
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/[email protected].1
+      - uses: prefix-dev/[email protected].3
         with:
           cache: ${{ github.ref == 'refs/heads/main' }}
       - uses: Swatinem/rust-cache@v2
@@ -157,7 +174,7 @@ jobs:
     runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/[email protected].1
+      - uses: prefix-dev/[email protected].3
         with:
           cache: ${{ github.ref == 'refs/heads/main' }}
       - uses: Swatinem/rust-cache@v2
@@ -181,7 +198,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Create Dev Drive using ReFS
         run: ${{ github.workspace }}/.github/workflows/setup-dev-drive.ps1
-      - uses: prefix-dev/[email protected].1
+      - uses: prefix-dev/[email protected].3
         with:
           cache: ${{ github.ref == 'refs/heads/main' }}
       - uses: Swatinem/rust-cache@v2

.github/workflows/docs.yml

@@ -41,7 +41,7 @@ jobs:
         with:
           submodules: recursive
 
-      - uses: prefix-dev/[email protected].1
+      - uses: prefix-dev/[email protected].3
         with:
           environments: docs
 
@@ -67,7 +67,7 @@ jobs:
         run: |
           git checkout tags/${{ github.event.inputs.tag }}
 
-      - uses: prefix-dev/[email protected].1
+      - uses: prefix-dev/[email protected].3
         with:
           environments: docs
 
@@ -100,7 +100,7 @@ jobs:
           fetch-depth: 0
           submodules: recursive
 
-      - uses: prefix-dev/[email protected].1
+      - uses: prefix-dev/[email protected].3
         with:
           environments: docs
 

.github/workflows/schema.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/[email protected].1
+      - uses: prefix-dev/[email protected].3
         with:
           cache: true
           environments: schema

.github/workflows/trampoline.yaml

@@ -64,7 +64,7 @@ jobs:
           target: ${{ matrix.target }}
 
       - name: Set up pixi
-        uses: prefix-dev/[email protected].1
+        uses: prefix-dev/[email protected].3
         with:
           environments: trampoline
 

.github/workflows/update-lockfiles.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up pixi
-        uses: prefix-dev/[email protected].1
+        uses: prefix-dev/[email protected].3
         with:
           run-install: false
       - name: Update lockfiles

.gitignore

@@ -9,3 +9,4 @@ __pycache__
 site/
 .cache
 pytest-temp
+/vendor

Cargo.toml

@@ -375,7 +375,7 @@ tokio = { workspace = true, features = ["rt"] }
 
 [patch.crates-io]
 # This is a temporary patch to get `cargo vendor` to work with the `uv` and pep508_rs` crates.
-version-ranges = { git = "https://github.com/astral-sh/pubgrub", rev = "57832d0588fbb7aab824813481104761dc1c7740" }
+version-ranges = { git = "https://github.com/astral-sh/pubgrub", rev = "b70cf707aa43f21b32f3a61b8a0889b15032d5c4" }
 
 # Config for 'dist'
 [workspace.metadata.dist]

crates/pixi_consts/src/consts.rs

@@ -89,6 +89,8 @@ pub static ENVIRONMENT_STYLE: LazyLock<Style> = LazyLock::new(|| Style::new().ma
 pub static EXPOSED_NAME_STYLE: LazyLock<Style> = LazyLock::new(|| Style::new().yellow());
 pub static FEATURE_STYLE: LazyLock<Style> = LazyLock::new(|| Style::new().cyan());
 pub static SOLVE_GROUP_STYLE: LazyLock<Style> = LazyLock::new(|| Style::new().cyan());
+pub static CONDA_PACKAGE_STYLE: LazyLock<Style> = LazyLock::new(|| Style::new().green());
+pub static PYPI_PACKAGE_STYLE: LazyLock<Style> = LazyLock::new(|| Style::new().blue());
 pub static DEFAULT_PYPI_INDEX_URL: LazyLock<Url> =
     LazyLock::new(|| Url::parse("https://pypi.org/simple").unwrap());
 

crates/pixi_git/Cargo.toml

@@ -13,7 +13,6 @@ version = "0.0.1"
 dashmap = { workspace = true }
 dunce = { workspace = true }
 fs-err = { workspace = true, features = ["tokio"] }
-miette = { workspace = true }
 pixi_utils = { workspace = true, features = ["rustls-tls"] }
 reqwest = { workspace = true, features = ["blocking"] }
 reqwest-middleware = { workspace = true }