2025-07-08 05:45:00 +00:00
116 changed files with 1597 additions and 3644 deletions
--- a/.config/nextest.toml
+++ b/.config/nextest.toml
@ -1,4 +1,4 @@
 [profile.default]
 # Mark tests that take longer than 10s as slow.
-# Terminate after 120s as a stop-gap measure to terminate on deadlock.
-slow-timeout =  { period = "10s", terminate-after = 12 }
+# Terminate after 90s as a stop-gap measure to terminate on deadlock.
+slow-timeout =  { period = "10s", terminate-after = 9 }
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@ -54,7 +54,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build sdist"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          command: sdist
          args: --out dist
@ -74,7 +74,7 @@ jobs:

      # uv-build
      - name: "Build sdist uv-build"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          command: sdist
          args: --out crates/uv-build/dist -m crates/uv-build/Cargo.toml
@ -103,7 +103,7 @@ jobs:

      # uv
      - name: "Build wheels - x86_64"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: x86_64
          args: --release --locked --out dist --features self-update
@ -133,7 +133,7 @@ jobs:

      # uv-build
      - name: "Build wheels uv-build - x86_64"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: x86_64
          args: --profile minimal-size --locked --out crates/uv-build/dist -m crates/uv-build/Cargo.toml
@ -157,7 +157,7 @@ jobs:

      # uv
      - name: "Build wheels - aarch64"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: aarch64
          args: --release --locked --out dist --features self-update
@ -193,7 +193,7 @@ jobs:

      # uv-build
      - name: "Build wheels uv-build - aarch64"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: aarch64
          args: --profile minimal-size --locked --out crates/uv-build/dist -m crates/uv-build/Cargo.toml
@ -231,7 +231,7 @@ jobs:

      # uv
      - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.platform.target }}
          args: --release --locked --out dist --features self-update,windows-gui-bin
@ -267,7 +267,7 @@ jobs:

      # uv-build
      - name: "Build wheels uv-build"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.platform.target }}
          args: --profile minimal-size --locked --out crates/uv-build/dist -m crates/uv-build/Cargo.toml
@ -303,7 +303,7 @@ jobs:

      # uv
      - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.target }}
          # Generally, we try to build in a target docker container. In this case however, a
@ -368,7 +368,7 @@ jobs:

      # uv-build
      - name: "Build wheels uv-build"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.target }}
          manylinux: auto
@ -412,7 +412,7 @@ jobs:

      # uv
      - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.platform.target }}
          # On `aarch64`, use `manylinux: 2_28`; otherwise, use `manylinux: auto`.
@ -461,7 +461,7 @@ jobs:

      # uv-build
      - name: "Build wheels uv-build"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.platform.target }}
          # On `aarch64`, use `manylinux: 2_28`; otherwise, use `manylinux: auto`.
@ -509,7 +509,7 @@ jobs:

      # uv
      - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.platform.target }}
          manylinux: auto
@ -561,7 +561,7 @@ jobs:

      # uv-build
      - name: "Build wheels uv-build"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.platform.target }}
          manylinux: auto
@ -614,7 +614,7 @@ jobs:

      # uv
      - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.platform.target }}
          manylinux: auto
@ -671,7 +671,7 @@ jobs:

      # uv-build
      - name: "Build wheels uv-build"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.platform.target }}
          manylinux: auto
@ -712,7 +712,7 @@ jobs:

      # uv
      - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.platform.target }}
          manylinux: auto
@ -761,7 +761,7 @@ jobs:

      # uv-build
      - name: "Build wheels uv-build"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.platform.target }}
          manylinux: auto
@ -807,7 +807,7 @@ jobs:

      # uv
      - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.target }}
          manylinux: musllinux_1_1
@ -854,7 +854,7 @@ jobs:

      # uv-build
      - name: "Build wheels uv-build"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.target }}
          manylinux: musllinux_1_1
@ -901,7 +901,7 @@ jobs:

      # uv
      - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.platform.target }}
          manylinux: musllinux_1_1
@ -966,7 +966,7 @@ jobs:

      # uv-build
      - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@44479ae1b6b1a57f561e03add8832e62c185eb17 # v1.48.1
        with:
          target: ${{ matrix.platform.target }}
          manylinux: musllinux_1_1
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@ -137,7 +137,7 @@ jobs:

      - name: Build and push by digest
        id: build
-        uses: depot/build-push-action@2583627a84956d07561420dcc1d0eb1f2af3fac0 # v1.15.0
+        uses: depot/build-push-action@636daae76684e38c301daa0c5eca1c095b24e780 # v1.14.0
        with:
          project: 7hd4vdzmw5 # astral-sh/uv
          context: .
@ -267,7 +267,7 @@ jobs:

      - name: Build and push
        id: build-and-push
-        uses: depot/build-push-action@2583627a84956d07561420dcc1d0eb1f2af3fac0 # v1.15.0
+        uses: depot/build-push-action@636daae76684e38c301daa0c5eca1c095b24e780 # v1.14.0
        with:
          context: .
          project: 7hd4vdzmw5 # astral-sh/uv
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -82,7 +82,7 @@ jobs:
        run: rustup component add rustfmt

      - name: "Install uv"
-        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+        uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0

      - name: "rustfmt"
        run: cargo fmt --all --check
@ -126,7 +126,7 @@ jobs:
    name: "cargo clippy | ubuntu"
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
      - name: "Check uv_build dependencies"
@ -156,7 +156,7 @@ jobs:
        run: |
          Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.UV_WORKSPACE }}" -Recurse

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
        with:
          workspaces: ${{ env.UV_WORKSPACE }}

@ -175,7 +175,7 @@ jobs:
    name: "cargo dev generate-all"
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
      - name: "Generate all"
@ -208,12 +208,12 @@ jobs:

      - uses: rui314/setup-mold@v1

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - name: "Install Rust toolchain"
        run: rustup show

-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
      - name: "Install required Python versions"
        run: uv python install

@ -240,12 +240,12 @@ jobs:

      - uses: rui314/setup-mold@v1

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - name: "Install Rust toolchain"
        run: rustup show

-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
      - name: "Install required Python versions"
        run: uv python install

@ -279,11 +279,11 @@ jobs:
        run: |
          Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.UV_WORKSPACE }}" -Recurse

-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
      - name: "Install required Python versions"
        run: uv python install

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
        with:
          workspaces: ${{ env.UV_WORKSPACE }}

@ -332,7 +332,7 @@ jobs:
        run: |
          Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.UV_WORKSPACE }}" -Recurse

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
        with:
          workspaces: ${{ env.UV_WORKSPACE }}/crates/uv-trampoline

@ -388,7 +388,7 @@ jobs:
      - name: Copy Git Repo to Dev Drive
        run: |
          Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.UV_WORKSPACE }}" -Recurse
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
        with:
          workspaces: ${{ env.UV_WORKSPACE }}/crates/uv-trampoline
      - name: "Install Rust toolchain"
@ -430,7 +430,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          fetch-depth: 0
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
      - name: "Add SSH key"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
@ -443,7 +443,7 @@ jobs:

      - name: "Build docs (insiders)"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        run: uvx --with-requirements docs/requirements-insiders.txt mkdocs build --strict -f mkdocs.insiders.yml
+        run: uvx --with-requirements docs/requirements.txt mkdocs build --strict -f mkdocs.insiders.yml

  build-binary-linux-libc:
    timeout-minutes: 10
@ -456,7 +456,7 @@ jobs:

      - uses: rui314/setup-mold@v1

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - name: "Build"
        run: cargo build
@ -470,31 +470,6 @@ jobs:
            ./target/debug/uvx
          retention-days: 1

-  build-binary-linux-aarch64:
-    timeout-minutes: 10
-    needs: determine_changes
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
-    runs-on: github-ubuntu-24.04-aarch64-4
-    name: "build binary | linux aarch64"
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - uses: rui314/setup-mold@v1
-
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-
-      - name: "Build"
-        run: cargo build
-
-      - name: "Upload binary"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: uv-linux-aarch64-${{ github.sha }}
-          path: |
-            ./target/debug/uv
-            ./target/debug/uvx
-          retention-days: 1
-
  build-binary-linux-musl:
    timeout-minutes: 10
    needs: determine_changes
@ -511,7 +486,7 @@ jobs:
          sudo apt-get install musl-tools
          rustup target add x86_64-unknown-linux-musl

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - name: "Build"
        run: cargo build --target x86_64-unknown-linux-musl --bin uv --bin uvx
@ -536,7 +511,7 @@ jobs:

      - uses: rui314/setup-mold@v1

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Build"
        run: cargo build --bin uv --bin uvx

@ -560,7 +535,7 @@ jobs:

      - uses: rui314/setup-mold@v1

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Build"
        run: cargo build --bin uv --bin uvx

@ -590,7 +565,7 @@ jobs:
        run: |
          Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.UV_WORKSPACE }}" -Recurse

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
        with:
          workspaces: ${{ env.UV_WORKSPACE }}

@ -625,7 +600,7 @@ jobs:
        run: |
          Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.UV_WORKSPACE }}" -Recurse

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
        with:
          workspaces: ${{ env.UV_WORKSPACE }}

@ -662,7 +637,7 @@ jobs:
        run: rustup default ${{ steps.msrv.outputs.value }}
      - name: "Install mold"
        uses: rui314/setup-mold@v1
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - run: cargo +${{ steps.msrv.outputs.value }} build
      - run: ./target/debug/uv --version

@ -675,7 +650,7 @@ jobs:

    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Cross build"
        run: |
          # Install cross from `freebsd-firecracker`
@ -686,7 +661,7 @@ jobs:
          cross build --target x86_64-unknown-freebsd

      - name: Test in Firecracker VM
-        uses: acj/freebsd-firecracker-action@136ca0bce2adade21e526ceb07db643ad23dd2dd # v0.5.1
+        uses: acj/freebsd-firecracker-action@6c57bda7113c2f137ef00d54512d61ae9d64365b # v0.5.0
        with:
          verbose: false
          checkout: false
@ -795,33 +770,6 @@ jobs:
          eval "$(./uv generate-shell-completion bash)"
          eval "$(./uvx --generate-shell-completion bash)"

-  smoke-test-linux-aarch64:
-    timeout-minutes: 10
-    needs: build-binary-linux-aarch64
-    name: "smoke test | linux aarch64"
-    runs-on: github-ubuntu-24.04-aarch64-2
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: "Download binary"
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        with:
-          name: uv-linux-aarch64-${{ github.sha }}
-
-      - name: "Prepare binary"
-        run: |
-          chmod +x ./uv
-          chmod +x ./uvx
-
-      - name: "Smoke test"
-        run: |
-          ./uv run scripts/smoke-test
-
-      - name: "Test shell completions"
-        run: |
-          eval "$(./uv generate-shell-completion bash)"
-          eval "$(./uvx --generate-shell-completion bash)"
-
  smoke-test-linux-musl:
    timeout-minutes: 10
    needs: build-binary-linux-musl
@ -904,7 +852,7 @@ jobs:
    timeout-minutes: 10
    needs: build-binary-windows-aarch64
    name: "smoke test | windows aarch64"
-    runs-on: windows-11-arm
+    runs-on: github-windows-11-aarch64-4
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

@ -1052,96 +1000,6 @@ jobs:
          ./uv run python -c ""
          ./uv run -p 3.13t python -c ""

-  integration-test-windows-aarch64-implicit:
-    timeout-minutes: 10
-    needs: build-binary-windows-aarch64
-    name: "integration test | aarch64 windows implicit"
-    runs-on: windows-11-arm
-
-    steps:
-      - name: "Download binary"
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        with:
-          name: uv-windows-aarch64-${{ github.sha }}
-
-      - name: "Install Python via uv (implicitly select x64)"
-        run: |
-          ./uv python install -v 3.13
-
-      - name: "Create a virtual environment (stdlib)"
-        run: |
-          & (./uv python find 3.13) -m venv .venv
-
-      - name: "Check version (stdlib)"
-        run: |
-          .venv/Scripts/python --version
-
-      - name: "Create a virtual environment (uv)"
-        run: |
-          ./uv venv -p 3.13 --managed-python
-
-      - name: "Check version (uv)"
-        run: |
-          .venv/Scripts/python --version
-
-      - name: "Check is x64"
-        run: |
-          .venv/Scripts/python -c "import sys; exit(1) if 'AMD64' not in sys.version else exit(0)"
-
-      - name: "Check install"
-        run: |
-          ./uv pip install -v anyio
-
-      - name: "Check uv run"
-        run: |
-          ./uv run python -c ""
-          ./uv run -p 3.13 python -c ""
-
-  integration-test-windows-aarch64-explicit:
-    timeout-minutes: 10
-    needs: build-binary-windows-aarch64
-    name: "integration test | aarch64 windows explicit"
-    runs-on: windows-11-arm
-
-    steps:
-      - name: "Download binary"
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        with:
-          name: uv-windows-aarch64-${{ github.sha }}
-
-      - name: "Install Python via uv (explicitly select aarch64)"
-        run: |
-          ./uv python install -v cpython-3.13-windows-aarch64-none
-
-      - name: "Create a virtual environment (stdlib)"
-        run: |
-          & (./uv python find 3.13) -m venv .venv
-
-      - name: "Check version (stdlib)"
-        run: |
-          .venv/Scripts/python --version
-
-      - name: "Create a virtual environment (uv)"
-        run: |
-          ./uv venv -p 3.13 --managed-python
-
-      - name: "Check version (uv)"
-        run: |
-          .venv/Scripts/python --version
-
-      - name: "Check is NOT x64"
-        run: |
-          .venv/Scripts/python -c "import sys; exit(1) if 'AMD64' in sys.version else exit(0)"
-
-      - name: "Check install"
-        run: |
-          ./uv pip install -v anyio
-
-      - name: "Check uv run"
-        run: |
-          ./uv run python -c ""
-          ./uv run -p 3.13 python -c ""
-
  integration-test-pypy-linux:
    timeout-minutes: 10
    needs: build-binary-linux-libc
@ -1585,7 +1443,7 @@ jobs:
        run: chmod +x ./uv

      - name: "Configure AWS credentials"
-        uses: aws-actions/configure-aws-credentials@f503a1870408dcf2c35d5c2b8a68e69211042c7d
+        uses: aws-actions/configure-aws-credentials@3bb878b6ab43ba8717918141cd07a0ea68cfe7ea
        with:
          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@ -1622,9 +1480,9 @@ jobs:
        run: ./uv run -p ${{ env.PYTHON_VERSION }} scripts/registries-test.py --uv ./uv --color always --all
        env:
          RUST_LOG: uv=debug
-          UV_TEST_ARTIFACTORY_TOKEN: ${{ secrets.UV_TEST_ARTIFACTORY_TOKEN }}
-          UV_TEST_ARTIFACTORY_URL: ${{ secrets.UV_TEST_ARTIFACTORY_URL }}
-          UV_TEST_ARTIFACTORY_USERNAME: ${{ secrets.UV_TEST_ARTIFACTORY_USERNAME }}
+          # UV_TEST_ARTIFACTORY_TOKEN: ${{ secrets.UV_TEST_ARTIFACTORY_TOKEN }}
+          # UV_TEST_ARTIFACTORY_URL: ${{ secrets.UV_TEST_ARTIFACTORY_URL }}
+          # UV_TEST_ARTIFACTORY_USERNAME: ${{ secrets.UV_TEST_ARTIFACTORY_USERNAME }}
          UV_TEST_AWS_URL: ${{ secrets.UV_TEST_AWS_URL }}
          UV_TEST_AWS_USERNAME: aws
          UV_TEST_AZURE_TOKEN: ${{ secrets.UV_TEST_AZURE_TOKEN }}
@ -2214,7 +2072,7 @@ jobs:
    timeout-minutes: 10
    needs: build-binary-windows-aarch64
    name: "check system | x86-64 python3.13 on windows aarch64"
-    runs-on: windows-11-arm
+    runs-on: github-windows-11-aarch64-4
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

@ -2232,28 +2090,6 @@ jobs:
      - name: "Validate global Python install"
        run: py -3.13 ./scripts/check_system_python.py --uv ./uv.exe

-  system-test-windows-aarch64-aarch64-python-313:
-    timeout-minutes: 10
-    needs: build-binary-windows-aarch64
-    name: "check system | aarch64 python3.13 on windows aarch64"
-    runs-on: windows-11-arm
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
-        with:
-          python-version: "3.13"
-          architecture: "arm64"
-          allow-prereleases: true
-
-      - name: "Download binary"
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        with:
-          name: uv-windows-aarch64-${{ github.sha }}
-
-      - name: "Validate global Python install"
-        run: py -3.13 ./scripts/check_system_python.py --uv ./uv.exe
-
  # Test our PEP 514 integration that installs Python into the Windows registry.
  system-test-windows-registry:
    timeout-minutes: 10
@ -2501,7 +2337,7 @@ jobs:
      - name: "Checkout Branch"
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - name: "Install Rust toolchain"
        run: rustup show
@ -2538,7 +2374,7 @@ jobs:
      - name: "Checkout Branch"
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - name: "Install Rust toolchain"
        run: rustup show
--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@ -22,7 +22,7 @@ jobs:
      id-token: write
    steps:
      - name: "Install uv"
-        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+        uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          pattern: wheels_uv-*
@ -43,7 +43,7 @@ jobs:
      id-token: write
    steps:
      - name: "Install uv"
-        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+        uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          pattern: wheels_uv_build-*
--- a/.github/workflows/sync-python-releases.yml
+++ b/.github/workflows/sync-python-releases.yml
@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
        with:
          version: "latest"
          enable-cache: true
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -12,7 +12,7 @@ repos:
      - id: validate-pyproject

  - repo: https://github.com/crate-ci/typos
-    rev: v1.34.0
+    rev: v1.33.1
    hooks:
      - id: typos

@ -42,7 +42,7 @@ repos:
        types_or: [yaml, json5]

  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.2
+    rev: v0.11.13
    hooks:
      - id: ruff-format
      - id: ruff
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,79 +2,6 @@

 <!-- prettier-ignore-start -->

-
-## 0.7.19
-
-The **[uv build backend](https://docs.astral.sh/uv/concepts/build-backend/) is now stable**, and considered ready for production use.
-
-The uv build backend is a great choice for pure Python projects. It has reasonable defaults, with the goal of requiring zero configuration for most users, but provides flexible configuration to accommodate most Python project structures. It integrates tightly with uv, to improve messaging and user experience. It validates project metadata and structures, preventing common mistakes. And, finally, it's very fast — `uv sync` on a new project (from `uv init`) is 10-30x faster than with other build backends.
-
-To use uv as a build backend in an existing project, add `uv_build` to the `[build-system]` section in your `pyproject.toml`:
-
-```toml
-[build-system]
-requires = ["uv_build>=0.7.19,<0.8.0"]
-build-backend = "uv_build"
-```
-
-In a future release, it will replace `hatchling` as the default in `uv init`. As before, uv will remain compatible with all standards-compliant build backends.
-
-### Python
-
- Add PGO distributions of Python for aarch64 Linux, which are more optimized for better performance
-
-See the [python-build-standalone release](https://github.com/astral-sh/python-build-standalone/releases/tag/20250702) for more details.
-
-### Enhancements
-
- Ignore Python patch version for `--universal` pip compile ([#14405](https://github.com/astral-sh/uv/pull/14405))
- Update the tilde version specifier warning to include more context ([#14335](https://github.com/astral-sh/uv/pull/14335))
- Clarify behavior and hint on tool install when no executables are available ([#14423](https://github.com/astral-sh/uv/pull/14423))
-
-### Bug fixes
-
- Make project and interpreter lock acquisition non-fatal ([#14404](https://github.com/astral-sh/uv/pull/14404))
- Includes `sys.prefix` in cached environment keys to avoid `--with` collisions across projects ([#14403](https://github.com/astral-sh/uv/pull/14403))
-
-### Documentation
-
- Add a migration guide from pip to uv projects ([#12382](https://github.com/astral-sh/uv/pull/12382))
-
-## 0.7.18
-
-### Python
-
- Added arm64 Windows Python 3.11, 3.12, 3.13, and 3.14
-
-  These are not downloaded by default, since x86-64 Python has broader ecosystem support on Windows.
-  However, they can be requested with `cpython-<version>-windows-aarch64`.
-
-See the [python-build-standalone release](https://github.com/astral-sh/python-build-standalone/releases/tag/20250630) for more details.
-
-### Enhancements
-
- Keep track of retries in `ManagedPythonDownload::fetch_with_retry` ([#14378](https://github.com/astral-sh/uv/pull/14378))
- Reuse build (virtual) environments across resolution and installation ([#14338](https://github.com/astral-sh/uv/pull/14338))
- Improve trace message for cached Python interpreter query ([#14328](https://github.com/astral-sh/uv/pull/14328))
- Use parsed URLs for conflicting URL error message ([#14380](https://github.com/astral-sh/uv/pull/14380))
-
-### Preview features
-
- Ignore invalid build backend settings when not building ([#14372](https://github.com/astral-sh/uv/pull/14372))
-
-### Bug fixes
-
- Fix equals-star and tilde-equals with `python_version` and `python_full_version` ([#14271](https://github.com/astral-sh/uv/pull/14271))
- Include the canonical path in the interpreter query cache key ([#14331](https://github.com/astral-sh/uv/pull/14331))
- Only drop build directories on program exit ([#14304](https://github.com/astral-sh/uv/pull/14304))
- Error instead of panic on conflict between global and subcommand flags ([#14368](https://github.com/astral-sh/uv/pull/14368))
- Consistently normalize trailing slashes on URLs with no path segments ([#14349](https://github.com/astral-sh/uv/pull/14349))
-
-### Documentation
-
- Add instructions for publishing to JFrog's Artifactory ([#14253](https://github.com/astral-sh/uv/pull/14253))
- Edits to the build backend documentation ([#14376](https://github.com/astral-sh/uv/pull/14376))
-
 ## 0.7.17

 ### Bug fixes
--- a/Cargo.lock
+++ b/Cargo.lock
@ -94,15 +94,6 @@ version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"

-[[package]]
-name = "approx"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "arbitrary"
 version = "1.4.1"
@ -189,9 +180,9 @@ dependencies = [

 [[package]]
 name = "async-channel"
-version = "2.5.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
 dependencies = [
 "concurrent-queue",
 "event-listener-strategy",
@ -373,15 +364,6 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"

-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bisection"
 version = "0.1.0"
@ -530,9 +512,9 @@ dependencies = [

 [[package]]
 name = "cargo-util"
-version = "0.2.21"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c95ec8b2485b20aed818bd7460f8eecc6c87c35c84191b353a3aba9aa1736c36"
+checksum = "d767bc85f367f6483a6072430b56f5c0d6ee7636751a21a800526d0711753d76"
 dependencies = [
 "anyhow",
 "core-foundation",
@ -690,27 +672,22 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"

 [[package]]
 name = "codspeed"
-version = "3.0.2"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "922018102595f6668cdd09c03f4bff2d951ce2318c6dca4fe11bdcb24b65b2bf"
+checksum = "93f4cce9c27c49c4f101fffeebb1826f41a9df2e7498b7cd4d95c0658b796c6c"
 dependencies = [
- "anyhow",
- "bincode",
 "colored",
- "glob",
 "libc",
- "nix 0.29.0",
 "serde",
 "serde_json",
- "statrs",
 "uuid",
 ]

 [[package]]
 name = "codspeed-criterion-compat"
-version = "3.0.2"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d8ad82d2383cb74995f58993cbdd2914aed57b2f91f46580310dd81dc3d05a"
+checksum = "c3c23d880a28a2aab52d38ca8481dd7a3187157d0a952196b6db1db3c8499725"
 dependencies = [
 "codspeed",
 "codspeed-criterion-compat-walltime",
@ -719,9 +696,9 @@ dependencies = [

 [[package]]
 name = "codspeed-criterion-compat-walltime"
-version = "3.0.2"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61badaa6c452d192a29f8387147888f0ab358553597c3fe9bf8a162ef7c2fa64"
+checksum = "7b0a2f7365e347f4f22a67e9ea689bf7bc89900a354e22e26cf8a531a42c8fbb"
 dependencies = [
 "anes",
 "cast",
@ -1165,9 +1142,9 @@ dependencies = [

 [[package]]
 name = "event-listener-strategy"
-version = "0.5.4"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
 dependencies = [
 "event-listener",
 "pin-project-lite",
@ -1698,7 +1675,7 @@ dependencies = [
 "tokio",
 "tokio-rustls",
 "tower-service",
- "webpki-roots 0.26.8",
+ "webpki-roots",
 ]

 [[package]]
@ -1707,7 +1684,6 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb"
 dependencies = [
- "base64 0.22.1",
 "bytes",
 "futures-channel",
 "futures-core",
@ -1715,9 +1691,7 @@ dependencies = [
 "http",
 "http-body",
 "hyper",
- "ipnet",
 "libc",
- "percent-encoding",
 "pin-project-lite",
 "socket2",
 "tokio",
@ -1899,9 +1873,9 @@ checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf"

 [[package]]
 name = "indexmap"
-version = "2.10.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
 "equivalent",
 "hashbrown 0.15.4",
@ -1948,16 +1922,6 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"

-[[package]]
-name = "iri-string"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
-dependencies = [
- "memchr",
- "serde",
-]
-
 [[package]]
 name = "is-terminal"
 version = "0.4.15"
@ -2510,9 +2474,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"

 [[package]]
 name = "owo-colors"
-version = "4.2.2"
+version = "4.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48dd4f4a2c8405440fd0462561f0e5806bd0f77e86f51c761481bdd4018b545e"
+checksum = "26995317201fa17f3656c36716aed4a7c81743a9634ac4c99c0eeda495db0cec"

 [[package]]
 name = "parking"
@ -3075,9 +3039,9 @@ dependencies = [

 [[package]]
 name = "reqwest"
-version = "0.12.22"
+version = "0.12.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531"
+checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
 dependencies = [
 "async-compression",
 "base64 0.22.1",
@ -3092,14 +3056,18 @@ dependencies = [
 "hyper",
 "hyper-rustls",
 "hyper-util",
+ "ipnet",
 "js-sys",
 "log",
+ "mime",
 "mime_guess",
+ "once_cell",
 "percent-encoding",
 "pin-project-lite",
 "quinn",
 "rustls",
 "rustls-native-certs",
+ "rustls-pemfile",
 "rustls-pki-types",
 "serde",
 "serde_json",
@ -3107,16 +3075,17 @@ dependencies = [
 "sync_wrapper",
 "tokio",
 "tokio-rustls",
+ "tokio-socks",
 "tokio-util",
 "tower",
- "tower-http",
 "tower-service",
 "url",
 "wasm-bindgen",
 "wasm-bindgen-futures",
 "wasm-streams",
 "web-sys",
- "webpki-roots 1.0.1",
+ "webpki-roots",
+ "windows-registry 0.4.0",
 ]

 [[package]]
@ -3359,6 +3328,15 @@ dependencies = [
 "security-framework",
 ]

+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "rustls-pki-types"
 version = "1.11.0"
@ -3427,9 +3405,9 @@ dependencies = [

 [[package]]
 name = "schemars"
-version = "1.0.4"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
+checksum = "febc07c7e70b5db4f023485653c754d76e1bbe8d9dbfa20193ce13da9f9633f4"
 dependencies = [
 "dyn-clone",
 "ref-cast",
@ -3441,9 +3419,9 @@ dependencies = [

 [[package]]
 name = "schemars_derive"
-version = "1.0.4"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d020396d1d138dc19f1165df7545479dcd58d93810dc5d646a16e55abefa80"
+checksum = "c1eeedaab7b1e1d09b5b4661121f4d27f9e7487089b0117833ccd7a882ee1ecc"
 dependencies = [
 "proc-macro2",
 "quote",
@ -3742,16 +3720,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"

-[[package]]
-name = "statrs"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a3fe7c28c6512e766b0874335db33c94ad7b8f9054228ae1c2abd47ce7d335e"
-dependencies = [
- "approx",
- "num-traits",
-]
-
 [[package]]
 name = "strict-num"
 version = "0.1.1"
@ -3967,9 +3935,9 @@ dependencies = [

 [[package]]
 name = "test-log"
-version = "0.2.18"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e33b98a582ea0be1168eba097538ee8dd4bbe0f2b01b22ac92ea30054e5be7b"
+checksum = "e7f46083d221181166e5b6f6b1e5f1d499f3a76888826e6cb1d057554157cd0f"
 dependencies = [
 "test-log-macros",
 "tracing-subscriber",
@ -3977,9 +3945,9 @@ dependencies = [

 [[package]]
 name = "test-log-macros"
-version = "0.2.18"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "451b374529930d7601b1eef8d32bc79ae870b6079b069401709c2a8bf9e75f36"
+checksum = "888d0c3c6db53c0fdab160d2ed5e12ba745383d3e85813f2ea0f2b1475ab553f"
 dependencies = [
 "proc-macro2",
 "quote",
@ -4171,6 +4139,18 @@ dependencies = [
 "tokio",
 ]

+[[package]]
+name = "tokio-socks"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
+dependencies = [
+ "either",
+ "futures-util",
+ "thiserror 1.0.69",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-stream"
 version = "0.1.17"
@ -4253,24 +4233,6 @@ dependencies = [
 "tower-service",
 ]

-[[package]]
-name = "tower-http"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
-dependencies = [
- "bitflags 2.9.1",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "iri-string",
- "pin-project-lite",
- "tower",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@ -4608,7 +4570,7 @@ dependencies = [

 [[package]]
 name = "uv"
-version = "0.7.19"
+version = "0.7.17"
 dependencies = [
 "anstream",
 "anyhow",
@ -4772,7 +4734,7 @@ dependencies = [

 [[package]]
 name = "uv-build"
-version = "0.7.19"
+version = "0.7.17"
 dependencies = [
 "anyhow",
 "uv-build-backend",
@ -5640,7 +5602,7 @@ dependencies = [
 "uv-trampoline-builder",
 "uv-warnings",
 "which",
- "windows-registry",
+ "windows-registry 0.5.2",
 "windows-result 0.3.4",
 "windows-sys 0.59.0",
 ]
@ -5844,7 +5806,7 @@ dependencies = [
 "tracing",
 "uv-fs",
 "uv-static",
- "windows-registry",
+ "windows-registry 0.5.2",
 "windows-result 0.3.4",
 "windows-sys 0.59.0",
 ]
@ -5942,7 +5904,6 @@ name = "uv-types"
 version = "0.0.1"
 dependencies = [
 "anyhow",
- "dashmap",
 "rustc-hash",
 "thiserror 2.0.12",
 "uv-cache",
@ -5962,7 +5923,7 @@ dependencies = [

 [[package]]
 name = "uv-version"
-version = "0.7.19"
+version = "0.7.17"

 [[package]]
 name = "uv-virtualenv"
@ -6226,15 +6187,6 @@ dependencies = [
 "rustls-pki-types",
 ]

-[[package]]
-name = "webpki-roots"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8782dd5a41a24eed3a4f40b606249b3e236ca61adf1f25ea4d45c73de122b502"
-dependencies = [
- "rustls-pki-types",
-]
-
 [[package]]
 name = "weezl"
 version = "0.1.8"
@ -6378,7 +6330,7 @@ dependencies = [
 "windows-interface 0.59.1",
 "windows-link",
 "windows-result 0.3.4",
- "windows-strings 0.4.2",
+ "windows-strings 0.4.1",
 ]

 [[package]]
@ -6448,9 +6400,9 @@ dependencies = [

 [[package]]
 name = "windows-link"
-version = "0.1.3"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"

 [[package]]
 name = "windows-numerics"
@ -6464,13 +6416,24 @@ dependencies = [

 [[package]]
 name = "windows-registry"
-version = "0.5.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
+checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
+dependencies = [
+ "windows-result 0.3.4",
+ "windows-strings 0.3.1",
+ "windows-targets 0.53.0",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3bab093bdd303a1240bb99b8aba8ea8a69ee19d34c9e2ef9594e708a4878820"
 dependencies = [
 "windows-link",
 "windows-result 0.3.4",
- "windows-strings 0.4.2",
+ "windows-strings 0.4.1",
 ]

 [[package]]
@ -6502,9 +6465,9 @@ dependencies = [

 [[package]]
 name = "windows-strings"
-version = "0.4.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+checksum = "2a7ab927b2637c19b3dbe0965e75d8f2d30bdd697a1516191cad2ec4df8fb28a"
 dependencies = [
 "windows-link",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@ -142,7 +142,7 @@ ref-cast = { version = "1.0.24" }
 reflink-copy = { version = "0.1.19" }
 regex = { version = "1.10.6" }
 regex-automata = { version = "0.4.8", default-features = false, features = ["dfa-build", "dfa-search", "perf", "std", "syntax"] }
-reqwest = { version = "0.12.22", default-features = false, features = ["json", "gzip", "deflate", "zstd", "stream", "rustls-tls", "rustls-tls-native-roots", "socks", "multipart", "http2", "blocking"] }
+reqwest = { version = "=0.12.15", default-features = false, features = ["json", "gzip", "deflate", "zstd", "stream", "rustls-tls", "rustls-tls-native-roots", "socks", "multipart", "http2", "blocking"] }
 reqwest-middleware = { git = "https://github.com/astral-sh/reqwest-middleware", rev = "ad8b9d332d1773fde8b4cd008486de5973e0a3f8", features = ["multipart"] }
 reqwest-retry = { git = "https://github.com/astral-sh/reqwest-middleware", rev = "ad8b9d332d1773fde8b4cd008486de5973e0a3f8" }
 rkyv = { version = "0.8.8", features = ["bytecheck"] }
--- a/crates/uv-bench/Cargo.toml
+++ b/crates/uv-bench/Cargo.toml
@ -42,10 +42,8 @@ uv-types = { workspace = true }
 uv-workspace = { workspace = true }

 anyhow = { workspace = true }
-codspeed-criterion-compat = { version = "3.0.2", default-features = false, optional = true }
-criterion = { version = "0.6.0", default-features = false, features = [
-  "async_tokio",
-] }
+codspeed-criterion-compat = { version = "2.7.2", default-features = false, optional = true }
+criterion = { version = "0.6.0", default-features = false, features = ["async_tokio"] }
 jiff = { workspace = true }
 tokio = { workspace = true }

--- a/crates/uv-build-backend/src/settings.rs
+++ b/crates/uv-build-backend/src/settings.rs
@ -4,6 +4,10 @@ use uv_macros::OptionsMetadata;

 /// Settings for the uv build backend (`uv_build`).
 ///
+/// !!! note
+///
+///     The uv build backend is currently in preview and may change in any future release.
+///
 /// Note that those settings only apply when using the `uv_build` backend, other build backends
 /// (such as hatchling) have their own configuration.
 ///
--- a/crates/uv-build-frontend/src/lib.rs
+++ b/crates/uv-build-frontend/src/lib.rs
@ -25,7 +25,7 @@ use tempfile::TempDir;
 use tokio::io::AsyncBufReadExt;
 use tokio::process::Command;
 use tokio::sync::{Mutex, Semaphore};
-use tracing::{Instrument, debug, info_span, instrument, warn};
+use tracing::{Instrument, debug, info_span, instrument};

 use uv_cache_key::cache_digest;
 use uv_configuration::PreviewMode;
@ -259,6 +259,8 @@ pub struct SourceBuild {
    environment_variables: FxHashMap<OsString, OsString>,
    /// Runner for Python scripts.
    runner: PythonRunner,
+    /// A file lock representing the source tree, currently only used with setuptools.
+    _source_tree_lock: Option<LockedFile>,
 }

 impl SourceBuild {
@ -392,6 +394,23 @@ impl SourceBuild {
            OsString::from(venv.scripts())
        };

+        // Depending on the command, setuptools puts `*.egg-info`, `build/`, and `dist/` in the
+        // source tree, and concurrent invocations of setuptools using the same source dir can
+        // stomp on each other. We need to lock something to fix that, but we don't want to dump a
+        // `.lock` file into the source tree that the user will need to .gitignore. Take a global
+        // proxy lock instead.
+        let mut source_tree_lock = None;
+        if pep517_backend.is_setuptools() {
+            debug!("Locking the source tree for setuptools");
+            let canonical_source_path = source_tree.canonicalize()?;
+            let lock_path = std::env::temp_dir().join(format!(
+                "uv-setuptools-{}.lock",
+                cache_digest(&canonical_source_path)
+            ));
+            source_tree_lock =
+                Some(LockedFile::acquire(lock_path, source_tree.to_string_lossy()).await?);
+        }
+
        // Create the PEP 517 build environment. If build isolation is disabled, we assume the build
        // environment is already setup.
        let runner = PythonRunner::new(concurrent_builds, level);
@ -438,34 +457,10 @@ impl SourceBuild {
            environment_variables,
            modified_path,
            runner,
+            _source_tree_lock: source_tree_lock,
        })
    }

-    /// Acquire a lock on the source tree, if necessary.
-    async fn acquire_lock(&self) -> Result<Option<LockedFile>, Error> {
-        // Depending on the command, setuptools puts `*.egg-info`, `build/`, and `dist/` in the
-        // source tree, and concurrent invocations of setuptools using the same source dir can
-        // stomp on each other. We need to lock something to fix that, but we don't want to dump a
-        // `.lock` file into the source tree that the user will need to .gitignore. Take a global
-        // proxy lock instead.
-        let mut source_tree_lock = None;
-        if self.pep517_backend.is_setuptools() {
-            debug!("Locking the source tree for setuptools");
-            let canonical_source_path = self.source_tree.canonicalize()?;
-            let lock_path = env::temp_dir().join(format!(
-                "uv-setuptools-{}.lock",
-                cache_digest(&canonical_source_path)
-            ));
-            source_tree_lock = LockedFile::acquire(lock_path, self.source_tree.to_string_lossy())
-                .await
-                .inspect_err(|err| {
-                    warn!("Failed to acquire build lock: {err}");
-                })
-                .ok();
-        }
-        Ok(source_tree_lock)
-    }
-
    async fn get_resolved_requirements(
        build_context: &impl BuildContext,
        source_build_context: SourceBuildContext,
@ -636,9 +631,6 @@ impl SourceBuild {
            return Ok(Some(metadata_dir.clone()));
        }

-        // Lock the source tree, if necessary.
-        let _lock = self.acquire_lock().await?;
-
        // Hatch allows for highly dynamic customization of metadata via hooks. In such cases, Hatch
        // can't uphold the PEP 517 contract, in that the metadata Hatch would return by
        // `prepare_metadata_for_build_wheel` isn't guaranteed to match that of the built wheel.
@ -757,9 +749,6 @@ impl SourceBuild {

    /// Perform a PEP 517 build for a wheel or source distribution (sdist).
    async fn pep517_build(&self, output_dir: &Path) -> Result<String, Error> {
-        // Lock the source tree, if necessary.
-        let _lock = self.acquire_lock().await?;
-
        // Write the hook output to a file so that we can read it back reliably.
        let outfile = self
            .temp_dir
--- a/crates/uv-build/Cargo.toml
+++ b/crates/uv-build/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "uv-build"
-version = "0.7.19"
+version = "0.7.17"
 edition.workspace = true
 rust-version.workspace = true
 homepage.workspace = true
--- a/crates/uv-build/pyproject.toml
+++ b/crates/uv-build/pyproject.toml
@ -1,6 +1,6 @@
 [project]
 name = "uv-build"
-version = "0.7.19"
+version = "0.7.17"
 description = "The uv build backend"
 authors = [{ name = "Astral Software Inc.", email = "hey@astral.sh" }]
 requires-python = ">=3.8"
--- a/crates/uv-cli/src/options.rs
+++ b/crates/uv-cli/src/options.rs
@ -1,10 +1,7 @@
-use anstream::eprintln;
-
 use uv_cache::Refresh;
 use uv_configuration::ConfigSettings;
 use uv_resolver::PrereleaseMode;
 use uv_settings::{Combine, PipOptions, ResolverInstallerOptions, ResolverOptions};
-use uv_warnings::owo_colors::OwoColorize;

 use crate::{
    BuildOptionsArgs, FetchArgs, IndexArgs, InstallerArgs, Maybe, RefreshArgs, ResolverArgs,
@ -12,27 +9,12 @@ use crate::{
 };

 /// Given a boolean flag pair (like `--upgrade` and `--no-upgrade`), resolve the value of the flag.
-pub fn flag(yes: bool, no: bool, name: &str) -> Option<bool> {
+pub fn flag(yes: bool, no: bool) -> Option<bool> {
    match (yes, no) {
        (true, false) => Some(true),
        (false, true) => Some(false),
        (false, false) => None,
-        (..) => {
-            eprintln!(
-                "{}{} `{}` and `{}` cannot be used together. \
-                Boolean flags on different levels are currently not supported \
-                (https://github.com/clap-rs/clap/issues/6049)",
-                "error".bold().red(),
-                ":".bold(),
-                format!("--{name}").green(),
-                format!("--no-{name}").green(),
-            );
-            // No error forwarding since should eventually be solved on the clap side.
-            #[allow(clippy::exit)]
-            {
-                std::process::exit(2);
-            }
-        }
+        (..) => unreachable!("Clap should make this impossible"),
    }
 }

@ -44,7 +26,7 @@ impl From<RefreshArgs> for Refresh {
            refresh_package,
        } = value;

-        Self::from_args(flag(refresh, no_refresh, "no-refresh"), refresh_package)
+        Self::from_args(flag(refresh, no_refresh), refresh_package)
    }
 }

@ -71,7 +53,7 @@ impl From<ResolverArgs> for PipOptions {
        } = args;

        Self {
-            upgrade: flag(upgrade, no_upgrade, "no-upgrade"),
+            upgrade: flag(upgrade, no_upgrade),
            upgrade_package: Some(upgrade_package),
            index_strategy,
            keyring_provider,
@ -84,7 +66,7 @@ impl From<ResolverArgs> for PipOptions {
            },
            config_settings: config_setting
                .map(|config_settings| config_settings.into_iter().collect::<ConfigSettings>()),
-            no_build_isolation: flag(no_build_isolation, build_isolation, "build-isolation"),
+            no_build_isolation: flag(no_build_isolation, build_isolation),
            no_build_isolation_package: Some(no_build_isolation_package),
            exclude_newer,
            link_mode,
@ -114,16 +96,16 @@ impl From<InstallerArgs> for PipOptions {
        } = args;

        Self {
-            reinstall: flag(reinstall, no_reinstall, "reinstall"),
+            reinstall: flag(reinstall, no_reinstall),
            reinstall_package: Some(reinstall_package),
            index_strategy,
            keyring_provider,
            config_settings: config_setting
                .map(|config_settings| config_settings.into_iter().collect::<ConfigSettings>()),
-            no_build_isolation: flag(no_build_isolation, build_isolation, "build-isolation"),
+            no_build_isolation: flag(no_build_isolation, build_isolation),
            exclude_newer,
            link_mode,
-            compile_bytecode: flag(compile_bytecode, no_compile_bytecode, "compile-bytecode"),
+            compile_bytecode: flag(compile_bytecode, no_compile_bytecode),
            no_sources: if no_sources { Some(true) } else { None },
            ..PipOptions::from(index_args)
        }
@ -158,9 +140,9 @@ impl From<ResolverInstallerArgs> for PipOptions {
        } = args;

        Self {
-            upgrade: flag(upgrade, no_upgrade, "upgrade"),
+            upgrade: flag(upgrade, no_upgrade),
            upgrade_package: Some(upgrade_package),
-            reinstall: flag(reinstall, no_reinstall, "reinstall"),
+            reinstall: flag(reinstall, no_reinstall),
            reinstall_package: Some(reinstall_package),
            index_strategy,
            keyring_provider,
@ -173,11 +155,11 @@ impl From<ResolverInstallerArgs> for PipOptions {
            fork_strategy,
            config_settings: config_setting
                .map(|config_settings| config_settings.into_iter().collect::<ConfigSettings>()),
-            no_build_isolation: flag(no_build_isolation, build_isolation, "build-isolation"),
+            no_build_isolation: flag(no_build_isolation, build_isolation),
            no_build_isolation_package: Some(no_build_isolation_package),
            exclude_newer,
            link_mode,
-            compile_bytecode: flag(compile_bytecode, no_compile_bytecode, "compile-bytecode"),
+            compile_bytecode: flag(compile_bytecode, no_compile_bytecode),
            no_sources: if no_sources { Some(true) } else { None },
            ..PipOptions::from(index_args)
        }
@ -307,7 +289,7 @@ pub fn resolver_options(
                .filter_map(Maybe::into_option)
                .collect()
        }),
-        upgrade: flag(upgrade, no_upgrade, "no-upgrade"),
+        upgrade: flag(upgrade, no_upgrade),
        upgrade_package: Some(upgrade_package),
        index_strategy,
        keyring_provider,
@ -321,13 +303,13 @@ pub fn resolver_options(
        dependency_metadata: None,
        config_settings: config_setting
            .map(|config_settings| config_settings.into_iter().collect::<ConfigSettings>()),
-        no_build_isolation: flag(no_build_isolation, build_isolation, "build-isolation"),
+        no_build_isolation: flag(no_build_isolation, build_isolation),
        no_build_isolation_package: Some(no_build_isolation_package),
        exclude_newer,
        link_mode,
-        no_build: flag(no_build, build, "build"),
+        no_build: flag(no_build, build),
        no_build_package: Some(no_build_package),
-        no_binary: flag(no_binary, binary, "binary"),
+        no_binary: flag(no_binary, binary),
        no_binary_package: Some(no_binary_package),
        no_sources: if no_sources { Some(true) } else { None },
    }
@ -404,13 +386,13 @@ pub fn resolver_installer_options(
                .filter_map(Maybe::into_option)
                .collect()
        }),
-        upgrade: flag(upgrade, no_upgrade, "upgrade"),
+        upgrade: flag(upgrade, no_upgrade),
        upgrade_package: if upgrade_package.is_empty() {
            None
        } else {
            Some(upgrade_package)
        },
-        reinstall: flag(reinstall, no_reinstall, "reinstall"),
+        reinstall: flag(reinstall, no_reinstall),
        reinstall_package: if reinstall_package.is_empty() {
            None
        } else {
@ -428,7 +410,7 @@ pub fn resolver_installer_options(
        dependency_metadata: None,
        config_settings: config_setting
            .map(|config_settings| config_settings.into_iter().collect::<ConfigSettings>()),
-        no_build_isolation: flag(no_build_isolation, build_isolation, "build-isolation"),
+        no_build_isolation: flag(no_build_isolation, build_isolation),
        no_build_isolation_package: if no_build_isolation_package.is_empty() {
            None
        } else {
@ -436,14 +418,14 @@ pub fn resolver_installer_options(
        },
        exclude_newer,
        link_mode,
-        compile_bytecode: flag(compile_bytecode, no_compile_bytecode, "compile-bytecode"),
-        no_build: flag(no_build, build, "build"),
+        compile_bytecode: flag(compile_bytecode, no_compile_bytecode),
+        no_build: flag(no_build, build),
        no_build_package: if no_build_package.is_empty() {
            None
        } else {
            Some(no_build_package)
        },
-        no_binary: flag(no_binary, binary, "binary"),
+        no_binary: flag(no_binary, binary),
        no_binary_package: if no_binary_package.is_empty() {
            None
        } else {
--- a/crates/uv-client/src/base_client.rs
+++ b/crates/uv-client/src/base_client.rs
@ -982,45 +982,6 @@ mod tests {
        Ok(())
    }

-    #[tokio::test]
-    async fn test_redirect_preserves_fragment() -> Result<()> {
-        for status in &[301, 302, 303, 307, 308] {
-            let server = MockServer::start().await;
-            Mock::given(method("GET"))
-                .respond_with(
-                    ResponseTemplate::new(*status)
-                        .insert_header("location", format!("{}/redirect", server.uri())),
-                )
-                .mount(&server)
-                .await;
-
-            let request = Client::new()
-                .get(format!("{}#fragment", server.uri()))
-                .build()
-                .unwrap();
-
-            let response = Client::builder()
-                .redirect(reqwest::redirect::Policy::none())
-                .build()
-                .unwrap()
-                .execute(request.try_clone().unwrap())
-                .await
-                .unwrap();
-
-            let redirect_request =
-                request_into_redirect(request, &response, CrossOriginCredentialsPolicy::Secure)?
-                    .unwrap();
-            assert!(
-                redirect_request
-                    .url()
-                    .fragment()
-                    .is_some_and(|fragment| fragment == "fragment")
-            );
-        }
-
-        Ok(())
-    }
-
    #[tokio::test]
    async fn test_redirect_removes_authorization_header_on_cross_origin() -> Result<()> {
        for status in &[301, 302, 303, 307, 308] {
--- a/crates/uv-client/src/registry_client.rs
+++ b/crates/uv-client/src/registry_client.rs
@ -1416,6 +1416,44 @@ mod tests {
        Ok(())
    }

+    #[tokio::test]
+    async fn test_redirect_preserve_fragment() -> Result<(), Error> {
+        let redirect_server = MockServer::start().await;
+
+        // Configure the redirect server to respond with a 307 with a relative URL.
+        Mock::given(method("GET"))
+            .respond_with(ResponseTemplate::new(307).insert_header("Location", "/foo".to_string()))
+            .mount(&redirect_server)
+            .await;
+
+        Mock::given(method("GET"))
+            .and(path_regex("/foo"))
+            .respond_with(ResponseTemplate::new(200))
+            .mount(&redirect_server)
+            .await;
+
+        let cache = Cache::temp()?;
+        let registry_client = RegistryClientBuilder::new(cache).build();
+        let client = registry_client.cached_client().uncached();
+
+        let mut url = DisplaySafeUrl::parse(&redirect_server.uri())?;
+        url.set_fragment(Some("fragment"));
+
+        assert_eq!(
+            client
+                .for_host(&url)
+                .get(Url::from(url.clone()))
+                .send()
+                .await?
+                .url()
+                .to_string(),
+            format!("{}/foo#fragment", redirect_server.uri()),
+            "Requests should preserve fragment"
+        );
+
+        Ok(())
+    }
+
    #[test]
    fn ignore_failing_files() {
        // 1.7.7 has an invalid requires-python field (double comma), 1.7.8 is valid
--- a/crates/uv-configuration/src/build_options.rs
+++ b/crates/uv-configuration/src/build_options.rs
@ -4,7 +4,7 @@ use uv_pep508::PackageName;

 use crate::{PackageNameSpecifier, PackageNameSpecifiers};

-#[derive(Copy, Clone, Debug, Default, PartialEq, Eq, Hash)]
+#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
 pub enum BuildKind {
    /// A PEP 517 wheel build.
    #[default]
--- a/crates/uv-configuration/src/name_specifiers.rs
+++ b/crates/uv-configuration/src/name_specifiers.rs
@ -1,6 +1,4 @@
-#[cfg(feature = "schemars")]
-use std::borrow::Cow;
-use std::str::FromStr;
+use std::{borrow::Cow, str::FromStr};

 use uv_pep508::PackageName;

--- a/crates/uv-configuration/src/required_version.rs
+++ b/crates/uv-configuration/src/required_version.rs
@ -1,6 +1,5 @@
-#[cfg(feature = "schemars")]
-use std::borrow::Cow;
-use std::{fmt::Formatter, str::FromStr};
+use std::str::FromStr;
+use std::{borrow::Cow, fmt::Formatter};

 use uv_pep440::{Version, VersionSpecifier, VersionSpecifiers, VersionSpecifiersParseError};

--- a/crates/uv-configuration/src/sources.rs
+++ b/crates/uv-configuration/src/sources.rs
@ -1,6 +1,4 @@
-#[derive(
-    Debug, Default, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize,
-)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 #[serde(rename_all = "kebab-case", deny_unknown_fields)]
 pub enum SourceStrategy {
    /// Use `tool.uv.sources` when resolving dependencies.
--- a/crates/uv-configuration/src/trusted_host.rs
+++ b/crates/uv-configuration/src/trusted_host.rs
@ -1,7 +1,5 @@
 use serde::{Deserialize, Deserializer};
-#[cfg(feature = "schemars")]
-use std::borrow::Cow;
-use std::str::FromStr;
+use std::{borrow::Cow, str::FromStr};
 use url::Url;

 /// A host specification (wildcard, or host, with optional scheme and/or port) for which
--- a/crates/uv-dev/src/generate_sysconfig_mappings.rs
+++ b/crates/uv-dev/src/generate_sysconfig_mappings.rs
@ -11,7 +11,7 @@ use crate::ROOT_DIR;
 use crate::generate_all::Mode;

 /// Contains current supported targets
-const TARGETS_YML_URL: &str = "https://raw.githubusercontent.com/astral-sh/python-build-standalone/refs/tags/20250702/cpython-unix/targets.yml";
+const TARGETS_YML_URL: &str = "https://raw.githubusercontent.com/astral-sh/python-build-standalone/refs/tags/20250626/cpython-unix/targets.yml";

 #[derive(clap::Args)]
 pub(crate) struct Args {
@ -130,7 +130,7 @@ async fn generate() -> Result<String> {
    output.push_str("//! DO NOT EDIT\n");
    output.push_str("//!\n");
    output.push_str("//! Generated with `cargo run dev generate-sysconfig-metadata`\n");
-    output.push_str("//! Targets from <https://github.com/astral-sh/python-build-standalone/blob/20250702/cpython-unix/targets.yml>\n");
+    output.push_str("//! Targets from <https://github.com/astral-sh/python-build-standalone/blob/20250626/cpython-unix/targets.yml>\n");
    output.push_str("//!\n");

    // Disable clippy/fmt
--- a/crates/uv-dispatch/src/lib.rs
+++ b/crates/uv-dispatch/src/lib.rs
@ -11,7 +11,6 @@ use itertools::Itertools;
 use rustc_hash::FxHashMap;
 use thiserror::Error;
 use tracing::{debug, instrument, trace};
-
 use uv_build_backend::check_direct_build;
 use uv_build_frontend::{SourceBuild, SourceBuildContext};
 use uv_cache::Cache;
@ -36,8 +35,8 @@ use uv_resolver::{
    PythonRequirement, Resolver, ResolverEnvironment,
 };
 use uv_types::{
-    AnyErrorBuild, BuildArena, BuildContext, BuildIsolation, BuildStack, EmptyInstalledPackages,
-    HashStrategy, InFlight,
+    AnyErrorBuild, BuildContext, BuildIsolation, BuildStack, EmptyInstalledPackages, HashStrategy,
+    InFlight,
 };
 use uv_workspace::WorkspaceCache;

@ -180,10 +179,6 @@ impl BuildContext for BuildDispatch<'_> {
        &self.shared_state.git
    }

-    fn build_arena(&self) -> &BuildArena<SourceBuild> {
-        &self.shared_state.build_arena
-    }
-
    fn capabilities(&self) -> &IndexCapabilities {
        &self.shared_state.capabilities
    }
@ -453,6 +448,12 @@ impl BuildContext for BuildDispatch<'_> {
        build_kind: BuildKind,
        version_id: Option<&'data str>,
    ) -> Result<Option<DistFilename>, BuildDispatchError> {
+        // Direct builds are a preview feature with the uv build backend.
+        if self.preview.is_disabled() {
+            trace!("Preview is disabled, not checking for direct build");
+            return Ok(None);
+        }
+
        let source_tree = if let Some(subdir) = subdirectory {
            source.join(subdir)
        } else {
@ -520,8 +521,6 @@ pub struct SharedState {
    index: InMemoryIndex,
    /// The downloaded distributions.
    in_flight: InFlight,
-    /// Build directories for any PEP 517 builds executed during resolution or installation.
-    build_arena: BuildArena<SourceBuild>,
 }

 impl SharedState {
@ -534,7 +533,6 @@ impl SharedState {
        Self {
            git: self.git.clone(),
            capabilities: self.capabilities.clone(),
-            build_arena: self.build_arena.clone(),
            ..Default::default()
        }
    }
@ -558,9 +556,4 @@ impl SharedState {
    pub fn capabilities(&self) -> &IndexCapabilities {
        &self.capabilities
    }
-
-    /// Return the [`BuildArena`] used by the [`SharedState`].
-    pub fn build_arena(&self) -> &BuildArena<SourceBuild> {
-        &self.build_arena
-    }
 }
--- a/crates/uv-distribution-types/src/file.rs
+++ b/crates/uv-distribution-types/src/file.rs
@ -171,21 +171,10 @@ impl UrlString {
    }

    /// Return the [`UrlString`] (as a [`Cow`]) with trailing slash removed.
-    ///
-    /// This matches the semantics of [`Url::pop_if_empty`], which will not trim a trailing slash if
-    /// it's the only path segment, e.g., `https://example.com/` would be unchanged.
    #[must_use]
    pub fn without_trailing_slash(&self) -> Cow<'_, Self> {
        self.as_ref()
            .strip_suffix('/')
-            .filter(|path| {
-                // Only strip the trailing slash if there's _another_ trailing slash that isn't a
-                // part of the scheme.
-                path.split_once("://")
-                    .map(|(_scheme, rest)| rest)
-                    .unwrap_or(path)
-                    .contains('/')
-            })
            .map(|path| Cow::Owned(UrlString(SmallString::from(path))))
            .unwrap_or(Cow::Borrowed(self))
    }
@ -272,49 +261,27 @@ mod tests {
    fn without_fragment() {
        // Borrows a URL without a fragment
        let url = UrlString("https://example.com/path".into());
-        assert_eq!(&*url.without_fragment(), &url);
-        assert!(matches!(url.without_fragment(), Cow::Borrowed(_)));
+        assert_eq!(url.without_fragment(), Cow::Borrowed(&url));

        // Removes the fragment if present on the URL
        let url = UrlString("https://example.com/path?query#fragment".into());
        assert_eq!(
-            &*url.without_fragment(),
-            &UrlString("https://example.com/path?query".into())
+            url.without_fragment(),
+            Cow::Owned(UrlString("https://example.com/path?query".into()))
        );
-        assert!(matches!(url.without_fragment(), Cow::Owned(_)));
    }

    #[test]
    fn without_trailing_slash() {
        // Borrows a URL without a slash
        let url = UrlString("https://example.com/path".into());
-        assert_eq!(&*url.without_trailing_slash(), &url);
-        assert!(matches!(url.without_trailing_slash(), Cow::Borrowed(_)));
+        assert_eq!(url.without_trailing_slash(), Cow::Borrowed(&url));

        // Removes the trailing slash if present on the URL
        let url = UrlString("https://example.com/path/".into());
        assert_eq!(
-            &*url.without_trailing_slash(),
-            &UrlString("https://example.com/path".into())
+            url.without_trailing_slash(),
+            Cow::Owned(UrlString("https://example.com/path".into()))
        );
-        assert!(matches!(url.without_trailing_slash(), Cow::Owned(_)));
-
-        // Does not remove a trailing slash if it's the only path segment
-        let url = UrlString("https://example.com/".into());
-        assert_eq!(&*url.without_trailing_slash(), &url);
-        assert!(matches!(url.without_trailing_slash(), Cow::Borrowed(_)));
-
-        // Does not remove a trailing slash if it's the only path segment with a missing scheme
-        let url = UrlString("example.com/".into());
-        assert_eq!(&*url.without_trailing_slash(), &url);
-        assert!(matches!(url.without_trailing_slash(), Cow::Borrowed(_)));
-
-        // Removes the trailing slash when the scheme is missing
-        let url = UrlString("example.com/path/".into());
-        assert_eq!(
-            &*url.without_trailing_slash(),
-            &UrlString("example.com/path".into())
-        );
-        assert!(matches!(url.without_trailing_slash(), Cow::Owned(_)));
    }
 }
--- a/crates/uv-distribution-types/src/index_url.rs
+++ b/crates/uv-distribution-types/src/index_url.rs
@ -462,19 +462,6 @@ impl<'a> IndexLocations {
            indexes
        }
    }
-
-    /// Add all authenticated sources to the cache.
-    pub fn cache_index_credentials(&self) {
-        for index in self.allowed_indexes() {
-            if let Some(credentials) = index.credentials() {
-                let credentials = Arc::new(credentials);
-                uv_auth::store_credentials(index.raw_url(), credentials.clone());
-                if let Some(root_url) = index.root_url() {
-                    uv_auth::store_credentials(&root_url, credentials.clone());
-                }
-            }
-        }
-    }
 }

 impl From<&IndexLocations> for uv_auth::Indexes {
--- a/crates/uv-distribution-types/src/installed.rs
+++ b/crates/uv-distribution-types/src/installed.rs
@ -365,7 +365,7 @@ impl InstalledDist {
    pub fn installer(&self) -> Result<Option<String>, InstalledDistError> {
        let path = self.install_path().join("INSTALLER");
        match fs::read_to_string(path) {
-            Ok(installer) => Ok(Some(installer.trim().to_owned())),
+            Ok(installer) => Ok(Some(installer)),
            Err(err) if err.kind() == std::io::ErrorKind::NotFound => Ok(None),
            Err(err) => Err(err.into()),
        }
--- a/crates/uv-distribution-types/src/pip_index.rs
+++ b/crates/uv-distribution-types/src/pip_index.rs
@ -3,9 +3,7 @@
 //! flags set.

 use serde::{Deserialize, Deserializer, Serialize};
-#[cfg(feature = "schemars")]
-use std::borrow::Cow;
-use std::path::Path;
+use std::{borrow::Cow, path::Path};

 use crate::{Index, IndexUrl};

--- a/crates/uv-distribution-types/src/requires_python.rs
+++ b/crates/uv-distribution-types/src/requires_python.rs
@ -5,10 +5,11 @@ use version_ranges::Ranges;
 use uv_distribution_filename::WheelFilename;
 use uv_pep440::{
    LowerBound, UpperBound, Version, VersionSpecifier, VersionSpecifiers,
-    release_specifiers_to_ranges,
+    release_specifier_to_range, release_specifiers_to_ranges,
 };
 use uv_pep508::{MarkerExpression, MarkerTree, MarkerValueVersion};
 use uv_platform_tags::{AbiTag, LanguageTag};
+use uv_warnings::warn_user_once;

 /// The `Requires-Python` requirement specifier.
 ///
@ -66,7 +67,27 @@ impl RequiresPython {
    ) -> Option<Self> {
        // Convert to PubGrub range and perform an intersection.
        let range = specifiers
-            .map(|specs| release_specifiers_to_ranges(specs.clone()))
+            .map(|specs| {
+                // Warn if there’s exactly one `~=` specifier without a patch.
+                if let [spec] = &specs[..] {
+                    if spec.is_tilde_without_patch() {
+                        if let Some((lo_b, hi_b)) = release_specifier_to_range(spec.clone())
+                            .bounding_range()
+                            .map(|(l, u)| (l.cloned(), u.cloned()))
+                        {
+                            let lo_spec = LowerBound::new(lo_b).specifier().unwrap();
+                            let hi_spec = UpperBound::new(hi_b).specifier().unwrap();
+                            warn_user_once!(
+                                "The release specifier (`{spec}`) contains a compatible release \
+                                match without a patch version. This will be interpreted as \
+                                `{lo_spec}, {hi_spec}`. Did you mean `{spec}.0` to freeze the minor \
+                                version?"
+                            );
+                        }
+                    }
+                }
+                release_specifiers_to_ranges(specs.clone())
+            })
            .reduce(|acc, r| acc.intersection(&r))?;

        // If the intersection is empty, return `None`.
--- a/crates/uv-distribution-types/src/status_code_strategy.rs
+++ b/crates/uv-distribution-types/src/status_code_strategy.rs
@ -1,6 +1,4 @@
-#[cfg(feature = "schemars")]
-use std::borrow::Cow;
-use std::ops::Deref;
+use std::{borrow::Cow, ops::Deref};

 use http::StatusCode;
 use rustc_hash::FxHashSet;
--- a/crates/uv-distribution/src/error.rs
+++ b/crates/uv-distribution/src/error.rs
@ -108,8 +108,6 @@ pub enum Error {
    CacheHeal(String, HashAlgorithm),
    #[error("The source distribution requires Python {0}, but {1} is installed")]
    RequiresPython(VersionSpecifiers, Version),
-    #[error("Failed to identify base Python interpreter")]
-    BaseInterpreter(#[source] std::io::Error),

    /// A generic request middleware error happened while making a request.
    /// Refer to the error message for more details.
--- a/crates/uv-distribution/src/source/mod.rs
+++ b/crates/uv-distribution/src/source/mod.rs
@ -43,7 +43,7 @@ use uv_normalize::PackageName;
 use uv_pep440::{Version, release_specifiers_to_ranges};
 use uv_platform_tags::Tags;
 use uv_pypi_types::{HashAlgorithm, HashDigest, HashDigests, PyProjectToml, ResolutionMetadata};
-use uv_types::{BuildContext, BuildKey, BuildStack, SourceBuildTrait};
+use uv_types::{BuildContext, BuildStack, SourceBuildTrait};
 use uv_workspace::pyproject::ToolUvSources;

 use crate::distribution_database::ManagedClient;
@ -2276,7 +2276,6 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
        fs::create_dir_all(&cache_shard)
            .await
            .map_err(Error::CacheWrite)?;
-
        // Try a direct build if that isn't disabled and the uv build backend is used.
        let disk_filename = if let Some(name) = self
            .build_context
@ -2297,73 +2296,27 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
            // In the uv build backend, the normalized filename and the disk filename are the same.
            name.to_string()
        } else {
-            // Identify the base Python interpreter to use in the cache key.
-            let base_python = if cfg!(unix) {
-                self.build_context
-                    .interpreter()
-                    .find_base_python()
-                    .map_err(Error::BaseInterpreter)?
-            } else {
-                self.build_context
-                    .interpreter()
-                    .to_base_python()
-                    .map_err(Error::BaseInterpreter)?
-            };
-
-            let build_kind = if source.is_editable() {
-                BuildKind::Editable
-            } else {
-                BuildKind::Wheel
-            };
-
-            let build_key = BuildKey {
-                base_python: base_python.into_boxed_path(),
-                source_root: source_root.to_path_buf().into_boxed_path(),
-                subdirectory: subdirectory
-                    .map(|subdirectory| subdirectory.to_path_buf().into_boxed_path()),
-                source_strategy,
-                build_kind,
-            };
-
-            if let Some(builder) = self.build_context.build_arena().remove(&build_key) {
-                debug!("Creating build environment for: {source}");
-                let wheel = builder.wheel(temp_dir.path()).await.map_err(Error::Build)?;
-
-                // Store the build context.
-                self.build_context.build_arena().insert(build_key, builder);
-
-                wheel
-            } else {
-                debug!("Reusing existing build environment for: {source}");
-
-                let builder = self
-                    .build_context
-                    .setup_build(
-                        source_root,
-                        subdirectory,
-                        source_root,
-                        Some(&source.to_string()),
-                        source.as_dist(),
-                        source_strategy,
-                        if source.is_editable() {
-                            BuildKind::Editable
-                        } else {
-                            BuildKind::Wheel
-                        },
-                        BuildOutput::Debug,
-                        self.build_stack.cloned().unwrap_or_default(),
-                    )
-                    .await
-                    .map_err(|err| Error::Build(err.into()))?;
-
-                // Build the wheel.
-                let wheel = builder.wheel(temp_dir.path()).await.map_err(Error::Build)?;
-
-                // Store the build context.
-                self.build_context.build_arena().insert(build_key, builder);
-
-                wheel
-            }
+            self.build_context
+                .setup_build(
+                    source_root,
+                    subdirectory,
+                    source_root,
+                    Some(&source.to_string()),
+                    source.as_dist(),
+                    source_strategy,
+                    if source.is_editable() {
+                        BuildKind::Editable
+                    } else {
+                        BuildKind::Wheel
+                    },
+                    BuildOutput::Debug,
+                    self.build_stack.cloned().unwrap_or_default(),
+                )
+                .await
+                .map_err(|err| Error::Build(err.into()))?
+                .wheel(temp_dir.path())
+                .await
+                .map_err(Error::Build)?
        };

        // Read the metadata from the wheel.
@ -2418,26 +2371,6 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
            }
        }

-        // Identify the base Python interpreter to use in the cache key.
-        let base_python = if cfg!(unix) {
-            self.build_context
-                .interpreter()
-                .find_base_python()
-                .map_err(Error::BaseInterpreter)?
-        } else {
-            self.build_context
-                .interpreter()
-                .to_base_python()
-                .map_err(Error::BaseInterpreter)?
-        };
-
-        // Determine whether this is an editable or non-editable build.
-        let build_kind = if source.is_editable() {
-            BuildKind::Editable
-        } else {
-            BuildKind::Wheel
-        };
-
        // Set up the builder.
        let mut builder = self
            .build_context
@ -2448,7 +2381,11 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
                Some(&source.to_string()),
                source.as_dist(),
                source_strategy,
-                build_kind,
+                if source.is_editable() {
+                    BuildKind::Editable
+                } else {
+                    BuildKind::Wheel
+                },
                BuildOutput::Debug,
                self.build_stack.cloned().unwrap_or_default(),
            )
@ -2457,21 +2394,6 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {

        // Build the metadata.
        let dist_info = builder.metadata().await.map_err(Error::Build)?;
-
-        // Store the build context.
-        self.build_context.build_arena().insert(
-            BuildKey {
-                base_python: base_python.into_boxed_path(),
-                source_root: source_root.to_path_buf().into_boxed_path(),
-                subdirectory: subdirectory
-                    .map(|subdirectory| subdirectory.to_path_buf().into_boxed_path()),
-                source_strategy,
-                build_kind,
-            },
-            builder,
-        );
-
-        // Return the `.dist-info` directory, if it exists.
        let Some(dist_info) = dist_info else {
            return Ok(None);
        };
--- a/crates/uv-extract/src/error.rs
+++ b/crates/uv-extract/src/error.rs
@ -2,11 +2,11 @@ use std::{ffi::OsString, path::PathBuf};

 #[derive(Debug, thiserror::Error)]
 pub enum Error {
-    #[error("Failed to read from zip file")]
+    #[error(transparent)]
    Zip(#[from] zip::result::ZipError),
-    #[error("Failed to read from zip file")]
+    #[error(transparent)]
    AsyncZip(#[from] async_zip::error::ZipError),
-    #[error("I/O operation failed during extraction")]
+    #[error(transparent)]
    Io(#[from] std::io::Error),
    #[error(
        "The top-level of the archive must only contain a list directory, but it contains: {0:?}"
--- a/crates/uv-pep440/src/lib.rs
+++ b/crates/uv-pep440/src/lib.rs
@ -34,7 +34,7 @@ pub use {
        VersionPatternParseError,
    },
    version_specifier::{
-        TildeVersionSpecifier, VersionSpecifier, VersionSpecifierBuildError, VersionSpecifiers,
+        VersionSpecifier, VersionSpecifierBuildError, VersionSpecifiers,
        VersionSpecifiersParseError,
    },
 };
--- a/crates/uv-pep440/src/version.rs
+++ b/crates/uv-pep440/src/version.rs
@ -610,24 +610,6 @@ impl Version {
        Self::new(self.release().iter().copied())
    }

-    /// Return the version with any segments apart from the release removed, with trailing zeroes
-    /// trimmed.
-    #[inline]
-    #[must_use]
-    pub fn only_release_trimmed(&self) -> Self {
-        if let Some(last_non_zero) = self.release().iter().rposition(|segment| *segment != 0) {
-            if last_non_zero == self.release().len() {
-                // Already trimmed.
-                self.clone()
-            } else {
-                Self::new(self.release().iter().take(last_non_zero + 1).copied())
-            }
-        } else {
-            // `0` is a valid version.
-            Self::new([0])
-        }
-    }
-
    /// Return the version with trailing `.0` release segments removed.
    ///
    /// # Panics
--- a/crates/uv-pep440/src/version_ranges.rs
+++ b/crates/uv-pep440/src/version_ranges.rs
@ -130,11 +130,10 @@ impl From<VersionSpecifier> for Ranges<Version> {
 ///
 /// See: <https://github.com/pypa/pip/blob/a432c7f4170b9ef798a15f035f5dfdb4cc939f35/src/pip/_internal/resolution/resolvelib/candidates.py#L540>
 pub fn release_specifiers_to_ranges(specifiers: VersionSpecifiers) -> Ranges<Version> {
-    let mut range = Ranges::full();
-    for specifier in specifiers {
-        range = range.intersection(&release_specifier_to_range(specifier, false));
-    }
-    range
+    specifiers
+        .into_iter()
+        .map(release_specifier_to_range)
+        .fold(Ranges::full(), |acc, range| acc.intersection(&range))
 }

 /// Convert the [`VersionSpecifier`] to a PubGrub-compatible version range, using release-only
@ -148,57 +147,67 @@ pub fn release_specifiers_to_ranges(specifiers: VersionSpecifiers) -> Ranges<Ver
 /// is allowed for projects that declare `requires-python = ">3.13"`.
 ///
 /// See: <https://github.com/pypa/pip/blob/a432c7f4170b9ef798a15f035f5dfdb4cc939f35/src/pip/_internal/resolution/resolvelib/candidates.py#L540>
-pub fn release_specifier_to_range(specifier: VersionSpecifier, trim: bool) -> Ranges<Version> {
+pub fn release_specifier_to_range(specifier: VersionSpecifier) -> Ranges<Version> {
    let VersionSpecifier { operator, version } = specifier;
-    // Note(konsti): We switched strategies to trimmed for the markers, but we don't want to cause
-    // churn in lockfile requires-python, so we only trim for markers.
-    let version_trimmed = if trim {
-        version.only_release_trimmed()
-    } else {
-        version.only_release()
-    };
    match operator {
-        // Trailing zeroes are not semantically relevant.
-        Operator::Equal => Ranges::singleton(version_trimmed),
-        Operator::ExactEqual => Ranges::singleton(version_trimmed),
-        Operator::NotEqual => Ranges::singleton(version_trimmed).complement(),
-        Operator::LessThan => Ranges::strictly_lower_than(version_trimmed),
-        Operator::LessThanEqual => Ranges::lower_than(version_trimmed),
-        Operator::GreaterThan => Ranges::strictly_higher_than(version_trimmed),
-        Operator::GreaterThanEqual => Ranges::higher_than(version_trimmed),
-
-        // Trailing zeroes are semantically relevant.
+        Operator::Equal => {
+            let version = version.only_release();
+            Ranges::singleton(version)
+        }
+        Operator::ExactEqual => {
+            let version = version.only_release();
+            Ranges::singleton(version)
+        }
+        Operator::NotEqual => {
+            let version = version.only_release();
+            Ranges::singleton(version).complement()
+        }
        Operator::TildeEqual => {
            let release = version.release();
            let [rest @ .., last, _] = &*release else {
                unreachable!("~= must have at least two segments");
            };
            let upper = Version::new(rest.iter().chain([&(last + 1)]));
-            Ranges::from_range_bounds(version_trimmed..upper)
+            let version = version.only_release();
+            Ranges::from_range_bounds(version..upper)
+        }
+        Operator::LessThan => {
+            let version = version.only_release();
+            Ranges::strictly_lower_than(version)
+        }
+        Operator::LessThanEqual => {
+            let version = version.only_release();
+            Ranges::lower_than(version)
+        }
+        Operator::GreaterThan => {
+            let version = version.only_release();
+            Ranges::strictly_higher_than(version)
+        }
+        Operator::GreaterThanEqual => {
+            let version = version.only_release();
+            Ranges::higher_than(version)
        }
        Operator::EqualStar => {
-            // For (not-)equal-star, trailing zeroes are still before the star.
-            let low_full = version.only_release();
+            let low = version.only_release();
            let high = {
-                let mut high = low_full.clone();
+                let mut high = low.clone();
                let mut release = high.release().to_vec();
                *release.last_mut().unwrap() += 1;
                high = high.with_release(release);
                high
            };
-            Ranges::from_range_bounds(version..high)
+            Ranges::from_range_bounds(low..high)
        }
        Operator::NotEqualStar => {
-            // For (not-)equal-star, trailing zeroes are still before the star.
-            let low_full = version.only_release();
+            let low = version.only_release();
            let high = {
-                let mut high = low_full.clone();
+                let mut high = low.clone();
                let mut release = high.release().to_vec();
                *release.last_mut().unwrap() += 1;
                high = high.with_release(release);
                high
            };
-            Ranges::from_range_bounds(version..high).complement()
+            Ranges::from_range_bounds(low..high).complement()
        }
    }
 }
@ -213,8 +222,8 @@ impl LowerBound {
    /// These bounds use release-only semantics when comparing versions.
    pub fn new(bound: Bound<Version>) -> Self {
        Self(match bound {
-            Bound::Included(version) => Bound::Included(version.only_release_trimmed()),
-            Bound::Excluded(version) => Bound::Excluded(version.only_release_trimmed()),
+            Bound::Included(version) => Bound::Included(version.only_release()),
+            Bound::Excluded(version) => Bound::Excluded(version.only_release()),
            Bound::Unbounded => Bound::Unbounded,
        })
    }
@ -348,8 +357,8 @@ impl UpperBound {
    /// These bounds use release-only semantics when comparing versions.
    pub fn new(bound: Bound<Version>) -> Self {
        Self(match bound {
-            Bound::Included(version) => Bound::Included(version.only_release_trimmed()),
-            Bound::Excluded(version) => Bound::Excluded(version.only_release_trimmed()),
+            Bound::Included(version) => Bound::Included(version.only_release()),
+            Bound::Excluded(version) => Bound::Excluded(version.only_release()),
            Bound::Unbounded => Bound::Unbounded,
        })
    }
--- a/crates/uv-pep440/src/version_specifier.rs
+++ b/crates/uv-pep440/src/version_specifier.rs
@ -80,38 +80,24 @@ impl VersionSpecifiers {

        // Add specifiers for the holes between the bounds.
        for (lower, upper) in bounds {
-            let specifier = match (next, lower) {
+            match (next, lower) {
                // Ex) [3.7, 3.8.5), (3.8.5, 3.9] -> >=3.7,!=3.8.5,<=3.9
                (Bound::Excluded(prev), Bound::Excluded(lower)) if prev == lower => {
-                    Some(VersionSpecifier::not_equals_version(prev.clone()))
+                    specifiers.push(VersionSpecifier::not_equals_version(prev.clone()));
                }
                // Ex) [3.7, 3.8), (3.8, 3.9] -> >=3.7,!=3.8.*,<=3.9
-                (Bound::Excluded(prev), Bound::Included(lower)) => {
-                    match *prev.only_release_trimmed().release() {
-                        [major] if *lower.only_release_trimmed().release() == [major, 1] => {
-                            Some(VersionSpecifier::not_equals_star_version(Version::new([
-                                major, 0,
-                            ])))
-                        }
-                        [major, minor]
-                            if *lower.only_release_trimmed().release() == [major, minor + 1] =>
-                        {
-                            Some(VersionSpecifier::not_equals_star_version(Version::new([
-                                major, minor,
-                            ])))
-                        }
-                        _ => None,
-                    }
+                (Bound::Excluded(prev), Bound::Included(lower))
+                    if prev.release().len() == 2
+                        && *lower.release() == [prev.release()[0], prev.release()[1] + 1] =>
+                {
+                    specifiers.push(VersionSpecifier::not_equals_star_version(prev.clone()));
+                }
+                _ => {
+                    #[cfg(feature = "tracing")]
+                    warn!(
+                        "Ignoring unsupported gap in `requires-python` version: {next:?} -> {lower:?}"
+                    );
                }
-                _ => None,
-            };
-            if let Some(specifier) = specifier {
-                specifiers.push(specifier);
-            } else {
-                #[cfg(feature = "tracing")]
-                warn!(
-                    "Ignoring unsupported gap in `requires-python` version: {next:?} -> {lower:?}"
-                );
            }
            next = upper;
        }
@ -362,33 +348,6 @@ impl VersionSpecifier {
        Ok(Self { operator, version })
    }

-    /// Remove all non-release parts of the version.
-    ///
-    /// The marker decision diagram relies on the assumption that the negation of a marker tree is
-    /// the complement of the marker space. However, pre-release versions violate this assumption.
-    ///
-    /// For example, the marker `python_full_version > '3.9' or python_full_version <= '3.9'`
-    /// does not match `python_full_version == 3.9.0a0` and so cannot simplify to `true`. However,
-    /// its negation, `python_full_version > '3.9' and python_full_version <= '3.9'`, also does not
-    /// match `3.9.0a0` and simplifies to `false`, which violates the algebra decision diagrams
-    /// rely on. For this reason we ignore pre-release versions entirely when evaluating markers.
-    ///
-    /// Note that `python_version` cannot take on pre-release values as it is truncated to just the
-    /// major and minor version segments. Thus using release-only specifiers is definitely necessary
-    /// for `python_version` to fully simplify any ranges, such as
-    /// `python_version > '3.9' or python_version <= '3.9'`, which is always `true` for
-    /// `python_version`. For `python_full_version` however, this decision is a semantic change.
-    ///
-    /// For Python versions, the major.minor is considered the API version, so unlike the rules
-    /// for package versions in PEP 440, we Python `3.9.0a0` is acceptable for `>= "3.9"`.
-    #[must_use]
-    pub fn only_release(self) -> Self {
-        Self {
-            operator: self.operator,
-            version: self.version.only_release(),
-        }
-    }
-
    /// `==<version>`
    pub fn equals_version(version: Version) -> Self {
        Self {
@ -483,23 +442,14 @@ impl VersionSpecifier {
                (Some(VersionSpecifier::equals_version(v1.clone())), None)
            }
            // `v >= 3.7 && v < 3.8` is equivalent to `v == 3.7.*`
-            (Bound::Included(v1), Bound::Excluded(v2)) => {
-                match *v1.only_release_trimmed().release() {
-                    [major] if *v2.only_release_trimmed().release() == [major, 1] => {
-                        let version = Version::new([major, 0]);
-                        (Some(VersionSpecifier::equals_star_version(version)), None)
-                    }
-                    [major, minor]
-                        if *v2.only_release_trimmed().release() == [major, minor + 1] =>
-                    {
-                        let version = Version::new([major, minor]);
-                        (Some(VersionSpecifier::equals_star_version(version)), None)
-                    }
-                    _ => (
-                        VersionSpecifier::from_lower_bound(&Bound::Included(v1.clone())),
-                        VersionSpecifier::from_upper_bound(&Bound::Excluded(v2.clone())),
-                    ),
-                }
+            (Bound::Included(v1), Bound::Excluded(v2))
+                if v1.release().len() == 2
+                    && *v2.release() == [v1.release()[0], v1.release()[1] + 1] =>
+            {
+                (
+                    Some(VersionSpecifier::equals_star_version(v1.clone())),
+                    None,
+                )
            }
            (lower, upper) => (
                VersionSpecifier::from_lower_bound(lower),
@ -665,6 +615,11 @@ impl VersionSpecifier {
            | Operator::NotEqual => false,
        }
    }
+
+    /// Returns true if this is a `~=` specifier without a patch version (e.g. `~=3.11`).
+    pub fn is_tilde_without_patch(&self) -> bool {
+        self.operator == Operator::TildeEqual && self.version.release().len() == 2
+    }
 }

 impl FromStr for VersionSpecifier {
@ -888,90 +843,6 @@ pub(crate) fn parse_version_specifiers(
    Ok(version_ranges)
 }

-/// A simple `~=` version specifier with a major, minor and (optional) patch version, e.g., `~=3.13`
-/// or `~=3.13.0`.
-#[derive(Clone, Debug)]
-pub struct TildeVersionSpecifier<'a> {
-    inner: Cow<'a, VersionSpecifier>,
-}
-
-impl<'a> TildeVersionSpecifier<'a> {
-    /// Create a new [`TildeVersionSpecifier`] from a [`VersionSpecifier`] value.
-    ///
-    /// If a [`Operator::TildeEqual`] is not used, or the version includes more than minor and patch
-    /// segments, this will return [`None`].
-    pub fn from_specifier(specifier: VersionSpecifier) -> Option<TildeVersionSpecifier<'a>> {
-        TildeVersionSpecifier::new(Cow::Owned(specifier))
-    }
-
-    /// Create a new [`TildeVersionSpecifier`] from a [`VersionSpecifier`] reference.
-    ///
-    /// See [`TildeVersionSpecifier::from_specifier`].
-    pub fn from_specifier_ref(
-        specifier: &'a VersionSpecifier,
-    ) -> Option<TildeVersionSpecifier<'a>> {
-        TildeVersionSpecifier::new(Cow::Borrowed(specifier))
-    }
-
-    fn new(specifier: Cow<'a, VersionSpecifier>) -> Option<Self> {
-        if specifier.operator != Operator::TildeEqual {
-            return None;
-        }
-        if specifier.version().release().len() < 2 || specifier.version().release().len() > 3 {
-            return None;
-        }
-        if specifier.version().any_prerelease()
-            || specifier.version().is_local()
-            || specifier.version().is_post()
-        {
-            return None;
-        }
-        Some(Self { inner: specifier })
-    }
-
-    /// Whether a patch version is present in this tilde version specifier.
-    pub fn has_patch(&self) -> bool {
-        self.inner.version.release().len() == 3
-    }
-
-    /// Construct the lower and upper bounding version specifiers for this tilde version specifier,
-    /// e.g., for `~=3.13` this would return `>=3.13` and `<4` and for `~=3.13.0` it would
-    /// return `>=3.13.0` and `<3.14`.
-    pub fn bounding_specifiers(&self) -> (VersionSpecifier, VersionSpecifier) {
-        let release = self.inner.version().release();
-        let lower = self.inner.version.clone();
-        let upper = if self.has_patch() {
-            Version::new([release[0], release[1] + 1])
-        } else {
-            Version::new([release[0] + 1])
-        };
-        (
-            VersionSpecifier::greater_than_equal_version(lower),
-            VersionSpecifier::less_than_version(upper),
-        )
-    }
-
-    /// Construct a new tilde `VersionSpecifier` with the given patch version appended.
-    pub fn with_patch_version(&self, patch: u64) -> TildeVersionSpecifier {
-        let mut release = self.inner.version.release().to_vec();
-        if self.has_patch() {
-            release.pop();
-        }
-        release.push(patch);
-        TildeVersionSpecifier::from_specifier(
-            VersionSpecifier::from_version(Operator::TildeEqual, Version::new(release))
-                .expect("We should always derive a valid new version specifier"),
-        )
-        .expect("We should always derive a new tilde version specifier")
-    }
-}
-
-impl std::fmt::Display for TildeVersionSpecifier<'_> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.inner)
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use std::{cmp::Ordering, str::FromStr};
--- a/crates/uv-pep508/src/lib.rs
+++ b/crates/uv-pep508/src/lib.rs
@ -16,7 +16,6 @@

 #![warn(missing_docs)]

-#[cfg(feature = "schemars")]
 use std::borrow::Cow;
 use std::error::Error;
 use std::fmt::{Debug, Display, Formatter};
--- a/crates/uv-pep508/src/marker/algebra.rs
+++ b/crates/uv-pep508/src/marker/algebra.rs
@ -172,7 +172,7 @@ impl InternerGuard<'_> {
                ),
                // Normalize `python_version` markers to `python_full_version` nodes.
                MarkerValueVersion::PythonVersion => {
-                    match python_version_to_full_version(specifier.only_release()) {
+                    match python_version_to_full_version(normalize_specifier(specifier)) {
                        Ok(specifier) => (
                            Variable::Version(CanonicalMarkerValueVersion::PythonFullVersion),
                            Edges::from_specifier(specifier),
@ -1214,7 +1214,7 @@ impl Edges {

    /// Returns the [`Edges`] for a version specifier.
    fn from_specifier(specifier: VersionSpecifier) -> Edges {
-        let specifier = release_specifier_to_range(specifier.only_release(), true);
+        let specifier = release_specifier_to_range(normalize_specifier(specifier));
        Edges::Version {
            edges: Edges::from_range(&specifier),
        }
@ -1227,9 +1227,9 @@ impl Edges {
        let mut range: Ranges<Version> = versions
            .into_iter()
            .map(|version| {
-                let specifier = VersionSpecifier::equals_version(version.only_release());
+                let specifier = VersionSpecifier::equals_version(version.clone());
                let specifier = python_version_to_full_version(specifier)?;
-                Ok(release_specifier_to_range(specifier, true))
+                Ok(release_specifier_to_range(normalize_specifier(specifier)))
            })
            .flatten_ok()
            .collect::<Result<Ranges<_>, NodeId>>()?;
@ -1526,62 +1526,57 @@ impl Edges {
    }
 }

+// Normalize a [`VersionSpecifier`] before adding it to the tree.
+fn normalize_specifier(specifier: VersionSpecifier) -> VersionSpecifier {
+    let (operator, version) = specifier.into_parts();
+
+    // The decision diagram relies on the assumption that the negation of a marker tree is
+    // the complement of the marker space. However, pre-release versions violate this assumption.
+    //
+    // For example, the marker `python_full_version > '3.9' or python_full_version <= '3.9'`
+    // does not match `python_full_version == 3.9.0a0` and so cannot simplify to `true`. However,
+    // its negation, `python_full_version > '3.9' and python_full_version <= '3.9'`, also does not
+    // match `3.9.0a0` and simplifies to `false`, which violates the algebra decision diagrams
+    // rely on. For this reason we ignore pre-release versions entirely when evaluating markers.
+    //
+    // Note that `python_version` cannot take on pre-release values as it is truncated to just the
+    // major and minor version segments. Thus using release-only specifiers is definitely necessary
+    // for `python_version` to fully simplify any ranges, such as `python_version > '3.9' or python_version <= '3.9'`,
+    // which is always `true` for `python_version`. For `python_full_version` however, this decision
+    // is a semantic change.
+    let mut release = &*version.release();
+
+    // Strip any trailing `0`s.
+    //
+    // The [`Version`] type ignores trailing `0`s for equality, but still preserves them in its
+    // [`Display`] output. We must normalize all versions by stripping trailing `0`s to remove the
+    // distinction between versions like `3.9` and `3.9.0`. Otherwise, their output would depend on
+    // which form was added to the global marker interner first.
+    //
+    // Note that we cannot strip trailing `0`s for star equality, as `==3.0.*` is different from `==3.*`.
+    if !operator.is_star() {
+        if let Some(end) = release.iter().rposition(|segment| *segment != 0) {
+            if end > 0 {
+                release = &release[..=end];
+            }
+        }
+    }
+
+    VersionSpecifier::from_version(operator, Version::new(release)).unwrap()
+}
+
 /// Returns the equivalent `python_full_version` specifier for a `python_version` specifier.
 ///
 /// Returns `Err` with a constant node if the equivalent comparison is always `true` or `false`.
 fn python_version_to_full_version(specifier: VersionSpecifier) -> Result<VersionSpecifier, NodeId> {
-    // Trailing zeroes matter only for (not-)equals-star and tilde-equals. This means that below
-    // the next two blocks, we can use the trimmed release as the release.
-    if specifier.operator().is_star() {
-        // Input          python_version  python_full_version
-        // ==3.*          3.*             3.*
-        // ==3.0.*        3.0             3.0.*
-        // ==3.0.0.*      3.0             3.0.*
-        // ==3.9.*        3.9             3.9.*
-        // ==3.9.0.*      3.9             3.9.*
-        // ==3.9.0.0.*    3.9             3.9.*
-        // ==3.9.1.*      FALSE           FALSE
-        // ==3.9.1.0.*    FALSE           FALSE
-        // ==3.9.1.0.0.*  FALSE           FALSE
-        return match &*specifier.version().release() {
-            // `3.*`
-            [_major] => Ok(specifier),
-            // Ex) `3.9.*`, `3.9.0.*`, or `3.9.0.0.*`
-            [major, minor, rest @ ..] if rest.iter().all(|x| *x == 0) => {
-                let python_version = Version::new([major, minor]);
-                // Unwrap safety: A star operator with two version segments is always valid.
-                Ok(VersionSpecifier::from_version(*specifier.operator(), python_version).unwrap())
-            }
-            // Ex) `3.9.1.*` or `3.9.0.1.*`
-            _ => Err(NodeId::FALSE),
-        };
-    }
-
-    if *specifier.operator() == Operator::TildeEqual {
-        // python_version  python_full_version
-        // ~=3             (not possible)
-        // ~= 3.0          >= 3.0, < 4.0
-        // ~= 3.9          >= 3.9, < 4.0
-        // ~= 3.9.0        == 3.9.*
-        // ~= 3.9.1        FALSE
-        // ~= 3.9.0.0      == 3.9.*
-        // ~= 3.9.0.1      FALSE
-        return match &*specifier.version().release() {
-            // Ex) `3.0`, `3.7`
-            [_major, _minor] => Ok(specifier),
-            // Ex) `3.9`, `3.9.0`, or `3.9.0.0`
-            [major, minor, rest @ ..] if rest.iter().all(|x| *x == 0) => {
-                let python_version = Version::new([major, minor]);
-                Ok(VersionSpecifier::equals_star_version(python_version))
-            }
-            // Ex) `3.9.1` or `3.9.0.1`
-            _ => Err(NodeId::FALSE),
-        };
-    }
-
    // Extract the major and minor version segments if the specifier contains exactly
    // those segments, or if it contains a major segment with an implied minor segment of `0`.
-    let major_minor = match *specifier.version().only_release_trimmed().release() {
+    let major_minor = match *specifier.version().release() {
+        // For star operators, we cannot add a trailing `0`.
+        //
+        // `python_version == 3.*` is equivalent to `python_full_version == 3.*`. Adding a
+        // trailing `0` would result in `python_version == 3.0.*`, which is incorrect.
+        [_major] if specifier.operator().is_star() => return Ok(specifier),
        // Add a trailing `0` for the minor version, which is implied.
        // For example, `python_version == 3` matches `3.0.1`, `3.0.2`, etc.
        [major] => Some((major, 0)),
@ -1619,10 +1614,9 @@ fn python_version_to_full_version(specifier: VersionSpecifier) -> Result<Version
                VersionSpecifier::less_than_version(Version::new([major, minor + 1]))
            }

-            Operator::EqualStar | Operator::NotEqualStar | Operator::TildeEqual => {
-                // Handled above.
-                unreachable!()
-            }
+            // `==3.7.*`, `!=3.7.*`, `~=3.7` already represent the equivalent `python_full_version`
+            // comparison.
+            Operator::EqualStar | Operator::NotEqualStar | Operator::TildeEqual => specifier,
        })
    } else {
        let [major, minor, ..] = *specifier.version().release() else {
@ -1630,14 +1624,13 @@ fn python_version_to_full_version(specifier: VersionSpecifier) -> Result<Version
        };

        Ok(match specifier.operator() {
-            // `python_version` cannot have more than two release segments, and we know
-            // that the following release segments aren't purely zeroes so equality is impossible.
-            Operator::Equal | Operator::ExactEqual => {
+            // `python_version` cannot have more than two release segments, so equality is impossible.
+            Operator::Equal | Operator::ExactEqual | Operator::EqualStar | Operator::TildeEqual => {
                return Err(NodeId::FALSE);
            }

            // Similarly, inequalities are always `true`.
-            Operator::NotEqual => return Err(NodeId::TRUE),
+            Operator::NotEqual | Operator::NotEqualStar => return Err(NodeId::TRUE),

            // `python_version {<,<=} 3.7.8` is equivalent to `python_full_version < 3.8`.
            Operator::LessThan | Operator::LessThanEqual => {
@ -1648,11 +1641,6 @@ fn python_version_to_full_version(specifier: VersionSpecifier) -> Result<Version
            Operator::GreaterThan | Operator::GreaterThanEqual => {
                VersionSpecifier::greater_than_equal_version(Version::new([major, minor + 1]))
            }
-
-            Operator::EqualStar | Operator::NotEqualStar | Operator::TildeEqual => {
-                // Handled above.
-                unreachable!()
-            }
        })
    }
 }
--- a/crates/uv-pep508/src/marker/simplify.rs
+++ b/crates/uv-pep508/src/marker/simplify.rs
@ -64,8 +64,8 @@ fn collect_dnf(
                    continue;
                }

-                // Detect whether the range for this edge can be simplified as a star specifier.
-                if let Some(specifier) = star_range_specifier(&range) {
+                // Detect whether the range for this edge can be simplified as a star inequality.
+                if let Some(specifier) = star_range_inequality(&range) {
                    path.push(MarkerExpression::Version {
                        key: marker.key().into(),
                        specifier,
@ -343,34 +343,22 @@ where
    Some(excluded)
 }

-/// Returns `Some` if the version range can be simplified as a star specifier.
+/// Returns `Some` if the version expression can be simplified as a star inequality with the given
+/// specifier.
 ///
-/// Only for the two bounds case not covered by [`VersionSpecifier::from_release_only_bounds`].
-///
-/// For negative ranges like `python_full_version < '3.8' or python_full_version >= '3.9'`,
-/// returns `!= '3.8.*'`.
-fn star_range_specifier(range: &Ranges<Version>) -> Option<VersionSpecifier> {
-    if range.iter().count() != 2 {
-        return None;
-    }
-    // Check for negative star range: two segments [(Unbounded, Excluded(v1)), (Included(v2), Unbounded)]
+/// For example, `python_full_version < '3.8' or python_full_version >= '3.9'` can be simplified to
+/// `python_full_version != '3.8.*'`.
+fn star_range_inequality(range: &Ranges<Version>) -> Option<VersionSpecifier> {
    let (b1, b2) = range.iter().collect_tuple()?;
-    if let ((Bound::Unbounded, Bound::Excluded(v1)), (Bound::Included(v2), Bound::Unbounded)) =
-        (b1, b2)
-    {
-        match *v1.only_release_trimmed().release() {
-            [major] if *v2.release() == [major, 1] => {
-                Some(VersionSpecifier::not_equals_star_version(Version::new([
-                    major, 0,
-                ])))
-            }
-            [major, minor] if *v2.release() == [major, minor + 1] => {
-                Some(VersionSpecifier::not_equals_star_version(v1.clone()))
-            }
-            _ => None,
+
+    match (b1, b2) {
+        ((Bound::Unbounded, Bound::Excluded(v1)), (Bound::Included(v2), Bound::Unbounded))
+            if v1.release().len() == 2
+                && *v2.release() == [v1.release()[0], v1.release()[1] + 1] =>
+        {
+            Some(VersionSpecifier::not_equals_star_version(v1.clone()))
        }
-    } else {
-        None
+        _ => None,
    }
 }

--- a/crates/uv-pep508/src/marker/tree.rs
+++ b/crates/uv-pep508/src/marker/tree.rs
@ -2271,13 +2271,13 @@ mod test {
    #[test]
    fn test_marker_simplification() {
        assert_false("python_version == '3.9.1'");
+        assert_false("python_version == '3.9.0.*'");
        assert_true("python_version != '3.9.1'");

-        // This is an edge case that happens to be supported, but is not critical to support.
-        assert_simplifies(
-            "python_version in '3.9.0'",
-            "python_full_version == '3.9.*'",
-        );
+        // Technically these is are valid substring comparison, but we do not allow them.
+        // e.g., using a version with patch components with `python_version` is considered
+        // impossible to satisfy since the value it is truncated at the minor version
+        assert_false("python_version in '3.9.0'");
        // e.g., using a version that is not PEP 440 compliant is considered arbitrary
        assert_true("python_version in 'foo'");
        // e.g., including `*` versions, which would require tracking a version specifier
@ -2287,25 +2287,16 @@ mod test {
        assert_true("python_version in '3.9,3.10'");
        assert_true("python_version in '3.9 or 3.10'");

-        // This is an edge case that happens to be supported, but is not critical to support.
-        assert_simplifies(
-            "python_version in '3.9 3.10.0 3.11'",
-            "python_full_version >= '3.9' and python_full_version < '3.12'",
-        );
+        // e.g, when one of the values cannot be true
+        // TODO(zanieb): This seems like a quirk of the `python_full_version` normalization, this
+        // should just act as though the patch version isn't present
+        assert_false("python_version in '3.9 3.10.0 3.11'");

        assert_simplifies("python_version == '3.9'", "python_full_version == '3.9.*'");
        assert_simplifies(
            "python_version == '3.9.0'",
            "python_full_version == '3.9.*'",
        );
-        assert_simplifies(
-            "python_version == '3.9.0.*'",
-            "python_full_version == '3.9.*'",
-        );
-        assert_simplifies(
-            "python_version == '3.*'",
-            "python_full_version >= '3' and python_full_version < '4'",
-        );

        // `<version> in`
        // e.g., when the range is not contiguous
@ -2537,68 +2528,6 @@ mod test {
        );
    }

-    #[test]
-    fn test_python_version_equal_star() {
-        // Input, equivalent with python_version, equivalent with python_full_version
-        let cases = [
-            ("3.*", "3.*", "3.*"),
-            ("3.0.*", "3.0", "3.0.*"),
-            ("3.0.0.*", "3.0", "3.0.*"),
-            ("3.9.*", "3.9", "3.9.*"),
-            ("3.9.0.*", "3.9", "3.9.*"),
-            ("3.9.0.0.*", "3.9", "3.9.*"),
-        ];
-        for (input, equal_python_version, equal_python_full_version) in cases {
-            assert_eq!(
-                m(&format!("python_version == '{input}'")),
-                m(&format!("python_version == '{equal_python_version}'")),
-                "{input} {equal_python_version}"
-            );
-            assert_eq!(
-                m(&format!("python_version == '{input}'")),
-                m(&format!(
-                    "python_full_version == '{equal_python_full_version}'"
-                )),
-                "{input} {equal_python_full_version}"
-            );
-        }
-
-        let cases_false = ["3.9.1.*", "3.9.1.0.*", "3.9.1.0.0.*"];
-        for input in cases_false {
-            assert!(
-                m(&format!("python_version == '{input}'")).is_false(),
-                "{input}"
-            );
-        }
-    }
-
-    #[test]
-    fn test_tilde_equal_normalization() {
-        assert_eq!(
-            m("python_version ~= '3.10.0'"),
-            m("python_version >= '3.10.0' and python_version < '3.11.0'")
-        );
-
-        // Two digit versions such as `python_version` get padded with a zero, so they can never
-        // match
-        assert_eq!(m("python_version ~= '3.10.1'"), MarkerTree::FALSE);
-
-        assert_eq!(
-            m("python_version ~= '3.10'"),
-            m("python_version >= '3.10' and python_version < '4.0'")
-        );
-
-        assert_eq!(
-            m("python_full_version ~= '3.10.0'"),
-            m("python_full_version >= '3.10.0' and python_full_version < '3.11.0'")
-        );
-
-        assert_eq!(
-            m("python_full_version ~= '3.10'"),
-            m("python_full_version >= '3.10' and python_full_version < '4.0'")
-        );
-    }
-
    /// This tests marker implication.
    ///
    /// Specifically, these test cases come from a [bug] where `foo` and `bar`
@ -3395,32 +3324,4 @@ mod test {
            ]
        );
    }
-
-    /// Case a: There is no version `3` (no trailing zero) in the interner yet.
-    #[test]
-    fn marker_normalization_a() {
-        let left_tree = m("python_version == '3.0.*'");
-        let left = left_tree.try_to_string().unwrap();
-        let right = "python_full_version == '3.0.*'";
-        assert_eq!(left, right, "{left} != {right}");
-    }
-
-    /// Case b: There is already a version `3` (no trailing zero) in the interner.
-    #[test]
-    fn marker_normalization_b() {
-        m("python_version >= '3' and python_version <= '3.0'");
-
-        let left_tree = m("python_version == '3.0.*'");
-        let left = left_tree.try_to_string().unwrap();
-        let right = "python_full_version == '3.0.*'";
-        assert_eq!(left, right, "{left} != {right}");
-    }
-
-    #[test]
-    fn marker_normalization_c() {
-        let left_tree = MarkerTree::from_str("python_version == '3.10.0.*'").unwrap();
-        let left = left_tree.try_to_string().unwrap();
-        let right = "python_full_version == '3.10.*'";
-        assert_eq!(left, right, "{left} != {right}");
-    }
 }
--- a/crates/uv-pep508/src/verbatim_url.rs
+++ b/crates/uv-pep508/src/verbatim_url.rs
@ -18,16 +18,11 @@ use uv_redacted::DisplaySafeUrl;
 use crate::Pep508Url;

 /// A wrapper around [`Url`] that preserves the original string.
-///
-/// The original string is not preserved after serialization/deserialization.
 #[derive(Debug, Clone, Eq)]
 pub struct VerbatimUrl {
    /// The parsed URL.
    url: DisplaySafeUrl,
    /// The URL as it was provided by the user.
-    ///
-    /// Even if originally set, this will be [`None`] after
-    /// serialization/deserialization.
    given: Option<ArcStr>,
 }

--- a/crates/uv-publish/src/lib.rs
+++ b/crates/uv-publish/src/lib.rs
@ -758,14 +758,6 @@ impl FormMetadata {
    }
 }

-impl<'a> IntoIterator for &'a FormMetadata {
-    type Item = &'a (&'a str, String);
-    type IntoIter = std::slice::Iter<'a, (&'a str, String)>;
-    fn into_iter(self) -> Self::IntoIter {
-        self.iter()
-    }
-}
-
 /// Build the upload request.
 ///
 /// Returns the request and the reporter progress bar id.
--- a/crates/uv-pypi-types/src/conflicts.rs
+++ b/crates/uv-pypi-types/src/conflicts.rs
@ -3,9 +3,7 @@ use petgraph::{
    graph::{DiGraph, NodeIndex},
 };
 use rustc_hash::{FxHashMap, FxHashSet};
-#[cfg(feature = "schemars")]
-use std::borrow::Cow;
-use std::{collections::BTreeSet, hash::Hash, rc::Rc};
+use std::{borrow::Cow, collections::BTreeSet, hash::Hash, rc::Rc};
 use uv_normalize::{ExtraName, GroupName, PackageName};

 use crate::dependency_groups::{DependencyGroupSpecifier, DependencyGroups};
--- a/crates/uv-pypi-types/src/identifier.rs
+++ b/crates/uv-pypi-types/src/identifier.rs
@ -1,5 +1,4 @@
 use serde::{Serialize, Serializer};
-#[cfg(feature = "schemars")]
 use std::borrow::Cow;
 use std::fmt::Display;
 use std::str::FromStr;
--- a/crates/uv-python/download-metadata.json
+++ b/crates/uv-python/download-metadata.json
--- a/crates/uv-python/src/downloads.rs
+++ b/crates/uv-python/src/downloads.rs
@ -12,7 +12,7 @@ use futures::TryStreamExt;
 use itertools::Itertools;
 use once_cell::sync::OnceCell;
 use owo_colors::OwoColorize;
-use reqwest_retry::{RetryError, RetryPolicy};
+use reqwest_retry::RetryPolicy;
 use serde::Deserialize;
 use thiserror::Error;
 use tokio::io::{AsyncRead, AsyncWriteExt, BufWriter, ReadBuf};
@ -111,33 +111,6 @@ pub enum Error {
    },
 }

-impl Error {
-    // Return the number of attempts that were made to complete this request before this error was
-    // returned. Note that e.g. 3 retries equates to 4 attempts.
-    //
-    // It's easier to do arithmetic with "attempts" instead of "retries", because if you have
-    // nested retry loops you can just add up all the attempts directly, while adding up the
-    // retries requires +1/-1 adjustments.
-    fn attempts(&self) -> u32 {
-        // Unfortunately different variants of `Error` track retry counts in different ways. We
-        // could consider unifying the variants we handle here in `Error::from_reqwest_middleware`
-        // instead, but both approaches will be fragile as new variants get added over time.
-        if let Error::NetworkErrorWithRetries { retries, .. } = self {
-            return retries + 1;
-        }
-        // TODO(jack): let-chains are stable as of Rust 1.88. We should use them here as soon as
-        // our rust-version is high enough.
-        if let Error::NetworkMiddlewareError(_, anyhow_error) = self {
-            if let Some(RetryError::WithRetries { retries, .. }) =
-                anyhow_error.downcast_ref::<RetryError>()
-            {
-                return retries + 1;
-            }
-        }
-        1
-    }
-}
-
 #[derive(Debug, PartialEq, Eq, Clone, Hash)]
 pub struct ManagedPythonDownload {
    key: PythonInstallationKey,
@ -722,8 +695,7 @@ impl ManagedPythonDownload {
        pypy_install_mirror: Option<&str>,
        reporter: Option<&dyn Reporter>,
    ) -> Result<DownloadResult, Error> {
-        let mut total_attempts = 0;
-        let mut retried_here = false;
+        let mut n_past_retries = 0;
        let start_time = SystemTime::now();
        let retry_policy = client.retry_policy();
        loop {
@ -738,41 +710,25 @@ impl ManagedPythonDownload {
                    reporter,
                )
                .await;
-            let result = match result {
-                Ok(download_result) => Ok(download_result),
-                Err(err) => {
-                    // Inner retry loops (e.g. `reqwest-retry` middleware) might make more than one
-                    // attempt per error we see here.
-                    total_attempts += err.attempts();
-                    // We currently interpret e.g. "3 retries" to mean we should make 4 attempts.
-                    let n_past_retries = total_attempts - 1;
-                    if is_extended_transient_error(&err) {
-                        let retry_decision = retry_policy.should_retry(start_time, n_past_retries);
-                        if let reqwest_retry::RetryDecision::Retry { execute_after } =
-                            retry_decision
-                        {
-                            debug!(
-                                "Transient failure while handling response for {}; retrying...",
-                                self.key()
-                            );
-                            let duration = execute_after
-                                .duration_since(SystemTime::now())
-                                .unwrap_or_else(|_| Duration::default());
-                            tokio::time::sleep(duration).await;
-                            retried_here = true;
-                            continue; // Retry.
-                        }
-                    }
-                    if retried_here {
-                        Err(Error::NetworkErrorWithRetries {
-                            err: Box::new(err),
-                            retries: n_past_retries,
-                        })
-                    } else {
-                        Err(err)
-                    }
+            if result
+                .as_ref()
+                .err()
+                .is_some_and(|err| is_extended_transient_error(err))
+            {
+                let retry_decision = retry_policy.should_retry(start_time, n_past_retries);
+                if let reqwest_retry::RetryDecision::Retry { execute_after } = retry_decision {
+                    debug!(
+                        "Transient failure while handling response for {}; retrying...",
+                        self.key()
+                    );
+                    let duration = execute_after
+                        .duration_since(SystemTime::now())
+                        .unwrap_or_else(|_| Duration::default());
+                    tokio::time::sleep(duration).await;
+                    n_past_retries += 1;
+                    continue;
                }
-            };
+            }
            return result;
        }
    }
--- a/crates/uv-python/src/interpreter.rs
+++ b/crates/uv-python/src/interpreter.rs
@ -967,31 +967,6 @@ impl InterpreterInfo {
    pub(crate) fn query_cached(executable: &Path, cache: &Cache) -> Result<Self, Error> {
        let absolute = std::path::absolute(executable)?;

-        // Provide a better error message if the link is broken or the file does not exist. Since
-        // `canonicalize_executable` does not resolve the file on Windows, we must re-use this logic
-        // for the subsequent metadata read as we may not have actually resolved the path.
-        let handle_io_error = |err: io::Error| -> Error {
-            if err.kind() == io::ErrorKind::NotFound {
-                // Check if it looks like a venv interpreter where the underlying Python
-                // installation was removed.
-                if absolute
-                    .symlink_metadata()
-                    .is_ok_and(|metadata| metadata.is_symlink())
-                {
-                    Error::BrokenSymlink(BrokenSymlink {
-                        path: executable.to_path_buf(),
-                        venv: uv_fs::is_virtualenv_executable(executable),
-                    })
-                } else {
-                    Error::NotFound(executable.to_path_buf())
-                }
-            } else {
-                err.into()
-            }
-        };
-
-        let canonical = canonicalize_executable(&absolute).map_err(handle_io_error)?;
-
        let cache_entry = cache.entry(
            CacheBucket::Interpreter,
            // Shard interpreter metadata by host architecture, operating system, and version, to
@ -1003,17 +978,33 @@ impl InterpreterInfo {
            )),
            // We use the absolute path for the cache entry to avoid cache collisions for relative
            // paths. But we don't want to query the executable with symbolic links resolved because
-            // that can change reported values, e.g., `sys.executable`. We include the canonical
-            // path in the cache entry as well, otherwise we can have cache collisions if an
-            // absolute path refers to different interpreters with matching ctimes, e.g., if you
-            // have a `.venv/bin/python` pointing to both Python 3.12 and Python 3.13 that were
-            // modified at the same time.
-            format!("{}.msgpack", cache_digest(&(&absolute, &canonical))),
+            // that can change reported values, e.g., `sys.executable`.
+            format!("{}.msgpack", cache_digest(&absolute)),
        );

        // We check the timestamp of the canonicalized executable to check if an underlying
        // interpreter has been modified.
-        let modified = Timestamp::from_path(canonical).map_err(handle_io_error)?;
+        let modified = canonicalize_executable(&absolute)
+            .and_then(Timestamp::from_path)
+            .map_err(|err| {
+                if err.kind() == io::ErrorKind::NotFound {
+                    // Check if it looks like a venv interpreter where the underlying Python
+                    // installation was removed.
+                    if absolute
+                        .symlink_metadata()
+                        .is_ok_and(|metadata| metadata.is_symlink())
+                    {
+                        Error::BrokenSymlink(BrokenSymlink {
+                            path: executable.to_path_buf(),
+                            venv: uv_fs::is_virtualenv_executable(executable),
+                        })
+                    } else {
+                        Error::NotFound(executable.to_path_buf())
+                    }
+                } else {
+                    err.into()
+                }
+            })?;

        // Read from the cache.
        if cache
@ -1025,7 +1016,7 @@ impl InterpreterInfo {
                    Ok(cached) => {
                        if cached.timestamp == modified {
                            trace!(
-                                "Found cached interpreter info for Python {}, skipping query of: {}",
+                                "Cached interpreter info for Python {}, skipping probing: {}",
                                cached.data.markers.python_full_version(),
                                executable.user_display()
                            );
--- a/crates/uv-python/src/platform.rs
+++ b/crates/uv-python/src/platform.rs
@ -43,36 +43,15 @@ impl Ord for Arch {
            return self.variant.cmp(&other.variant);
        }

-        // For the time being, manually make aarch64 windows disfavored
-        // on its own host platform, because most packages don't have wheels for
-        // aarch64 windows, making emulation more useful than native execution!
-        //
-        // The reason we do this in "sorting" and not "supports" is so that we don't
-        // *refuse* to use an aarch64 windows pythons if they happen to be installed
-        // and nothing else is available.
-        //
-        // Similarly if someone manually requests an aarch64 windows install, we
-        // should respect that request (this is the way users should "override"
-        // this behaviour).
-        let preferred = if cfg!(all(windows, target_arch = "aarch64")) {
-            Arch {
-                family: target_lexicon::Architecture::X86_64,
-                variant: None,
-            }
-        } else {
-            // Prefer native architectures
-            Arch::from_env()
-        };
+        let native = Arch::from_env();

-        match (
-            self.family == preferred.family,
-            other.family == preferred.family,
-        ) {
+        // Prefer native architectures
+        match (self.family == native.family, other.family == native.family) {
            (true, true) => unreachable!(),
            (true, false) => std::cmp::Ordering::Less,
            (false, true) => std::cmp::Ordering::Greater,
            (false, false) => {
-                // Both non-preferred, fallback to lexicographic order
+                // Both non-native, fallback to lexicographic order
                self.family.to_string().cmp(&other.family.to_string())
            }
        }
--- a/crates/uv-python/src/python_version.rs
+++ b/crates/uv-python/src/python_version.rs
@ -1,4 +1,3 @@
-#[cfg(feature = "schemars")]
 use std::borrow::Cow;
 use std::fmt::{Display, Formatter};
 use std::ops::Deref;
--- a/crates/uv-python/src/sysconfig/generated_mappings.rs
+++ b/crates/uv-python/src/sysconfig/generated_mappings.rs
@ -1,7 +1,7 @@
 //! DO NOT EDIT
 //!
 //! Generated with `cargo run dev generate-sysconfig-metadata`
-//! Targets from <https://github.com/astral-sh/python-build-standalone/blob/20250702/cpython-unix/targets.yml>
+//! Targets from <https://github.com/astral-sh/python-build-standalone/blob/20250626/cpython-unix/targets.yml>
 //!
 #![allow(clippy::all)]
 #![cfg_attr(any(), rustfmt::skip)]
@ -15,6 +15,7 @@ use crate::sysconfig::replacements::{ReplacementEntry, ReplacementMode};
 pub(crate) static DEFAULT_VARIABLE_UPDATES: LazyLock<BTreeMap<String, Vec<ReplacementEntry>>> = LazyLock::new(|| {
    BTreeMap::from_iter([
        ("BLDSHARED".to_string(), vec![
+            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/aarch64-linux-gnu-gcc".to_string() }, to: "cc".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/arm-linux-gnueabi-gcc".to_string() }, to: "cc".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/arm-linux-gnueabihf-gcc".to_string() }, to: "cc".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/mips-linux-gnu-gcc".to_string() }, to: "cc".to_string() },
@ -27,6 +28,7 @@ pub(crate) static DEFAULT_VARIABLE_UPDATES: LazyLock<BTreeMap<String, Vec<Replac
            ReplacementEntry { mode: ReplacementMode::Partial { from: "musl-clang".to_string() }, to: "cc".to_string() },
        ]),
        ("CC".to_string(), vec![
+            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/aarch64-linux-gnu-gcc".to_string() }, to: "cc".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/arm-linux-gnueabi-gcc".to_string() }, to: "cc".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/arm-linux-gnueabihf-gcc".to_string() }, to: "cc".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/mips-linux-gnu-gcc".to_string() }, to: "cc".to_string() },
@ -39,6 +41,7 @@ pub(crate) static DEFAULT_VARIABLE_UPDATES: LazyLock<BTreeMap<String, Vec<Replac
            ReplacementEntry { mode: ReplacementMode::Partial { from: "musl-clang".to_string() }, to: "cc".to_string() },
        ]),
        ("CXX".to_string(), vec![
+            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/aarch64-linux-gnu-g++".to_string() }, to: "c++".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/arm-linux-gnueabi-g++".to_string() }, to: "c++".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/arm-linux-gnueabihf-g++".to_string() }, to: "c++".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/mips-linux-gnu-g++".to_string() }, to: "c++".to_string() },
@ -50,6 +53,7 @@ pub(crate) static DEFAULT_VARIABLE_UPDATES: LazyLock<BTreeMap<String, Vec<Replac
            ReplacementEntry { mode: ReplacementMode::Partial { from: "clang++".to_string() }, to: "c++".to_string() },
        ]),
        ("LDCXXSHARED".to_string(), vec![
+            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/aarch64-linux-gnu-g++".to_string() }, to: "c++".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/arm-linux-gnueabi-g++".to_string() }, to: "c++".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/arm-linux-gnueabihf-g++".to_string() }, to: "c++".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/mips-linux-gnu-g++".to_string() }, to: "c++".to_string() },
@ -61,6 +65,7 @@ pub(crate) static DEFAULT_VARIABLE_UPDATES: LazyLock<BTreeMap<String, Vec<Replac
            ReplacementEntry { mode: ReplacementMode::Partial { from: "clang++".to_string() }, to: "c++".to_string() },
        ]),
        ("LDSHARED".to_string(), vec![
+            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/aarch64-linux-gnu-gcc".to_string() }, to: "cc".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/arm-linux-gnueabi-gcc".to_string() }, to: "cc".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/arm-linux-gnueabihf-gcc".to_string() }, to: "cc".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/mips-linux-gnu-gcc".to_string() }, to: "cc".to_string() },
@ -73,6 +78,7 @@ pub(crate) static DEFAULT_VARIABLE_UPDATES: LazyLock<BTreeMap<String, Vec<Replac
            ReplacementEntry { mode: ReplacementMode::Partial { from: "musl-clang".to_string() }, to: "cc".to_string() },
        ]),
        ("LINKCC".to_string(), vec![
+            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/aarch64-linux-gnu-gcc".to_string() }, to: "cc".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/arm-linux-gnueabi-gcc".to_string() }, to: "cc".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/arm-linux-gnueabihf-gcc".to_string() }, to: "cc".to_string() },
            ReplacementEntry { mode: ReplacementMode::Partial { from: "/usr/bin/mips-linux-gnu-gcc".to_string() }, to: "cc".to_string() },
--- a/crates/uv-python/src/sysconfig/mod.rs
+++ b/crates/uv-python/src/sysconfig/mod.rs
@ -349,7 +349,7 @@ mod tests {

        // Cross-compiles use GNU
        let sysconfigdata = [
-            ("CC", "/usr/bin/riscv64-linux-gnu-gcc"),
+            ("CC", "/usr/bin/aarch64-linux-gnu-gcc"),
            ("CXX", "/usr/bin/x86_64-linux-gnu-g++"),
        ]
        .into_iter()
--- a/crates/uv-requirements-txt/src/snapshots/uv_requirements_txttestline-endings-poetry-with-hashes.txt.snap
+++ b/crates/uv-requirements-txt/src/snapshots/uv_requirements_txttestline-endings-poetry-with-hashes.txt.snap
@ -1,7 +1,6 @@
 ---
 source: crates/uv-requirements-txt/src/lib.rs
 expression: actual
-snapshot_kind: text
 ---
 RequirementsTxt {
    requirements: [
@ -24,7 +23,7 @@ RequirementsTxt {
                            ),
                        ),
                    ),
-                    marker: python_full_version >= '3.8' and python_full_version < '4',
+                    marker: python_full_version >= '3.8' and python_full_version < '4.0',
                    origin: Some(
                        File(
                            "<REQUIREMENTS_DIR>/poetry-with-hashes.txt",
@ -55,7 +54,7 @@ RequirementsTxt {
                            ),
                        ),
                    ),
-                    marker: python_full_version >= '3.8' and python_full_version < '4',
+                    marker: python_full_version >= '3.8' and python_full_version < '4.0',
                    origin: Some(
                        File(
                            "<REQUIREMENTS_DIR>/poetry-with-hashes.txt",
@ -86,7 +85,7 @@ RequirementsTxt {
                            ),
                        ),
                    ),
-                    marker: python_full_version >= '3.8' and python_full_version < '4' and sys_platform == 'win32',
+                    marker: python_full_version >= '3.8' and python_full_version < '4.0' and sys_platform == 'win32',
                    origin: Some(
                        File(
                            "<REQUIREMENTS_DIR>/poetry-with-hashes.txt",
@ -117,7 +116,7 @@ RequirementsTxt {
                            ),
                        ),
                    ),
-                    marker: python_full_version >= '3.8' and python_full_version < '4',
+                    marker: python_full_version >= '3.8' and python_full_version < '4.0',
                    origin: Some(
                        File(
                            "<REQUIREMENTS_DIR>/poetry-with-hashes.txt",
@ -149,7 +148,7 @@ RequirementsTxt {
                            ),
                        ),
                    ),
-                    marker: python_full_version >= '3.8' and python_full_version < '4',
+                    marker: python_full_version >= '3.8' and python_full_version < '4.0',
                    origin: Some(
                        File(
                            "<REQUIREMENTS_DIR>/poetry-with-hashes.txt",
--- a/crates/uv-requirements-txt/src/snapshots/uv_requirements_txttestparse-poetry-with-hashes.txt.snap
+++ b/crates/uv-requirements-txt/src/snapshots/uv_requirements_txttestparse-poetry-with-hashes.txt.snap
@ -1,7 +1,6 @@
 ---
 source: crates/uv-requirements-txt/src/lib.rs
 expression: actual
-snapshot_kind: text
 ---
 RequirementsTxt {
    requirements: [
@ -24,7 +23,7 @@ RequirementsTxt {
                            ),
                        ),
                    ),
-                    marker: python_full_version >= '3.8' and python_full_version < '4',
+                    marker: python_full_version >= '3.8' and python_full_version < '4.0',
                    origin: Some(
                        File(
                            "<REQUIREMENTS_DIR>/poetry-with-hashes.txt",
@ -55,7 +54,7 @@ RequirementsTxt {
                            ),
                        ),
                    ),
-                    marker: python_full_version >= '3.8' and python_full_version < '4',
+                    marker: python_full_version >= '3.8' and python_full_version < '4.0',
                    origin: Some(
                        File(
                            "<REQUIREMENTS_DIR>/poetry-with-hashes.txt",
@ -86,7 +85,7 @@ RequirementsTxt {
                            ),
                        ),
                    ),
-                    marker: python_full_version >= '3.8' and python_full_version < '4' and sys_platform == 'win32',
+                    marker: python_full_version >= '3.8' and python_full_version < '4.0' and sys_platform == 'win32',
                    origin: Some(
                        File(
                            "<REQUIREMENTS_DIR>/poetry-with-hashes.txt",
@ -117,7 +116,7 @@ RequirementsTxt {
                            ),
                        ),
                    ),
-                    marker: python_full_version >= '3.8' and python_full_version < '4',
+                    marker: python_full_version >= '3.8' and python_full_version < '4.0',
                    origin: Some(
                        File(
                            "<REQUIREMENTS_DIR>/poetry-with-hashes.txt",
@ -149,7 +148,7 @@ RequirementsTxt {
                            ),
                        ),
                    ),
-                    marker: python_full_version >= '3.8' and python_full_version < '4',
+                    marker: python_full_version >= '3.8' and python_full_version < '4.0',
                    origin: Some(
                        File(
                            "<REQUIREMENTS_DIR>/poetry-with-hashes.txt",
--- a/crates/uv-resolver/src/candidate_selector.rs
+++ b/crates/uv-resolver/src/candidate_selector.rs
@ -13,9 +13,10 @@ use uv_normalize::PackageName;
 use uv_pep440::Version;
 use uv_types::InstalledPackagesProvider;

-use crate::preferences::{Entry, PreferenceSource, Preferences};
+use crate::preferences::{Entry, Preferences};
 use crate::prerelease::{AllowPrerelease, PrereleaseStrategy};
 use crate::resolution_mode::ResolutionStrategy;
+use crate::universal_marker::UniversalMarker;
 use crate::version_map::{VersionMap, VersionMapDistHandle};
 use crate::{Exclusions, Manifest, Options, ResolverEnvironment};

@ -187,7 +188,7 @@ impl CandidateSelector {
                if index.is_some_and(|index| !entry.index().matches(index)) {
                    return None;
                }
-                Either::Left(std::iter::once((entry.pin().version(), entry.source())))
+                Either::Left(std::iter::once((entry.marker(), entry.pin().version())))
            }
            [..] => {
                type Entries<'a> = SmallVec<[&'a Entry; 3]>;
@ -218,7 +219,7 @@ impl CandidateSelector {
                Either::Right(
                    preferences
                        .into_iter()
-                        .map(|entry| (entry.pin().version(), entry.source())),
+                        .map(|entry| (entry.marker(), entry.pin().version())),
                )
            }
        };
@ -237,7 +238,7 @@ impl CandidateSelector {
    /// Return the first preference that satisfies the current range and is allowed.
    fn get_preferred_from_iter<'a, InstalledPackages: InstalledPackagesProvider>(
        &'a self,
-        preferences: impl Iterator<Item = (&'a Version, PreferenceSource)>,
+        preferences: impl Iterator<Item = (&'a UniversalMarker, &'a Version)>,
        package_name: &'a PackageName,
        range: &Range<Version>,
        version_maps: &'a [VersionMap],
@ -245,7 +246,7 @@ impl CandidateSelector {
        reinstall: bool,
        env: &ResolverEnvironment,
    ) -> Option<Candidate<'a>> {
-        for (version, source) in preferences {
+        for (marker, version) in preferences {
            // Respect the version range for this requirement.
            if !range.contains(version) {
                continue;
@ -289,14 +290,9 @@ impl CandidateSelector {
                let allow = match self.prerelease_strategy.allows(package_name, env) {
                    AllowPrerelease::Yes => true,
                    AllowPrerelease::No => false,
-                    // If the pre-release was provided via an existing file, rather than from the
-                    // current solve, accept it unless pre-releases are completely banned.
-                    AllowPrerelease::IfNecessary => match source {
-                        PreferenceSource::Resolver => false,
-                        PreferenceSource::Lock
-                        | PreferenceSource::Environment
-                        | PreferenceSource::RequirementsTxt => true,
-                    },
+                    // If the pre-release is "global" (i.e., provided via a lockfile, rather than
+                    // a fork), accept it unless pre-releases are completely banned.
+                    AllowPrerelease::IfNecessary => marker.is_true(),
                };
                if !allow {
                    continue;
--- a/crates/uv-resolver/src/error.rs
+++ b/crates/uv-resolver/src/error.rs
@ -3,7 +3,6 @@ use std::fmt::Formatter;
 use std::sync::Arc;

 use indexmap::IndexSet;
-use itertools::Itertools;
 use owo_colors::OwoColorize;
 use pubgrub::{
    DefaultStringReporter, DerivationTree, Derived, External, Range, Ranges, Reporter, Term,
@ -18,8 +17,6 @@ use uv_normalize::{ExtraName, InvalidNameError, PackageName};
 use uv_pep440::{LocalVersionSlice, LowerBound, Version, VersionSpecifier};
 use uv_pep508::{MarkerEnvironment, MarkerExpression, MarkerTree, MarkerValueVersion};
 use uv_platform_tags::Tags;
-use uv_pypi_types::ParsedUrl;
-use uv_redacted::DisplaySafeUrl;
 use uv_static::EnvVars;

 use crate::candidate_selector::CandidateSelector;
@ -59,14 +56,11 @@ pub enum ResolveError {
        } else {
            format!(" in {env}")
        },
-        urls.iter()
-            .map(|url| format!("{}{}", DisplaySafeUrl::from(url.clone()), if url.is_editable() { " (editable)" } else { "" }))
-            .collect::<Vec<_>>()
-            .join("\n- ")
+        urls.join("\n- "),
    )]
    ConflictingUrls {
        package_name: PackageName,
-        urls: Vec<ParsedUrl>,
+        urls: Vec<String>,
        env: ResolverEnvironment,
    },

@ -77,14 +71,11 @@ pub enum ResolveError {
        } else {
            format!(" in {env}")
        },
-        indexes.iter()
-            .map(std::string::ToString::to_string)
-            .collect::<Vec<_>>()
-            .join("\n- ")
+        indexes.join("\n- "),
    )]
    ConflictingIndexesForEnvironment {
        package_name: PackageName,
-        indexes: Vec<IndexUrl>,
+        indexes: Vec<String>,
        env: ResolverEnvironment,
    },

@ -157,7 +148,7 @@ impl<T> From<tokio::sync::mpsc::error::SendError<T>> for ResolveError {
    }
 }

-pub type ErrorTree = DerivationTree<PubGrubPackage, Range<Version>, UnavailableReason>;
+pub(crate) type ErrorTree = DerivationTree<PubGrubPackage, Range<Version>, UnavailableReason>;

 /// A wrapper around [`pubgrub::error::NoSolutionError`] that displays a resolution failure report.
 pub struct NoSolutionError {
@ -368,11 +359,6 @@ impl NoSolutionError {
        NoSolutionHeader::new(self.env.clone())
    }

-    /// Get the conflict derivation tree for external analysis
-    pub fn derivation_tree(&self) -> &ErrorTree {
-        &self.error
-    }
-
    /// Hint at limiting the resolver environment if universal resolution failed for a target
    /// that is not the current platform or not the current Python version.
    fn hint_disjoint_targets(&self, f: &mut Formatter) -> std::fmt::Result {
@ -410,15 +396,6 @@ impl NoSolutionError {
        }
        Ok(())
    }
-
-    /// Get the packages that are involved in this error.
-    pub fn packages(&self) -> impl Iterator<Item = &PackageName> {
-        self.error
-            .packages()
-            .into_iter()
-            .filter_map(|p| p.name())
-            .unique()
-    }
 }

 impl std::fmt::Debug for NoSolutionError {
--- a/crates/uv-resolver/src/exclude_newer.rs
+++ b/crates/uv-resolver/src/exclude_newer.rs
@ -1,6 +1,4 @@
-#[cfg(feature = "schemars")]
-use std::borrow::Cow;
-use std::str::FromStr;
+use std::{borrow::Cow, str::FromStr};

 use jiff::{Timestamp, ToSpan, tz::TimeZone};

--- a/crates/uv-resolver/src/fork_indexes.rs
+++ b/crates/uv-resolver/src/fork_indexes.rs
@ -24,7 +24,7 @@ impl ForkIndexes {
    ) -> Result<(), ResolveError> {
        if let Some(previous) = self.0.insert(package_name.clone(), index.clone()) {
            if &previous != index {
-                let mut conflicts = vec![previous.url, index.url.clone()];
+                let mut conflicts = vec![previous.url.to_string(), index.url.to_string()];
                conflicts.sort();
                return Err(ResolveError::ConflictingIndexesForEnvironment {
                    package_name: package_name.clone(),
--- a/crates/uv-resolver/src/fork_urls.rs
+++ b/crates/uv-resolver/src/fork_urls.rs
@ -2,6 +2,7 @@ use std::collections::hash_map::Entry;

 use rustc_hash::FxHashMap;

+use uv_distribution_types::Verbatim;
 use uv_normalize::PackageName;
 use uv_pypi_types::VerbatimParsedUrl;

@ -33,8 +34,10 @@ impl ForkUrls {
        match self.0.entry(package_name.clone()) {
            Entry::Occupied(previous) => {
                if previous.get() != url {
-                    let mut conflicting_url =
-                        vec![previous.get().parsed_url.clone(), url.parsed_url.clone()];
+                    let mut conflicting_url = vec![
+                        previous.get().verbatim.verbatim().to_string(),
+                        url.verbatim.verbatim().to_string(),
+                    ];
                    conflicting_url.sort();
                    return Err(ResolveError::ConflictingUrls {
                        package_name: package_name.clone(),
--- a/crates/uv-resolver/src/lib.rs
+++ b/crates/uv-resolver/src/lib.rs
@ -1,5 +1,5 @@
 pub use dependency_mode::DependencyMode;
-pub use error::{ErrorTree, NoSolutionError, NoSolutionHeader, ResolveError, SentinelRange};
+pub use error::{NoSolutionError, NoSolutionHeader, ResolveError, SentinelRange};
 pub use exclude_newer::ExcludeNewer;
 pub use exclusions::Exclusions;
 pub use flat_index::{FlatDistributions, FlatIndex};
@ -54,7 +54,7 @@ mod options;
 mod pins;
 mod preferences;
 mod prerelease;
-pub mod pubgrub;
+mod pubgrub;
 mod python_requirement;
 mod redirect;
 mod resolution;
--- a/crates/uv-resolver/src/preferences.rs
+++ b/crates/uv-resolver/src/preferences.rs
@ -34,8 +34,6 @@ pub struct Preference {
    /// is part of, otherwise `None`.
    fork_markers: Vec<UniversalMarker>,
    hashes: HashDigests,
-    /// The source of the preference.
-    source: PreferenceSource,
 }

 impl Preference {
@ -75,7 +73,6 @@ impl Preference {
                .map(String::as_str)
                .map(HashDigest::from_str)
                .collect::<Result<_, _>>()?,
-            source: PreferenceSource::RequirementsTxt,
        }))
    }

@ -94,7 +91,6 @@ impl Preference {
            index: PreferenceIndex::from(package.index(install_path)?),
            fork_markers: package.fork_markers().to_vec(),
            hashes: HashDigests::empty(),
-            source: PreferenceSource::Lock,
        }))
    }

@ -116,7 +112,6 @@ impl Preference {
            // `pylock.toml` doesn't have fork annotations.
            fork_markers: vec![],
            hashes: HashDigests::empty(),
-            source: PreferenceSource::Lock,
        }))
    }

@ -132,7 +127,6 @@ impl Preference {
            index: PreferenceIndex::Any,
            fork_markers: vec![],
            hashes: HashDigests::empty(),
-            source: PreferenceSource::Environment,
        })
    }

@ -177,24 +171,11 @@ impl From<Option<IndexUrl>> for PreferenceIndex {
    }
 }

-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(crate) enum PreferenceSource {
-    /// The preference is from an installed package in the environment.
-    Environment,
-    /// The preference is from a `uv.ock` file.
-    Lock,
-    /// The preference is from a `requirements.txt` file.
-    RequirementsTxt,
-    /// The preference is from the current solve.
-    Resolver,
-}
-
 #[derive(Debug, Clone)]
 pub(crate) struct Entry {
    marker: UniversalMarker,
    index: PreferenceIndex,
    pin: Pin,
-    source: PreferenceSource,
 }

 impl Entry {
@ -212,11 +193,6 @@ impl Entry {
    pub(crate) fn pin(&self) -> &Pin {
        &self.pin
    }
-
-    /// Return the source of the entry.
-    pub(crate) fn source(&self) -> PreferenceSource {
-        self.source
-    }
 }

 /// A set of pinned packages that should be preserved during resolution, if possible.
@ -269,7 +245,6 @@ impl Preferences {
                        version: preference.version,
                        hashes: preference.hashes,
                    },
-                    source: preference.source,
                });
            } else {
                for fork_marker in preference.fork_markers {
@ -280,7 +255,6 @@ impl Preferences {
                            version: preference.version.clone(),
                            hashes: preference.hashes.clone(),
                        },
-                        source: preference.source,
                    });
                }
            }
@ -296,13 +270,11 @@ impl Preferences {
        index: Option<IndexUrl>,
        markers: UniversalMarker,
        pin: impl Into<Pin>,
-        source: PreferenceSource,
    ) {
        self.0.entry(package_name).or_default().push(Entry {
            marker: markers,
            index: PreferenceIndex::from(index),
            pin: pin.into(),
-            source,
        });
    }

--- a/crates/uv-resolver/src/pubgrub/mod.rs
+++ b/crates/uv-resolver/src/pubgrub/mod.rs
@ -1,6 +1,6 @@
 pub(crate) use crate::pubgrub::dependencies::PubGrubDependency;
 pub(crate) use crate::pubgrub::distribution::PubGrubDistribution;
-pub use crate::pubgrub::package::{PubGrubPackage, PubGrubPackageInner, PubGrubPython};
+pub(crate) use crate::pubgrub::package::{PubGrubPackage, PubGrubPackageInner, PubGrubPython};
 pub(crate) use crate::pubgrub::priority::{PubGrubPriorities, PubGrubPriority, PubGrubTiebreaker};
 pub(crate) use crate::pubgrub::report::PubGrubReportFormatter;

--- a/crates/uv-resolver/src/pubgrub/package.rs
+++ b/crates/uv-resolver/src/pubgrub/package.rs
@ -9,7 +9,7 @@ use crate::python_requirement::PythonRequirement;

 /// [`Arc`] wrapper around [`PubGrubPackageInner`] to make cloning (inside PubGrub) cheap.
 #[derive(Debug, Clone, Eq, Hash, PartialEq, PartialOrd, Ord)]
-pub struct PubGrubPackage(Arc<PubGrubPackageInner>);
+pub(crate) struct PubGrubPackage(Arc<PubGrubPackageInner>);

 impl Deref for PubGrubPackage {
    type Target = PubGrubPackageInner;
@ -39,7 +39,7 @@ impl From<PubGrubPackageInner> for PubGrubPackage {
 ///    package (e.g., `black[colorama]`), and mark it as a dependency of the real package (e.g.,
 ///    `black`). We then discard the virtual packages at the end of the resolution process.
 #[derive(Debug, Clone, Eq, Hash, PartialEq, PartialOrd, Ord)]
-pub enum PubGrubPackageInner {
+pub(crate) enum PubGrubPackageInner {
    /// The root package, which is used to start the resolution process.
    Root(Option<PackageName>),
    /// A Python version.
@ -295,7 +295,7 @@ impl PubGrubPackage {
 }

 #[derive(Debug, Copy, Clone, Eq, PartialEq, PartialOrd, Hash, Ord)]
-pub enum PubGrubPython {
+pub(crate) enum PubGrubPython {
    /// The Python version installed in the current environment.
    Installed,
    /// The Python version for which dependencies are being resolved.
--- a/crates/uv-resolver/src/resolver/availability.rs
+++ b/crates/uv-resolver/src/resolver/availability.rs
@ -7,7 +7,7 @@ use uv_platform_tags::{AbiTag, Tags};

 /// The reason why a package or a version cannot be used.
 #[derive(Debug, Clone, Eq, PartialEq)]
-pub enum UnavailableReason {
+pub(crate) enum UnavailableReason {
    /// The entire package cannot be used.
    Package(UnavailablePackage),
    /// A single version cannot be used.
@ -29,7 +29,7 @@ impl Display for UnavailableReason {
 /// Most variant are from [`MetadataResponse`] without the error source, since we don't format
 /// the source and we want to merge unavailable messages across versions.
 #[derive(Debug, Clone, Eq, PartialEq)]
-pub enum UnavailableVersion {
+pub(crate) enum UnavailableVersion {
    /// Version is incompatible because it has no usable distributions
    IncompatibleDist(IncompatibleDist),
    /// The wheel metadata was found, but could not be parsed.
@ -123,7 +123,7 @@ impl From<&MetadataUnavailable> for UnavailableVersion {

 /// The package is unavailable and cannot be used.
 #[derive(Debug, Clone, Eq, PartialEq)]
-pub enum UnavailablePackage {
+pub(crate) enum UnavailablePackage {
    /// Index lookups were disabled (i.e., `--no-index`) and the package was not found in a flat index (i.e. from `--find-links`).
    NoIndex,
    /// Network requests were disabled (i.e., `--offline`), and the package was not found in the cache.
--- a/crates/uv-resolver/src/resolver/mod.rs
+++ b/crates/uv-resolver/src/resolver/mod.rs
@ -47,7 +47,7 @@ use crate::fork_strategy::ForkStrategy;
 use crate::fork_urls::ForkUrls;
 use crate::manifest::Manifest;
 use crate::pins::FilePins;
-use crate::preferences::{PreferenceSource, Preferences};
+use crate::preferences::Preferences;
 use crate::pubgrub::{
    PubGrubDependency, PubGrubDistribution, PubGrubPackage, PubGrubPackageInner, PubGrubPriorities,
    PubGrubPython,
@ -447,7 +447,6 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
                                            .try_universal_markers()
                                            .unwrap_or(UniversalMarker::TRUE),
                                        version.clone(),
-                                        PreferenceSource::Resolver,
                                    );
                                }
                            }
--- a/crates/uv-resolver/src/resolver/urls.rs
+++ b/crates/uv-resolver/src/resolver/urls.rs
@ -4,6 +4,7 @@ use same_file::is_same_file;
 use tracing::debug;

 use uv_cache_key::CanonicalUrl;
+use uv_distribution_types::Verbatim;
 use uv_git::GitResolver;
 use uv_normalize::PackageName;
 use uv_pep508::{MarkerTree, VerbatimUrl};
@ -169,8 +170,8 @@ impl Urls {
        let [allowed_url] = matching_urls.as_slice() else {
            let mut conflicting_urls: Vec<_> = matching_urls
                .into_iter()
-                .map(|parsed_url| parsed_url.parsed_url.clone())
-                .chain(std::iter::once(parsed_url.clone()))
+                .map(|parsed_url| parsed_url.verbatim.verbatim().to_string())
+                .chain(std::iter::once(verbatim_url.verbatim().to_string()))
                .collect();
            conflicting_urls.sort();
            return Err(ResolveError::ConflictingUrls {
--- a/crates/uv-types/Cargo.toml
+++ b/crates/uv-types/Cargo.toml
@ -31,7 +31,6 @@ uv-redacted = { workspace = true }
 uv-workspace = { workspace = true }

 anyhow = { workspace = true }
-dashmap = { workspace = true }
 rustc-hash = { workspace = true }
 thiserror = { workspace = true }

--- a/crates/uv-types/src/builds.rs
+++ b/crates/uv-types/src/builds.rs
@ -1,9 +1,3 @@
-use std::path::Path;
-use std::sync::Arc;
-
-use dashmap::DashMap;
-
-use uv_configuration::{BuildKind, SourceStrategy};
 use uv_pep508::PackageName;
 use uv_python::PythonEnvironment;

@ -43,42 +37,3 @@ impl BuildIsolation<'_> {
        }
    }
 }
-
-/// A key for the build cache, which includes the interpreter, source root, subdirectory, source
-/// strategy, and build kind.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct BuildKey {
-    pub base_python: Box<Path>,
-    pub source_root: Box<Path>,
-    pub subdirectory: Option<Box<Path>>,
-    pub source_strategy: SourceStrategy,
-    pub build_kind: BuildKind,
-}
-
-/// An arena of in-process builds.
-#[derive(Debug)]
-pub struct BuildArena<T>(Arc<DashMap<BuildKey, T>>);
-
-impl<T> Default for BuildArena<T> {
-    fn default() -> Self {
-        Self(Arc::new(DashMap::new()))
-    }
-}
-
-impl<T> Clone for BuildArena<T> {
-    fn clone(&self) -> Self {
-        Self(self.0.clone())
-    }
-}
-
-impl<T> BuildArena<T> {
-    /// Insert a build entry into the arena.
-    pub fn insert(&self, key: BuildKey, value: T) {
-        self.0.insert(key, value);
-    }
-
-    /// Remove a build entry from the arena.
-    pub fn remove(&self, key: &BuildKey) -> Option<T> {
-        self.0.remove(key).map(|entry| entry.1)
-    }
-}
--- a/crates/uv-types/src/traits.rs
+++ b/crates/uv-types/src/traits.rs
@ -18,8 +18,6 @@ use uv_pep508::PackageName;
 use uv_python::{Interpreter, PythonEnvironment};
 use uv_workspace::WorkspaceCache;

-use crate::BuildArena;
-
 ///  Avoids cyclic crate dependencies between resolver, installer and builder.
 ///
 /// To resolve the dependencies of a packages, we may need to build one or more source
@ -69,9 +67,6 @@ pub trait BuildContext {
    /// Return a reference to the Git resolver.
    fn git(&self) -> &GitResolver;

-    /// Return a reference to the build arena.
-    fn build_arena(&self) -> &BuildArena<Self::SourceDistBuilder>;
-
    /// Return a reference to the discovered registry capabilities.
    fn capabilities(&self) -> &IndexCapabilities;

@ -185,13 +180,13 @@ pub trait InstalledPackagesProvider: Clone + Send + Sync + 'static {
 pub struct EmptyInstalledPackages;

 impl InstalledPackagesProvider for EmptyInstalledPackages {
-    fn iter(&self) -> impl Iterator<Item = &InstalledDist> {
-        std::iter::empty()
-    }
-
    fn get_packages(&self, _name: &PackageName) -> Vec<&InstalledDist> {
        Vec::new()
    }
+
+    fn iter(&self) -> impl Iterator<Item = &InstalledDist> {
+        std::iter::empty()
+    }
 }

 /// [`anyhow::Error`]-like wrapper type for [`BuildDispatch`] method return values, that also makes
--- a/crates/uv-version/Cargo.toml
+++ b/crates/uv-version/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "uv-version"
-version = "0.7.19"
+version = "0.7.17"
 edition = { workspace = true }
 rust-version = { workspace = true }
 homepage = { workspace = true }
--- a/crates/uv-workspace/src/pyproject.rs
+++ b/crates/uv-workspace/src/pyproject.rs
@ -6,7 +6,6 @@
 //!
 //! Then lowers them into a dependency specification.

-#[cfg(feature = "schemars")]
 use std::borrow::Cow;
 use std::collections::BTreeMap;
 use std::fmt::Formatter;
@ -25,7 +24,6 @@ use uv_fs::{PortablePathBuf, relative_to};
 use uv_git_types::GitReference;
 use uv_macros::OptionsMetadata;
 use uv_normalize::{DefaultGroups, ExtraName, GroupName, PackageName};
-use uv_options_metadata::{OptionSet, OptionsMetadata, Visit};
 use uv_pep440::{Version, VersionSpecifiers};
 use uv_pep508::MarkerTree;
 use uv_pypi_types::{
@ -612,7 +610,7 @@ pub struct ToolUv {
    /// Note that those settings only apply when using the `uv_build` backend, other build backends
    /// (such as hatchling) have their own configuration.
    #[option_group]
-    pub build_backend: Option<BuildBackendSettingsSchema>,
+    pub build_backend: Option<BuildBackendSettings>,
 }

 #[derive(Default, Debug, Clone, PartialEq, Eq)]
@ -1686,44 +1684,3 @@ pub enum DependencyType {
    /// A dependency in `dependency-groups.{0}`.
    Group(GroupName),
 }
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(test, derive(Serialize))]
-pub struct BuildBackendSettingsSchema;
-
-impl<'de> Deserialize<'de> for BuildBackendSettingsSchema {
-    fn deserialize<D>(_deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        Ok(BuildBackendSettingsSchema)
-    }
-}
-
-#[cfg(feature = "schemars")]
-impl schemars::JsonSchema for BuildBackendSettingsSchema {
-    fn schema_name() -> Cow<'static, str> {
-        BuildBackendSettings::schema_name()
-    }
-
-    fn json_schema(generator: &mut schemars::SchemaGenerator) -> schemars::Schema {
-        BuildBackendSettings::json_schema(generator)
-    }
-}
-
-impl OptionsMetadata for BuildBackendSettingsSchema {
-    fn record(visit: &mut dyn Visit) {
-        BuildBackendSettings::record(visit);
-    }
-
-    fn documentation() -> Option<&'static str> {
-        BuildBackendSettings::documentation()
-    }
-
-    fn metadata() -> OptionSet
-    where
-        Self: Sized + 'static,
-    {
-        BuildBackendSettings::metadata()
-    }
-}
--- a/crates/uv/Cargo.toml
+++ b/crates/uv/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "uv"
-version = "0.7.19"
+version = "0.7.17"
 edition = { workspace = true }
 rust-version = { workspace = true }
 homepage = { workspace = true }
--- a/crates/uv/src/commands/build_frontend.rs
+++ b/crates/uv/src/commands/build_frontend.rs
@ -3,6 +3,7 @@ use std::fmt::Write as _;
 use std::io::Write as _;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
+use std::sync::Arc;
 use std::{fmt, io};

 use anyhow::{Context, Result};
@ -187,6 +188,15 @@ async fn build_impl(
    printer: Printer,
    preview: PreviewMode,
 ) -> Result<BuildResult> {
+    if list && preview.is_disabled() {
+        // We need the direct build for list and that is preview only.
+        writeln!(
+            printer.stderr(),
+            "The `--list` option is only available in preview mode; add the `--preview` flag to use `--list`"
+        )?;
+        return Ok(BuildResult::Failure);
+    }
+
    // Extract the resolver settings.
    let ResolverSettings {
        index_locations,
@ -494,7 +504,16 @@ async fn build_package(
    .await?
    .into_interpreter();

-    index_locations.cache_index_credentials();
+    // Add all authenticated sources to the cache.
+    for index in index_locations.allowed_indexes() {
+        if let Some(credentials) = index.credentials() {
+            let credentials = Arc::new(credentials);
+            uv_auth::store_credentials(index.raw_url(), credentials.clone());
+            if let Some(root_url) = index.root_url() {
+                uv_auth::store_credentials(&root_url, credentials.clone());
+            }
+        }
+    }

    // Read build constraints.
    let build_constraints =
@ -596,7 +615,10 @@ async fn build_package(
        }

        BuildAction::List
-    } else if !force_pep517 && check_direct_build(source.path(), source.path().user_display()) {
+    } else if preview.is_enabled()
+        && !force_pep517
+        && check_direct_build(source.path(), source.path().user_display())
+    {
        BuildAction::DirectBuild
    } else {
        BuildAction::Pep517
--- a/crates/uv/src/commands/pip/compile.rs
+++ b/crates/uv/src/commands/pip/compile.rs
@ -3,6 +3,7 @@ use std::env;
 use std::ffi::OsStr;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
+use std::sync::Arc;

 use anyhow::{Result, anyhow};
 use itertools::Itertools;
@ -337,12 +338,13 @@ pub(crate) async fn pip_compile(

    // Determine the Python requirement, if the user requested a specific version.
    let python_requirement = if universal {
-        let requires_python = if let Some(python_version) = python_version.as_ref() {
-            RequiresPython::greater_than_equal_version(&python_version.version)
-        } else {
-            let version = interpreter.python_minor_version();
-            RequiresPython::greater_than_equal_version(&version)
-        };
+        let requires_python = RequiresPython::greater_than_equal_version(
+            if let Some(python_version) = python_version.as_ref() {
+                &python_version.version
+            } else {
+                interpreter.python_version()
+            },
+        );
        PythonRequirement::from_requires_python(&interpreter, requires_python)
    } else if let Some(python_version) = python_version.as_ref() {
        PythonRequirement::from_python_version(&interpreter, python_version)
@ -386,7 +388,16 @@ pub(crate) async fn pip_compile(
        no_index,
    );

-    index_locations.cache_index_credentials();
+    // Add all authenticated sources to the cache.
+    for index in index_locations.allowed_indexes() {
+        if let Some(credentials) = index.credentials() {
+            let credentials = Arc::new(credentials);
+            uv_auth::store_credentials(index.raw_url(), credentials.clone());
+            if let Some(root_url) = index.root_url() {
+                uv_auth::store_credentials(&root_url, credentials.clone());
+            }
+        }
+    }

    // Determine the PyTorch backend.
    let torch_backend = torch_backend
--- a/crates/uv/src/commands/pip/install.rs
+++ b/crates/uv/src/commands/pip/install.rs
@ -1,11 +1,12 @@
 use std::collections::{BTreeMap, BTreeSet};
 use std::fmt::Write;
 use std::path::PathBuf;
+use std::sync::Arc;

 use anyhow::Context;
 use itertools::Itertools;
 use owo_colors::OwoColorize;
-use tracing::{Level, debug, enabled, warn};
+use tracing::{Level, debug, enabled};

 use uv_cache::Cache;
 use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder};
@ -236,13 +237,7 @@ pub(crate) async fn pip_install(
        }
    }

-    let _lock = environment
-        .lock()
-        .await
-        .inspect_err(|err| {
-            warn!("Failed to acquire environment lock: {err}");
-        })
-        .ok();
+    let _lock = environment.lock().await?;

    // Determine the markers to use for the resolution.
    let interpreter = environment.interpreter();
@ -339,7 +334,16 @@ pub(crate) async fn pip_install(
        no_index,
    );

-    index_locations.cache_index_credentials();
+    // Add all authenticated sources to the cache.
+    for index in index_locations.allowed_indexes() {
+        if let Some(credentials) = index.credentials() {
+            let credentials = Arc::new(credentials);
+            uv_auth::store_credentials(index.raw_url(), credentials.clone());
+            if let Some(root_url) = index.root_url() {
+                uv_auth::store_credentials(&root_url, credentials.clone());
+            }
+        }
+    }

    // Determine the PyTorch backend.
    let torch_backend = torch_backend
--- a/crates/uv/src/commands/pip/sync.rs
+++ b/crates/uv/src/commands/pip/sync.rs
@ -1,9 +1,10 @@
 use std::collections::{BTreeMap, BTreeSet};
 use std::fmt::Write;
+use std::sync::Arc;

 use anyhow::{Context, Result};
 use owo_colors::OwoColorize;
-use tracing::{debug, warn};
+use tracing::debug;

 use uv_cache::Cache;
 use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder};
@ -211,13 +212,7 @@ pub(crate) async fn pip_sync(
        }
    }

-    let _lock = environment
-        .lock()
-        .await
-        .inspect_err(|err| {
-            warn!("Failed to acquire environment lock: {err}");
-        })
-        .ok();
+    let _lock = environment.lock().await?;

    let interpreter = environment.interpreter();

@ -272,7 +267,16 @@ pub(crate) async fn pip_sync(
        no_index,
    );

-    index_locations.cache_index_credentials();
+    // Add all authenticated sources to the cache.
+    for index in index_locations.allowed_indexes() {
+        if let Some(credentials) = index.credentials() {
+            let credentials = Arc::new(credentials);
+            uv_auth::store_credentials(index.raw_url(), credentials.clone());
+            if let Some(root_url) = index.root_url() {
+                uv_auth::store_credentials(&root_url, credentials.clone());
+            }
+        }
+    }

    // Determine the PyTorch backend.
    let torch_backend = torch_backend
--- a/crates/uv/src/commands/pip/uninstall.rs
+++ b/crates/uv/src/commands/pip/uninstall.rs
@ -3,7 +3,7 @@ use std::fmt::Write;
 use anyhow::Result;
 use itertools::{Either, Itertools};
 use owo_colors::OwoColorize;
-use tracing::{debug, warn};
+use tracing::debug;

 use uv_cache::Cache;
 use uv_client::BaseClientBuilder;
@ -100,13 +100,7 @@ pub(crate) async fn pip_uninstall(
        }
    }

-    let _lock = environment
-        .lock()
-        .await
-        .inspect_err(|err| {
-            warn!("Failed to acquire environment lock: {err}");
-        })
-        .ok();
+    let _lock = environment.lock().await?;

    // Index the current `site-packages` directory.
    let site_packages = uv_installer::SitePackages::from_environment(&environment)?;
--- a/crates/uv/src/commands/project/add.rs
+++ b/crates/uv/src/commands/project/add.rs
@ -10,7 +10,7 @@ use anyhow::{Context, Result, bail};
 use itertools::Itertools;
 use owo_colors::OwoColorize;
 use rustc_hash::{FxBuildHasher, FxHashMap};
-use tracing::{debug, warn};
+use tracing::debug;
 use url::Url;

 use uv_cache::Cache;
@ -319,13 +319,7 @@ pub(crate) async fn add(
        }
    };

-    let _lock = target
-        .acquire_lock()
-        .await
-        .inspect_err(|err| {
-            warn!("Failed to acquire environment lock: {err}");
-        })
-        .ok();
+    let _lock = target.acquire_lock().await?;

    let client_builder = BaseClientBuilder::new()
        .connectivity(network_settings.connectivity)
@ -380,7 +374,16 @@ pub(crate) async fn add(
            let hasher = HashStrategy::default();
            let sources = SourceStrategy::Enabled;

-            settings.resolver.index_locations.cache_index_credentials();
+            // Add all authenticated sources to the cache.
+            for index in settings.resolver.index_locations.allowed_indexes() {
+                if let Some(credentials) = index.credentials() {
+                    let credentials = Arc::new(credentials);
+                    uv_auth::store_credentials(index.raw_url(), credentials.clone());
+                    if let Some(root_url) = index.root_url() {
+                        uv_auth::store_credentials(&root_url, credentials.clone());
+                    }
+                }
+            }

            // Initialize the registry client.
            let client = RegistryClientBuilder::try_from(client_builder)?
--- a/crates/uv/src/commands/project/environment.rs
+++ b/crates/uv/src/commands/project/environment.rs
@ -44,15 +44,13 @@ impl CachedEnvironment {
        printer: Printer,
        preview: PreviewMode,
    ) -> Result<Self, ProjectError> {
-        // Resolve the "base" interpreter, which resolves to an underlying parent interpreter if the
-        // given interpreter is a virtual environment.
-        let base_interpreter = Self::base_interpreter(interpreter, cache)?;
+        let interpreter = Self::base_interpreter(interpreter, cache)?;

        // Resolve the requirements with the interpreter.
        let resolution = Resolution::from(
            resolve_environment(
                spec,
-                &base_interpreter,
+                &interpreter,
                build_constraints.clone(),
                &settings.resolver,
                network_settings,
@ -75,34 +73,13 @@ impl CachedEnvironment {
            hash_digest(&distributions)
        };

-        // Construct a hash for the environment.
-        //
-        // Use the canonicalized base interpreter path since that's the interpreter we performed the
-        // resolution with and the interpreter the environment will be created with.
-        //
-        // We also include the canonicalized `sys.prefix` of the non-base interpreter, that is, the
-        // virtual environment's path. Originally, we shared cached environments independent of the
-        // environment they'd be layered on top of. However, this causes collisions as the overlay
-        // `.pth` file can be overridden by another instance of uv. Including this element in the key
-        // avoids this problem at the cost of creating separate cached environments for identical
-        // `--with` invocations across projects. We use `sys.prefix` rather than `sys.executable` so
-        // we can canonicalize it without invalidating the purpose of the element — it'd probably be
-        // safe to just use the absolute `sys.executable` as well.
-        //
-        // TODO(zanieb): Since we're not sharing these environmments across projects, we should move
-        // [`CachedEvnvironment::set_overlay`] etc. here since the values there should be constant
-        // now.
-        //
-        // TODO(zanieb): We should include the version of the base interpreter in the hash, so if
-        // the interpreter at the canonicalized path changes versions we construct a new
-        // environment.
-        let environment_hash = cache_digest(&(
-            &canonicalize_executable(base_interpreter.sys_executable())?,
-            &interpreter.sys_prefix().canonicalize()?,
-        ));
+        // Hash the interpreter based on its path.
+        // TODO(charlie): Come up with a robust hash for the interpreter.
+        let interpreter_hash =
+            cache_digest(&canonicalize_executable(interpreter.sys_executable())?);

        // Search in the content-addressed cache.
-        let cache_entry = cache.entry(CacheBucket::Environments, environment_hash, resolution_hash);
+        let cache_entry = cache.entry(CacheBucket::Environments, interpreter_hash, resolution_hash);

        if cache.refresh().is_none() {
            if let Ok(root) = cache.resolve_link(cache_entry.path()) {
@ -116,7 +93,7 @@ impl CachedEnvironment {
        let temp_dir = cache.venv_dir()?;
        let venv = uv_virtualenv::create_venv(
            temp_dir.path(),
-            base_interpreter,
+            interpreter,
            uv_virtualenv::Prompt::None,
            false,
            false,
--- a/crates/uv/src/commands/project/lock.rs
+++ b/crates/uv/src/commands/project/lock.rs
@ -593,7 +593,16 @@ async fn do_lock(
        .keyring(*keyring_provider)
        .allow_insecure_host(network_settings.allow_insecure_host.clone());

-    index_locations.cache_index_credentials();
+    // Add all authenticated sources to the cache.
+    for index in index_locations.allowed_indexes() {
+        if let Some(credentials) = index.credentials() {
+            let credentials = Arc::new(credentials);
+            uv_auth::store_credentials(index.raw_url(), credentials.clone());
+            if let Some(root_url) = index.root_url() {
+                uv_auth::store_credentials(&root_url, credentials.clone());
+            }
+        }
+    }

    for index in target.indexes() {
        if let Some(credentials) = index.credentials() {
@ -933,7 +942,7 @@ impl ValidatedLock {
                lock.prerelease_mode().cyan(),
                options.prerelease_mode.cyan()
            );
-            return Ok(Self::Preferable(lock));
+            return Ok(Self::Unusable(lock));
        }
        if lock.fork_strategy() != options.fork_strategy {
            let _ = writeln!(
--- a/crates/uv/src/commands/project/mod.rs
+++ b/crates/uv/src/commands/project/mod.rs
@ -25,7 +25,7 @@ use uv_fs::{CWD, LockedFile, Simplified};
 use uv_git::ResolvedRepositoryReference;
 use uv_installer::{SatisfiesResult, SitePackages};
 use uv_normalize::{DEV_DEPENDENCIES, DefaultGroups, ExtraName, GroupName, PackageName};
-use uv_pep440::{TildeVersionSpecifier, Version, VersionSpecifiers};
+use uv_pep440::{Version, VersionSpecifiers};
 use uv_pep508::MarkerTreeContents;
 use uv_pypi_types::{ConflictPackage, ConflictSet, Conflicts};
 use uv_python::{
@ -421,30 +421,6 @@ pub(crate) fn find_requires_python(
    if requires_python.is_empty() {
        return Ok(None);
    }
-    for ((package, group), specifiers) in &requires_python {
-        if let [spec] = &specifiers[..] {
-            if let Some(spec) = TildeVersionSpecifier::from_specifier_ref(spec) {
-                if spec.has_patch() {
-                    continue;
-                }
-                let (lower, upper) = spec.bounding_specifiers();
-                let spec_0 = spec.with_patch_version(0);
-                let (lower_0, upper_0) = spec_0.bounding_specifiers();
-                warn_user_once!(
-                    "The `requires-python` specifier (`{spec}`) in `{package}{group}` \
-                    uses the tilde specifier (`~=`) without a patch version. This will be \
-                    interpreted as `{lower}, {upper}`. Did you mean `{spec_0}` to constrain the \
-                    version as `{lower_0}, {upper_0}`? We recommend only using \
-                    the tilde specifier with a patch version to avoid ambiguity.",
-                    group = if let Some(group) = group {
-                        format!(":{group}")
-                    } else {
-                        String::new()
-                    },
-                );
-            }
-        }
-    }
    match RequiresPython::intersection(requires_python.iter().map(|(.., specifiers)| specifiers)) {
        Some(requires_python) => Ok(Some(requires_python)),
        None => Err(ProjectError::DisjointRequiresPython(requires_python)),
@ -1244,12 +1220,7 @@ impl ProjectEnvironment {
        preview: PreviewMode,
    ) -> Result<Self, ProjectError> {
        // Lock the project environment to avoid synchronization issues.
-        let _lock = ProjectInterpreter::lock(workspace)
-            .await
-            .inspect_err(|err| {
-                warn!("Failed to acquire project environment lock: {err}");
-            })
-            .ok();
+        let _lock = ProjectInterpreter::lock(workspace).await?;

        let upgradeable = preview.is_enabled()
            && python
@ -1467,13 +1438,7 @@ impl ScriptEnvironment {
        preview: PreviewMode,
    ) -> Result<Self, ProjectError> {
        // Lock the script environment to avoid synchronization issues.
-        let _lock = ScriptInterpreter::lock(script)
-            .await
-            .inspect_err(|err| {
-                warn!("Failed to acquire script environment lock: {err}");
-            })
-            .ok();
-
+        let _lock = ScriptInterpreter::lock(script).await?;
        let upgradeable = python_request
            .as_ref()
            .is_none_or(|request| !request.includes_patch());
@ -1661,7 +1626,16 @@ pub(crate) async fn resolve_names(
        .keyring(*keyring_provider)
        .allow_insecure_host(network_settings.allow_insecure_host.clone());

-    index_locations.cache_index_credentials();
+    // Add all authenticated sources to the cache.
+    for index in index_locations.allowed_indexes() {
+        if let Some(credentials) = index.credentials() {
+            let credentials = Arc::new(credentials);
+            uv_auth::store_credentials(index.raw_url(), credentials.clone());
+            if let Some(root_url) = index.root_url() {
+                uv_auth::store_credentials(&root_url, credentials.clone());
+            }
+        }
+    }

    // Initialize the registry client.
    let client = RegistryClientBuilder::try_from(client_builder)?
@ -1730,7 +1704,7 @@ pub(crate) async fn resolve_names(
 }

 #[derive(Debug, Clone)]
-pub(crate) enum PreferenceLocation<'lock> {
+pub(crate) enum PreferenceSource<'lock> {
    /// The preferences should be extracted from a lockfile.
    Lock {
        lock: &'lock Lock,
@ -1745,7 +1719,7 @@ pub(crate) struct EnvironmentSpecification<'lock> {
    /// The requirements to include in the environment.
    requirements: RequirementsSpecification,
    /// The preferences to respect when resolving.
-    preferences: Option<PreferenceLocation<'lock>>,
+    preferences: Option<PreferenceSource<'lock>>,
 }

 impl From<RequirementsSpecification> for EnvironmentSpecification<'_> {
@ -1758,9 +1732,9 @@ impl From<RequirementsSpecification> for EnvironmentSpecification<'_> {
 }

 impl<'lock> EnvironmentSpecification<'lock> {
-    /// Set the [`PreferenceLocation`] for the specification.
+    /// Set the [`PreferenceSource`] for the specification.
    #[must_use]
-    pub(crate) fn with_preferences(self, preferences: PreferenceLocation<'lock>) -> Self {
+    pub(crate) fn with_preferences(self, preferences: PreferenceSource<'lock>) -> Self {
        Self {
            preferences: Some(preferences),
            ..self
@ -1823,7 +1797,16 @@ pub(crate) async fn resolve_environment(
    let marker_env = interpreter.resolver_marker_environment();
    let python_requirement = PythonRequirement::from_interpreter(interpreter);

-    index_locations.cache_index_credentials();
+    // Add all authenticated sources to the cache.
+    for index in index_locations.allowed_indexes() {
+        if let Some(credentials) = index.credentials() {
+            let credentials = Arc::new(credentials);
+            uv_auth::store_credentials(index.raw_url(), credentials.clone());
+            if let Some(root_url) = index.root_url() {
+                uv_auth::store_credentials(&root_url, credentials.clone());
+            }
+        }
+    }

    // Initialize the registry client.
    let client = RegistryClientBuilder::try_from(client_builder)?
@ -1869,7 +1852,7 @@ pub(crate) async fn resolve_environment(

    // If an existing lockfile exists, build up a set of preferences.
    let preferences = match spec.preferences {
-        Some(PreferenceLocation::Lock { lock, install_path }) => {
+        Some(PreferenceSource::Lock { lock, install_path }) => {
            let LockedRequirements { preferences, git } =
                read_lock_requirements(lock, install_path, &upgrade)?;

@ -1881,7 +1864,7 @@ pub(crate) async fn resolve_environment(

            preferences
        }
-        Some(PreferenceLocation::Entries(entries)) => entries,
+        Some(PreferenceSource::Entries(entries)) => entries,
        None => vec![],
    };

@ -1995,7 +1978,16 @@ pub(crate) async fn sync_environment(
    let interpreter = venv.interpreter();
    let tags = venv.interpreter().tags()?;

-    index_locations.cache_index_credentials();
+    // Add all authenticated sources to the cache.
+    for index in index_locations.allowed_indexes() {
+        if let Some(credentials) = index.credentials() {
+            let credentials = Arc::new(credentials);
+            uv_auth::store_credentials(index.raw_url(), credentials.clone());
+            if let Some(root_url) = index.root_url() {
+                uv_auth::store_credentials(&root_url, credentials.clone());
+            }
+        }
+    }

    // Initialize the registry client.
    let client = RegistryClientBuilder::try_from(client_builder)?
@ -2201,7 +2193,16 @@ pub(crate) async fn update_environment(
        }
    }

-    index_locations.cache_index_credentials();
+    // Add all authenticated sources to the cache.
+    for index in index_locations.allowed_indexes() {
+        if let Some(credentials) = index.credentials() {
+            let credentials = Arc::new(credentials);
+            uv_auth::store_credentials(index.raw_url(), credentials.clone());
+            if let Some(root_url) = index.root_url() {
+                uv_auth::store_credentials(&root_url, credentials.clone());
+            }
+        }
+    }

    // Initialize the registry client.
    let client = RegistryClientBuilder::try_from(client_builder)?
--- a/crates/uv/src/commands/project/remove.rs
+++ b/crates/uv/src/commands/project/remove.rs
@ -5,7 +5,7 @@ use std::str::FromStr;

 use anyhow::{Context, Result};
 use owo_colors::OwoColorize;
-use tracing::{debug, warn};
+use tracing::debug;

 use uv_cache::Cache;
 use uv_configuration::{
@ -281,13 +281,7 @@ pub(crate) async fn remove(
        }
    };

-    let _lock = target
-        .acquire_lock()
-        .await
-        .inspect_err(|err| {
-            warn!("Failed to acquire environment lock: {err}");
-        })
-        .ok();
+    let _lock = target.acquire_lock().await?;

    // Determine the lock mode.
    let mode = if locked {
--- a/crates/uv/src/commands/project/run.rs
+++ b/crates/uv/src/commands/project/run.rs
@ -49,7 +49,7 @@ use crate::commands::project::install_target::InstallTarget;
 use crate::commands::project::lock::LockMode;
 use crate::commands::project::lock_target::LockTarget;
 use crate::commands::project::{
-    EnvironmentSpecification, PreferenceLocation, ProjectEnvironment, ProjectError,
+    EnvironmentSpecification, PreferenceSource, ProjectEnvironment, ProjectError,
    ScriptEnvironment, ScriptInterpreter, UniversalState, WorkspacePython,
    default_dependency_groups, script_specification, update_environment,
    validate_project_requires_python,
@ -240,13 +240,7 @@ hint: If you are running a script with `{}` in the shebang, you may need to incl
            .await?
            .into_environment()?;

-            let _lock = environment
-                .lock()
-                .await
-                .inspect_err(|err| {
-                    warn!("Failed to acquire environment lock: {err}");
-                })
-                .ok();
+            let _lock = environment.lock().await?;

            // Determine the lock mode.
            let mode = if frozen {
@ -392,13 +386,7 @@ hint: If you are running a script with `{}` in the shebang, you may need to incl
                        )
                    });

-                let _lock = environment
-                    .lock()
-                    .await
-                    .inspect_err(|err| {
-                        warn!("Failed to acquire environment lock: {err}");
-                    })
-                    .ok();
+                let _lock = environment.lock().await?;

                match update_environment(
                    environment,
@ -711,13 +699,7 @@ hint: If you are running a script with `{}` in the shebang, you may need to incl
                        .map(|lock| (lock, project.workspace().install_path().to_owned()));
                }
            } else {
-                let _lock = venv
-                    .lock()
-                    .await
-                    .inspect_err(|err| {
-                        warn!("Failed to acquire environment lock: {err}");
-                    })
-                    .ok();
+                let _lock = venv.lock().await?;

                // Determine the lock mode.
                let mode = if frozen {
@ -958,10 +940,10 @@ hint: If you are running a script with `{}` in the shebang, you may need to incl
            let spec = EnvironmentSpecification::from(spec).with_preferences(
                if let Some((lock, install_path)) = base_lock.as_ref() {
                    // If we have a lockfile, use the locked versions as preferences.
-                    PreferenceLocation::Lock { lock, install_path }
+                    PreferenceSource::Lock { lock, install_path }
                } else {
                    // Otherwise, extract preferences from the base environment.
-                    PreferenceLocation::Entries(
+                    PreferenceSource::Entries(
                        base_site_packages
                            .iter()
                            .filter_map(Preference::from_installed)
--- a/crates/uv/src/commands/project/sync.rs
+++ b/crates/uv/src/commands/project/sync.rs
@ -6,7 +6,6 @@ use std::sync::Arc;
 use anyhow::{Context, Result};
 use itertools::Itertools;
 use owo_colors::OwoColorize;
-use tracing::warn;

 use uv_cache::Cache;
 use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder};
@ -170,13 +169,7 @@ pub(crate) async fn sync(
        ),
    };

-    let _lock = environment
-        .lock()
-        .await
-        .inspect_err(|err| {
-            warn!("Failed to acquire environment lock: {err}");
-        })
-        .ok();
+    let _lock = environment.lock().await?;

    // Notify the user of any environment changes.
    match &environment {
@ -689,7 +682,16 @@ pub(super) async fn do_sync(
    // If necessary, convert editable to non-editable distributions.
    let resolution = apply_editable_mode(resolution, editable);

-    index_locations.cache_index_credentials();
+    // Add all authenticated sources to the cache.
+    for index in index_locations.allowed_indexes() {
+        if let Some(credentials) = index.credentials() {
+            let credentials = Arc::new(credentials);
+            uv_auth::store_credentials(index.raw_url(), credentials.clone());
+            if let Some(root_url) = index.root_url() {
+                uv_auth::store_credentials(&root_url, credentials.clone());
+            }
+        }
+    }

    // Populate credentials from the target.
    store_credentials_from_target(target);
--- a/crates/uv/src/commands/project/version.rs
+++ b/crates/uv/src/commands/project/version.rs
@ -385,7 +385,7 @@ async fn lock_and_sync(
    let default_groups = default_dependency_groups(project.pyproject_toml())?;
    let default_extras = DefaultExtras::default();
    let groups = DependencyGroups::default().with_defaults(default_groups);
-    let extras = ExtrasSpecification::default().with_defaults(default_extras);
+    let extras = ExtrasSpecification::from_all_extras().with_defaults(default_extras);
    let install_options = InstallOptions::default();

    // Convert to an `AddTarget` by attaching the appropriate interpreter or environment.
--- a/crates/uv/src/commands/python/install.rs
+++ b/crates/uv/src/commands/python/install.rs
@ -1,5 +1,4 @@
 use std::borrow::Cow;
-use std::collections::BTreeMap;
 use std::fmt::Write;
 use std::io::ErrorKind;
 use std::path::{Path, PathBuf};
@ -16,9 +15,7 @@ use tracing::{debug, trace};

 use uv_configuration::PreviewMode;
 use uv_fs::Simplified;
-use uv_python::downloads::{
-    self, ArchRequest, DownloadResult, ManagedPythonDownload, PythonDownloadRequest,
-};
+use uv_python::downloads::{self, DownloadResult, ManagedPythonDownload, PythonDownloadRequest};
 use uv_python::managed::{
    ManagedPythonInstallation, ManagedPythonInstallations, PythonMinorVersionLink,
    create_link_to_executable, python_executable_dir,
@ -404,7 +401,6 @@ pub(crate) async fn install(

    let mut errors = vec![];
    let mut downloaded = Vec::with_capacity(downloads.len());
-    let mut requests_by_new_installation = BTreeMap::new();
    while let Some((download, result)) = tasks.next().await {
        match result {
            Ok(download_result) => {
@ -416,19 +412,10 @@ pub(crate) async fn install(

                let installation = ManagedPythonInstallation::new(path, download);
                changelog.installed.insert(installation.key().clone());
-                for request in &requests {
-                    // Take note of which installations satisfied which requests
-                    if request.matches_installation(&installation) {
-                        requests_by_new_installation
-                            .entry(installation.key().clone())
-                            .or_insert(Vec::new())
-                            .push(request);
-                    }
-                }
                if changelog.existing.contains(installation.key()) {
                    changelog.uninstalled.insert(installation.key().clone());
                }
-                downloaded.push(installation.clone());
+                downloaded.push(installation);
            }
            Err(err) => {
                errors.push((download.key().clone(), anyhow::Error::new(err)));
@ -542,42 +529,6 @@ pub(crate) async fn install(
    }

    if !changelog.installed.is_empty() {
-        for install_key in &changelog.installed {
-            // Make a note if the selected python is non-native for the architecture,
-            // if none of the matching user requests were explicit
-            let native_arch = Arch::from_env();
-            if install_key.arch().family() != native_arch.family() {
-                let not_explicit =
-                    requests_by_new_installation
-                        .get(install_key)
-                        .and_then(|requests| {
-                            let all_non_explicit = requests.iter().all(|request| {
-                                if let PythonRequest::Key(key) = &request.request {
-                                    !matches!(key.arch(), Some(ArchRequest::Explicit(_)))
-                                } else {
-                                    true
-                                }
-                            });
-                            if all_non_explicit {
-                                requests.iter().next()
-                            } else {
-                                None
-                            }
-                        });
-                if let Some(not_explicit) = not_explicit {
-                    let native_request =
-                        not_explicit.download_request.clone().with_arch(native_arch);
-                    writeln!(
-                        printer.stderr(),
-                        "{} uv selected a Python distribution with an emulated architecture ({}) for your platform because support for the native architecture ({}) is not yet mature; to override this behaviour, request the native architecture explicitly with: {}",
-                        "note:".bold(),
-                        install_key.arch(),
-                        native_arch,
-                        native_request
-                    )?;
-                }
-            }
-        }
        if changelog.installed.len() == 1 {
            let installed = changelog.installed.iter().next().unwrap();
            // Ex) "Installed Python 3.9.7 in 1.68s"
--- a/crates/uv/src/commands/tool/common.rs
+++ b/crates/uv/src/commands/tool/common.rs
@ -218,7 +218,7 @@ pub(crate) fn finalize_tool_install(
    if target_entry_points.is_empty() {
        writeln!(
            printer.stdout(),
-            "No executables are provided by package `{from}`; removing tool",
+            "No executables are provided by `{from}`",
            from = name.cyan()
        )?;

@ -354,9 +354,7 @@ fn hint_executable_from_dependency(
            let command = format!("uv tool install {}", package.name());
            writeln!(
                printer.stdout(),
-                "{}{} An executable with the name `{}` is available via dependency `{}`.\n      Did you mean `{}`?",
-                "hint".bold().cyan(),
-                ":".bold(),
+                "However, an executable with the name `{}` is available via dependency `{}`.\nDid you mean `{}`?",
                name.cyan(),
                package.name().cyan(),
                command.bold(),
@ -365,9 +363,7 @@ fn hint_executable_from_dependency(
        packages => {
            writeln!(
                printer.stdout(),
-                "{}{} An executable with the name `{}` is available via the following dependencies::",
-                "hint".bold().cyan(),
-                ":".bold(),
+                "However, an executable with the name `{}` is available via the following dependencies::",
                name.cyan(),
            )?;

@ -376,7 +372,7 @@ fn hint_executable_from_dependency(
            }
            writeln!(
                printer.stdout(),
-                "      Did you mean to install one of them instead?"
+                "Did you mean to install one of them instead?"
            )?;
        }
    }
--- a/crates/uv/src/commands/venv.rs
+++ b/crates/uv/src/commands/venv.rs
@ -242,7 +242,16 @@ async fn venv_impl(
        python.into_interpreter()
    };

-    index_locations.cache_index_credentials();
+    // Add all authenticated sources to the cache.
+    for index in index_locations.allowed_indexes() {
+        if let Some(credentials) = index.credentials() {
+            let credentials = Arc::new(credentials);
+            uv_auth::store_credentials(index.raw_url(), credentials.clone());
+            if let Some(root_url) = index.root_url() {
+                uv_auth::store_credentials(&root_url, credentials.clone());
+            }
+        }
+    }

    // Check if the discovered Python version is incompatible with the current workspace
    if let Some(requires_python) = requires_python {
--- a/crates/uv/src/settings.rs
+++ b/crates/uv/src/settings.rs
@ -118,20 +118,16 @@ impl GlobalSettings {
            },
            show_settings: args.show_settings,
            preview: PreviewMode::from(
-                flag(args.preview, args.no_preview, "preview")
+                flag(args.preview, args.no_preview)
                    .combine(workspace.and_then(|workspace| workspace.globals.preview))
                    .unwrap_or(false),
            ),
            python_preference,
-            python_downloads: flag(
-                args.allow_python_downloads,
-                args.no_python_downloads,
-                "python-downloads",
-            )
-            .map(PythonDownloads::from)
-            .combine(env(env::UV_PYTHON_DOWNLOADS))
-            .combine(workspace.and_then(|workspace| workspace.globals.python_downloads))
-            .unwrap_or_default(),
+            python_downloads: flag(args.allow_python_downloads, args.no_python_downloads)
+                .map(PythonDownloads::from)
+                .combine(env(env::UV_PYTHON_DOWNLOADS))
+                .combine(workspace.and_then(|workspace| workspace.globals.python_downloads))
+                .unwrap_or_default(),
            // Disable the progress bar with `RUST_LOG` to avoid progress fragments interleaving
            // with log messages.
            no_progress: args.no_progress || std::env::var_os(EnvVars::RUST_LOG).is_some(),
@ -165,7 +161,7 @@ pub(crate) struct NetworkSettings {

 impl NetworkSettings {
    pub(crate) fn resolve(args: &GlobalArgs, workspace: Option<&FilesystemOptions>) -> Self {
-        let connectivity = if flag(args.offline, args.no_offline, "offline")
+        let connectivity = if flag(args.offline, args.no_offline)
            .combine(workspace.and_then(|workspace| workspace.globals.offline))
            .unwrap_or(false)
        {
@ -173,7 +169,7 @@ impl NetworkSettings {
        } else {
            Connectivity::Online
        };
-        let native_tls = flag(args.native_tls, args.no_native_tls, "native-tls")
+        let native_tls = flag(args.native_tls, args.no_native_tls)
            .combine(workspace.and_then(|workspace| workspace.globals.native_tls))
            .unwrap_or(false);
        let allow_insecure_host = args
@ -278,12 +274,8 @@ impl InitSettings {
            (_, _, _) => unreachable!("`app`, `lib`, and `script` are mutually exclusive"),
        };

-        let package = flag(
-            package || build_backend.is_some(),
-            no_package || r#virtual,
-            "virtual",
-        )
-        .unwrap_or(kind.packaged_by_default());
+        let package = flag(package || build_backend.is_some(), no_package || r#virtual)
+            .unwrap_or(kind.packaged_by_default());

        let install_mirrors = filesystem
            .map(|fs| fs.install_mirrors.clone())
@ -303,7 +295,7 @@ impl InitSettings {
            build_backend,
            no_readme: no_readme || bare,
            author_from,
-            pin_python: flag(pin_python, no_pin_python, "pin-python").unwrap_or(!bare),
+            pin_python: flag(pin_python, no_pin_python).unwrap_or(!bare),
            no_workspace,
            python: python.and_then(Maybe::into_option),
            install_mirrors,
@ -406,7 +398,7 @@ impl RunSettings {
                false,
                // TODO(blueraft): support only_extra
                vec![],
-                flag(all_extras, no_all_extras, "all-extras").unwrap_or_default(),
+                flag(all_extras, no_all_extras).unwrap_or_default(),
            ),
            groups: DependencyGroups::from_args(
                dev,
@ -419,7 +411,7 @@ impl RunSettings {
                all_groups,
            ),
            editable: EditableMode::from_args(no_editable),
-            modifications: if flag(exact, inexact, "inexact").unwrap_or(false) {
+            modifications: if flag(exact, inexact).unwrap_or(false) {
                Modifications::Exact
            } else {
                Modifications::Sufficient
@ -442,7 +434,7 @@ impl RunSettings {
            package,
            no_project,
            no_sync,
-            active: flag(active, no_active, "active"),
+            active: flag(active, no_active),
            python: python.and_then(Maybe::into_option),
            refresh: Refresh::from(refresh),
            settings: ResolverInstallerSettings::combine(
@ -1089,7 +1081,7 @@ impl PythonFindSettings {
            request,
            show_version,
            no_project,
-            system: flag(system, no_system, "system").unwrap_or_default(),
+            system: flag(system, no_system).unwrap_or_default(),
        }
    }
 }
@ -1124,7 +1116,7 @@ impl PythonPinSettings {

        Self {
            request,
-            resolved: flag(resolved, no_resolved, "resolved").unwrap_or(false),
+            resolved: flag(resolved, no_resolved).unwrap_or(false),
            no_project,
            global,
            rm,
@ -1203,7 +1195,7 @@ impl SyncSettings {
            filesystem,
        );

-        let check = flag(check, no_check, "check").unwrap_or_default();
+        let check = flag(check, no_check).unwrap_or_default();
        let dry_run = if check {
            DryRun::Check
        } else {
@ -1215,7 +1207,7 @@ impl SyncSettings {
            frozen,
            dry_run,
            script,
-            active: flag(active, no_active, "active"),
+            active: flag(active, no_active),
            extras: ExtrasSpecification::from_args(
                extra.unwrap_or_default(),
                no_extra,
@ -1223,7 +1215,7 @@ impl SyncSettings {
                false,
                // TODO(blueraft): support only_extra
                vec![],
-                flag(all_extras, no_all_extras, "all-extras").unwrap_or_default(),
+                flag(all_extras, no_all_extras).unwrap_or_default(),
            ),
            groups: DependencyGroups::from_args(
                dev,
@ -1241,7 +1233,7 @@ impl SyncSettings {
                no_install_workspace,
                no_install_package,
            ),
-            modifications: if flag(exact, inexact, "inexact").unwrap_or(true) {
+            modifications: if flag(exact, inexact).unwrap_or(true) {
                Modifications::Exact
            } else {
                Modifications::Sufficient
@ -1445,7 +1437,7 @@ impl AddSettings {
        Self {
            locked,
            frozen,
-            active: flag(active, no_active, "active"),
+            active: flag(active, no_active),
            no_sync,
            packages,
            requirements,
@ -1463,7 +1455,7 @@ impl AddSettings {
            package,
            script,
            python: python.and_then(Maybe::into_option),
-            editable: flag(editable, no_editable, "editable"),
+            editable: flag(editable, no_editable),
            extras: extra.unwrap_or_default(),
            refresh: Refresh::from(refresh),
            indexes,
@ -1539,7 +1531,7 @@ impl RemoveSettings {
        Self {
            locked,
            frozen,
-            active: flag(active, no_active, "active"),
+            active: flag(active, no_active),
            no_sync,
            packages,
            dependency_type,
@ -1611,7 +1603,7 @@ impl VersionSettings {
            dry_run,
            locked,
            frozen,
-            active: flag(active, no_active, "active"),
+            active: flag(active, no_active),
            no_sync,
            package,
            python: python.and_then(Maybe::into_option),
@ -1787,7 +1779,7 @@ impl ExportSettings {
                false,
                // TODO(blueraft): support only_extra
                vec![],
-                flag(all_extras, no_all_extras, "all-extras").unwrap_or_default(),
+                flag(all_extras, no_all_extras).unwrap_or_default(),
            ),
            groups: DependencyGroups::from_args(
                dev,
@ -1800,7 +1792,7 @@ impl ExportSettings {
                all_groups,
            ),
            editable: EditableMode::from_args(no_editable),
-            hashes: flag(hashes, no_hashes, "hashes").unwrap_or(true),
+            hashes: flag(hashes, no_hashes).unwrap_or(true),
            install_options: InstallOptions::new(
                no_emit_project,
                no_emit_workspace,
@ -1809,8 +1801,8 @@ impl ExportSettings {
            output_file,
            locked,
            frozen,
-            include_annotations: flag(annotate, no_annotate, "annotate").unwrap_or(true),
-            include_header: flag(header, no_header, "header").unwrap_or(true),
+            include_annotations: flag(annotate, no_annotate).unwrap_or(true),
+            include_header: flag(header, no_header).unwrap_or(true),
            script,
            python: python.and_then(Maybe::into_option),
            refresh: Refresh::from(refresh),
@ -1963,42 +1955,30 @@ impl PipCompileSettings {
            settings: PipSettings::combine(
                PipOptions {
                    python: python.and_then(Maybe::into_option),
-                    system: flag(system, no_system, "system"),
-                    no_build: flag(no_build, build, "build"),
+                    system: flag(system, no_system),
+                    no_build: flag(no_build, build),
                    no_binary,
                    only_binary,
                    extra,
-                    all_extras: flag(all_extras, no_all_extras, "all-extras"),
-                    no_deps: flag(no_deps, deps, "deps"),
+                    all_extras: flag(all_extras, no_all_extras),
+                    no_deps: flag(no_deps, deps),
                    group: Some(group),
                    output_file,
-                    no_strip_extras: flag(no_strip_extras, strip_extras, "strip-extras"),
-                    no_strip_markers: flag(no_strip_markers, strip_markers, "strip-markers"),
-                    no_annotate: flag(no_annotate, annotate, "annotate"),
-                    no_header: flag(no_header, header, "header"),
+                    no_strip_extras: flag(no_strip_extras, strip_extras),
+                    no_strip_markers: flag(no_strip_markers, strip_markers),
+                    no_annotate: flag(no_annotate, annotate),
+                    no_header: flag(no_header, header),
                    custom_compile_command,
-                    generate_hashes: flag(generate_hashes, no_generate_hashes, "generate-hashes"),
+                    generate_hashes: flag(generate_hashes, no_generate_hashes),
                    python_version,
                    python_platform,
-                    universal: flag(universal, no_universal, "universal"),
+                    universal: flag(universal, no_universal),
                    no_emit_package,
-                    emit_index_url: flag(emit_index_url, no_emit_index_url, "emit-index-url"),
-                    emit_find_links: flag(emit_find_links, no_emit_find_links, "emit-find-links"),
-                    emit_build_options: flag(
-                        emit_build_options,
-                        no_emit_build_options,
-                        "emit-build-options",
-                    ),
-                    emit_marker_expression: flag(
-                        emit_marker_expression,
-                        no_emit_marker_expression,
-                        "emit-marker-expression",
-                    ),
-                    emit_index_annotation: flag(
-                        emit_index_annotation,
-                        no_emit_index_annotation,
-                        "emit-index-annotation",
-                    ),
+                    emit_index_url: flag(emit_index_url, no_emit_index_url),
+                    emit_find_links: flag(emit_find_links, no_emit_find_links),
+                    emit_build_options: flag(emit_build_options, no_emit_build_options),
+                    emit_marker_expression: flag(emit_marker_expression, no_emit_marker_expression),
+                    emit_index_annotation: flag(emit_index_annotation, no_emit_index_annotation),
                    annotation_style,
                    torch_backend,
                    ..PipOptions::from(resolver)
@ -2070,27 +2050,22 @@ impl PipSyncSettings {
            settings: PipSettings::combine(
                PipOptions {
                    python: python.and_then(Maybe::into_option),
-                    system: flag(system, no_system, "system"),
-                    break_system_packages: flag(
-                        break_system_packages,
-                        no_break_system_packages,
-                        "break-system-packages",
-                    ),
+                    system: flag(system, no_system),
+                    break_system_packages: flag(break_system_packages, no_break_system_packages),
                    target,
                    prefix,
-                    require_hashes: flag(require_hashes, no_require_hashes, "require-hashes"),
-                    verify_hashes: flag(verify_hashes, no_verify_hashes, "verify-hashes"),
-                    no_build: flag(no_build, build, "build"),
+                    require_hashes: flag(require_hashes, no_require_hashes),
+                    verify_hashes: flag(verify_hashes, no_verify_hashes),
+                    no_build: flag(no_build, build),
                    no_binary,
                    only_binary,
                    allow_empty_requirements: flag(
                        allow_empty_requirements,
                        no_allow_empty_requirements,
-                        "allow-empty-requirements",
                    ),
                    python_version,
                    python_platform,
-                    strict: flag(strict, no_strict, "strict"),
+                    strict: flag(strict, no_strict),
                    torch_backend,
                    ..PipOptions::from(installer)
                },
@ -2224,7 +2199,7 @@ impl PipInstallSettings {
            constraints_from_workspace,
            overrides_from_workspace,
            build_constraints_from_workspace,
-            modifications: if flag(exact, inexact, "inexact").unwrap_or(false) {
+            modifications: if flag(exact, inexact).unwrap_or(false) {
                Modifications::Exact
            } else {
                Modifications::Sufficient
@ -2233,26 +2208,22 @@ impl PipInstallSettings {
            settings: PipSettings::combine(
                PipOptions {
                    python: python.and_then(Maybe::into_option),
-                    system: flag(system, no_system, "system"),
-                    break_system_packages: flag(
-                        break_system_packages,
-                        no_break_system_packages,
-                        "break-system-packages",
-                    ),
+                    system: flag(system, no_system),
+                    break_system_packages: flag(break_system_packages, no_break_system_packages),
                    target,
                    prefix,
-                    no_build: flag(no_build, build, "build"),
+                    no_build: flag(no_build, build),
                    no_binary,
                    only_binary,
-                    strict: flag(strict, no_strict, "strict"),
+                    strict: flag(strict, no_strict),
                    extra,
-                    all_extras: flag(all_extras, no_all_extras, "all-extras"),
+                    all_extras: flag(all_extras, no_all_extras),
                    group: Some(group),
-                    no_deps: flag(no_deps, deps, "deps"),
+                    no_deps: flag(no_deps, deps),
                    python_version,
                    python_platform,
-                    require_hashes: flag(require_hashes, no_require_hashes, "require-hashes"),
-                    verify_hashes: flag(verify_hashes, no_verify_hashes, "verify-hashes"),
+                    require_hashes: flag(require_hashes, no_require_hashes),
+                    verify_hashes: flag(verify_hashes, no_verify_hashes),
                    torch_backend,
                    ..PipOptions::from(installer)
                },
@ -2296,12 +2267,8 @@ impl PipUninstallSettings {
            settings: PipSettings::combine(
                PipOptions {
                    python: python.and_then(Maybe::into_option),
-                    system: flag(system, no_system, "system"),
-                    break_system_packages: flag(
-                        break_system_packages,
-                        no_break_system_packages,
-                        "break-system-packages",
-                    ),
+                    system: flag(system, no_system),
+                    break_system_packages: flag(break_system_packages, no_break_system_packages),
                    target,
                    prefix,
                    keyring_provider,
@ -2341,8 +2308,8 @@ impl PipFreezeSettings {
            settings: PipSettings::combine(
                PipOptions {
                    python: python.and_then(Maybe::into_option),
-                    system: flag(system, no_system, "system"),
-                    strict: flag(strict, no_strict, "strict"),
+                    system: flag(system, no_system),
+                    strict: flag(strict, no_strict),
                    ..PipOptions::default()
                },
                filesystem,
@ -2381,15 +2348,15 @@ impl PipListSettings {
        } = args;

        Self {
-            editable: flag(editable, exclude_editable, "exclude-editable"),
+            editable: flag(editable, exclude_editable),
            exclude,
            format,
-            outdated: flag(outdated, no_outdated, "outdated").unwrap_or(false),
+            outdated: flag(outdated, no_outdated).unwrap_or(false),
            settings: PipSettings::combine(
                PipOptions {
                    python: python.and_then(Maybe::into_option),
-                    system: flag(system, no_system, "system"),
-                    strict: flag(strict, no_strict, "strict"),
+                    system: flag(system, no_system),
+                    strict: flag(strict, no_strict),
                    ..PipOptions::from(fetch)
                },
                filesystem,
@ -2426,8 +2393,8 @@ impl PipShowSettings {
            settings: PipSettings::combine(
                PipOptions {
                    python: python.and_then(Maybe::into_option),
-                    system: flag(system, no_system, "system"),
-                    strict: flag(strict, no_strict, "strict"),
+                    system: flag(system, no_system),
+                    strict: flag(strict, no_strict),
                    ..PipOptions::default()
                },
                filesystem,
@ -2475,8 +2442,8 @@ impl PipTreeSettings {
            settings: PipSettings::combine(
                PipOptions {
                    python: python.and_then(Maybe::into_option),
-                    system: flag(system, no_system, "system"),
-                    strict: flag(strict, no_strict, "strict"),
+                    system: flag(system, no_system),
+                    strict: flag(strict, no_strict),
                    ..PipOptions::from(fetch)
                },
                filesystem,
@ -2504,7 +2471,7 @@ impl PipCheckSettings {
            settings: PipSettings::combine(
                PipOptions {
                    python: python.and_then(Maybe::into_option),
-                    system: flag(system, no_system, "system"),
+                    system: flag(system, no_system),
                    ..PipOptions::default()
                },
                filesystem,
@ -2571,15 +2538,15 @@ impl BuildSettings {
            sdist,
            wheel,
            list,
-            build_logs: flag(build_logs, no_build_logs, "build-logs").unwrap_or(true),
+            build_logs: flag(build_logs, no_build_logs).unwrap_or(true),
            build_constraints: build_constraints
                .into_iter()
                .filter_map(Maybe::into_option)
                .collect(),
            force_pep517,
            hash_checking: HashCheckingMode::from_args(
-                flag(require_hashes, no_require_hashes, "require-hashes"),
-                flag(verify_hashes, no_verify_hashes, "verify-hashes"),
+                flag(require_hashes, no_require_hashes),
+                flag(verify_hashes, no_verify_hashes),
            ),
            python: python.and_then(Maybe::into_option),
            refresh: Refresh::from(refresh),
@ -2638,7 +2605,7 @@ impl VenvSettings {
            settings: PipSettings::combine(
                PipOptions {
                    python: python.and_then(Maybe::into_option),
-                    system: flag(system, no_system, "system"),
+                    system: flag(system, no_system),
                    index_strategy,
                    keyring_provider,
                    exclude_newer,
--- a/crates/uv/tests/it/build.rs
+++ b/crates/uv/tests/it/build.rs
@ -15,7 +15,7 @@ fn build_basic() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"\\\.", "")])
+        .chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
        .collect::<Vec<_>>();

    let project = context.temp_dir.child("project");
@ -133,7 +133,7 @@ fn build_sdist() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"\\\.", "")])
+        .chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
        .collect::<Vec<_>>();

    let project = context.temp_dir.child("project");
@ -189,7 +189,7 @@ fn build_wheel() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"\\\.", "")])
+        .chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
        .collect::<Vec<_>>();

    let project = context.temp_dir.child("project");
@ -245,7 +245,7 @@ fn build_sdist_wheel() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"\\\.", "")])
+        .chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
        .collect::<Vec<_>>();

    let project = context.temp_dir.child("project");
@ -303,7 +303,7 @@ fn build_wheel_from_sdist() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"\\\.", "")])
+        .chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
        .collect::<Vec<_>>();

    let project = context.temp_dir.child("project");
@ -412,7 +412,7 @@ fn build_fail() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"\\\.", "")])
+        .chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
        .collect::<Vec<_>>();

    let project = context.temp_dir.child("project");
@ -488,6 +488,7 @@ fn build_workspace() -> Result<()> {
        .filters()
        .into_iter()
        .chain([
+            (r"exit code: 1", "exit status: 1"),
            (r"\\\.", ""),
            (r"\[project\]", "[PKG]"),
            (r"\[member\]", "[PKG]"),
@ -693,6 +694,7 @@ fn build_all_with_failure() -> Result<()> {
        .filters()
        .into_iter()
        .chain([
+            (r"exit code: 1", "exit status: 1"),
            (r"\\\.", ""),
            (r"\[project\]", "[PKG]"),
            (r"\[member-\w+\]", "[PKG]"),
@ -838,7 +840,7 @@ fn build_constraints() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"\\\.", "")])
+        .chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
        .collect::<Vec<_>>();

    let project = context.temp_dir.child("project");
@ -899,7 +901,7 @@ fn build_sha() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"\\\.", "")])
+        .chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
        .collect::<Vec<_>>();

    let project = context.temp_dir.child("project");
@ -1185,7 +1187,7 @@ fn build_tool_uv_sources() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"\\\.", "")])
+        .chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
        .collect::<Vec<_>>();

    let build = context.temp_dir.child("backend");
@ -1335,6 +1337,7 @@ fn build_non_package() -> Result<()> {
        .filters()
        .into_iter()
        .chain([
+            (r"exit code: 1", "exit status: 1"),
            (r"\\\.", ""),
            (r"\[project\]", "[PKG]"),
            (r"\[member\]", "[PKG]"),
@ -1927,7 +1930,7 @@ fn build_with_nonnormalized_name() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"\\\.", "")])
+        .chain([(r"exit code: 1", "exit status: 1"), (r"\\\.", "")])
        .collect::<Vec<_>>();

    let project = context.temp_dir.child("project");
@ -1978,60 +1981,3 @@ fn build_with_nonnormalized_name() -> Result<()> {

    Ok(())
 }
-
-/// Check that `--force-pep517` is respected.
-///
-/// The error messages for a broken project are different for direct builds vs. PEP 517.
-#[test]
-fn force_pep517() -> Result<()> {
-    // We need to use a real `uv_build` package.
-    let context = TestContext::new("3.12").with_exclude_newer("2025-05-27T00:00:00Z");
-
-    context
-        .init()
-        .arg("--build-backend")
-        .arg("uv")
-        .assert()
-        .success();
-
-    let pyproject_toml = context.temp_dir.child("pyproject.toml");
-    pyproject_toml.write_str(indoc! {r#"
-        [project]
-        name = "project"
-        version = "1.0.0"
-
-        [tool.uv.build-backend]
-        module-name = "does_not_exist"
-
-        [build-system]
-        requires = ["uv_build>=0.5.15,<10000"]
-        build-backend = "uv_build"
-    "#})?;
-
-    uv_snapshot!(context.filters(), context.build().env("RUST_BACKTRACE", "0"), @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    Building source distribution (uv build backend)...
-      × Failed to build `[TEMP_DIR]/`
-      ╰─▶ Expected a Python module at: `src/does_not_exist/__init__.py`
-    ");
-
-    uv_snapshot!(context.filters(), context.build().arg("--force-pep517").env("RUST_BACKTRACE", "0"), @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    Building source distribution...
-    Error: Missing module directory for `does_not_exist` in `src`. Found: `temp`
-      × Failed to build `[TEMP_DIR]/`
-      ├─▶ The build backend returned an error
-      ╰─▶ Call to `uv_build.build_sdist` failed (exit status: 1)
-          hint: This usually indicates a problem with the package or the build environment.
-    ");
-
-    Ok(())
-}
--- a/crates/uv/tests/it/build_backend.rs
+++ b/crates/uv/tests/it/build_backend.rs
@ -224,6 +224,7 @@ fn preserve_executable_bit() -> Result<()> {
        .init()
        .arg("--build-backend")
        .arg("uv")
+        .arg("--preview")
        .arg(&project_dir)
        .assert()
        .success();
@ -315,7 +316,8 @@ fn rename_module() -> Result<()> {
    uv_snapshot!(context
        .build_backend()
        .arg("build-wheel")
-        .arg(temp_dir.path()), @r###"
+        .arg(temp_dir.path())
+        .env("UV_PREVIEW", "1"), @r###"
    success: true
    exit_code: 0
    ----- stdout -----
@ -389,7 +391,8 @@ fn rename_module_editable_build() -> Result<()> {
    uv_snapshot!(context
        .build_backend()
        .arg("build-editable")
-        .arg(temp_dir.path()), @r###"
+        .arg(temp_dir.path())
+        .env("UV_PREVIEW", "1"), @r###"
    success: true
    exit_code: 0
    ----- stdout -----
@ -565,7 +568,8 @@ fn build_sdist_with_long_path() -> Result<()> {
    uv_snapshot!(context
        .build_backend()
        .arg("build-sdist")
-        .arg(temp_dir.path()), @r###"
+        .arg(temp_dir.path())
+        .env("UV_PREVIEW", "1"), @r###"
    success: true
    exit_code: 0
    ----- stdout -----
@ -598,7 +602,8 @@ fn sdist_error_without_module() -> Result<()> {
    uv_snapshot!(context
        .build_backend()
        .arg("build-sdist")
-        .arg(temp_dir.path()), @r"
+        .arg(temp_dir.path())
+        .env("UV_PREVIEW", "1"), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@ -612,7 +617,8 @@ fn sdist_error_without_module() -> Result<()> {
    uv_snapshot!(context
        .build_backend()
        .arg("build-sdist")
-        .arg(temp_dir.path()), @r"
+        .arg(temp_dir.path())
+        .env("UV_PREVIEW", "1"), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@ -676,6 +682,7 @@ fn complex_namespace_packages() -> Result<()> {

        context
            .build()
+            .arg("--preview")
            .arg(project.path())
            .arg("--out-dir")
            .arg(dist.path())
@ -724,6 +731,7 @@ fn complex_namespace_packages() -> Result<()> {
        context.filters(),
        context
            .pip_install()
+            .arg("--preview")
            .arg("-e")
            .arg("complex-project-part_a")
            .arg("-e")
@ -770,6 +778,7 @@ fn symlinked_file() -> Result<()> {
    let project = context.temp_dir.child("project");
    context
        .init()
+        .arg("--preview")
        .arg("--build-backend")
        .arg("uv")
        .arg(project.path())
@ -849,40 +858,3 @@ fn symlinked_file() -> Result<()> {

    Ok(())
 }
-
-/// Ignore invalid build backend settings when not building.
-///
-/// They may be from another `uv_build` version that has a different schema.
-#[test]
-fn invalid_build_backend_settings_are_ignored() -> Result<()> {
-    let context = TestContext::new("3.12");
-
-    let pyproject_toml = context.temp_dir.child("pyproject.toml");
-    pyproject_toml.write_str(indoc! {r#"
-        [project]
-        name = "built-by-uv"
-        version = "0.1.0"
-        requires-python = ">=3.12"
-
-        [tool.uv.build-backend]
-        # Error: `source-include` must be a list
-        source-include = "data/build-script.py"
-
-        [build-system]
-        requires = ["uv_build>=10000,<10001"]
-        build-backend = "uv_build"
-    "#})?;
-
-    // Since we are not building, this must pass without complaining about the error in
-    // `tool.uv.build-backend`.
-    uv_snapshot!(context.filters(), context.lock(), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    Resolved 1 package in [TIME]
-    ");
-
-    Ok(())
-}
--- a/crates/uv/tests/it/common/mod.rs
+++ b/crates/uv/tests/it/common/mod.rs
@ -66,7 +66,7 @@ pub const INSTA_FILTERS: &[(&str, &str)] = &[
    (r"uv\.exe", "uv"),
    // uv version display
    (
-        r"uv(-.*)? \d+\.\d+\.\d+(-(alpha|beta|rc)\.\d+)?(\+\d+)?( \([^)]*\))?",
+        r"uv(-.*)? \d+\.\d+\.\d+(\+\d+)?( \(.*\))?",
        r"uv [VERSION] ([COMMIT] DATE)",
    ),
    // Trim end-of-line whitespaces, to allow removing them on save.
@ -254,7 +254,7 @@ impl TestContext {
        let added_filters = [
            (r"home = .+".to_string(), "home = [PYTHON_HOME]".to_string()),
            (
-                r"uv = \d+\.\d+\.\d+(-(alpha|beta|rc)\.\d+)?(\+\d+)?".to_string(),
+                r"uv = \d+\.\d+\.\d+".to_string(),
                "uv = [UV_VERSION]".to_string(),
            ),
            (
@ -517,8 +517,6 @@ impl TestContext {
        if cfg!(windows) {
            filters.push((" --link-mode <LINK_MODE>".to_string(), String::new()));
            filters.push((r#"link-mode = "copy"\n"#.to_string(), String::new()));
-            // Unix uses "exit status", Windows uses "exit code"
-            filters.push((r"exit code: ".to_string(), "exit status: ".to_string()));
        }

        filters.extend(
--- a/crates/uv/tests/it/edit.rs
+++ b/crates/uv/tests/it/edit.rs
@ -7246,7 +7246,10 @@ fn fail_to_add_revert_project() -> Result<()> {
        .child("setup.py")
        .write_str("1/0")?;

-    uv_snapshot!(context.filters(), context.add().arg("./child"), @r#"
+    let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
+        .chain(context.filters())
+        .collect::<Vec<_>>();
+    uv_snapshot!(filters, context.add().arg("./child"), @r#"
    success: false
    exit_code: 1
    ----- stdout -----
@ -7348,7 +7351,10 @@ fn fail_to_edit_revert_project() -> Result<()> {
        .child("setup.py")
        .write_str("1/0")?;

-    uv_snapshot!(context.filters(), context.add().arg("./child"), @r#"
+    let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
+        .chain(context.filters())
+        .collect::<Vec<_>>();
+    uv_snapshot!(filters, context.add().arg("./child"), @r#"
    success: false
    exit_code: 1
    ----- stdout -----
--- a/crates/uv/tests/it/lock.rs
+++ b/crates/uv/tests/it/lock.rs
@ -4551,15 +4551,15 @@ fn lock_requires_python_compatible_specifier() -> Result<()> {
        "#,
    )?;

-    uv_snapshot!(context.filters(), context.lock(), @r"
+    uv_snapshot!(context.filters(), context.lock(), @r###"
    success: true
    exit_code: 0
    ----- stdout -----

    ----- stderr -----
-    warning: The `requires-python` specifier (`~=3.13`) in `warehouse` uses the tilde specifier (`~=`) without a patch version. This will be interpreted as `>=3.13, <4`. Did you mean `~=3.13.0` to constrain the version as `>=3.13.0, <3.14`? We recommend only using the tilde specifier with a patch version to avoid ambiguity.
+    warning: The release specifier (`~=3.13`) contains a compatible release match without a patch version. This will be interpreted as `>=3.13, <4`. Did you mean `~=3.13.0` to freeze the minor version?
    Resolved 1 package in [TIME]
-    ");
+    "###);

    pyproject_toml.write_str(
        r#"
@ -5013,14 +5013,14 @@ fn lock_requires_python_not_equal() -> Result<()> {
        "#,
    )?;

-    uv_snapshot!(context.filters(), context.lock(), @r"
+    uv_snapshot!(context.filters(), context.lock(), @r###"
    success: true
    exit_code: 0
    ----- stdout -----

    ----- stderr -----
    Resolved 2 packages in [TIME]
-    ");
+    "###);

    let lock = fs_err::read_to_string(&lockfile).unwrap();

@ -23617,7 +23617,10 @@ fn lock_derivation_chain_prod() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"/.*/src", "/[TMP]/src")])
+        .chain([
+            (r"exit code: 1", "exit status: 1"),
+            (r"/.*/src", "/[TMP]/src"),
+        ])
        .collect::<Vec<_>>();

    uv_snapshot!(filters, context.lock(), @r###"
@ -23674,7 +23677,10 @@ fn lock_derivation_chain_extra() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"/.*/src", "/[TMP]/src")])
+        .chain([
+            (r"exit code: 1", "exit status: 1"),
+            (r"/.*/src", "/[TMP]/src"),
+        ])
        .collect::<Vec<_>>();

    uv_snapshot!(filters, context.lock(), @r###"
@ -23733,7 +23739,10 @@ fn lock_derivation_chain_group() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"/.*/src", "/[TMP]/src")])
+        .chain([
+            (r"exit code: 1", "exit status: 1"),
+            (r"/.*/src", "/[TMP]/src"),
+        ])
        .collect::<Vec<_>>();

    uv_snapshot!(filters, context.lock(), @r###"
@ -23803,7 +23812,10 @@ fn lock_derivation_chain_extended() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"/.*/src", "/[TMP]/src")])
+        .chain([
+            (r"exit code: 1", "exit status: 1"),
+            (r"/.*/src", "/[TMP]/src"),
+        ])
        .collect::<Vec<_>>();

    uv_snapshot!(filters, context.lock(), @r###"
@ -27510,7 +27522,7 @@ fn windows_arm() -> Result<()> {
            lock, @r#"
        version = 1
        revision = 2
-        requires-python = "==3.12.*"
+        requires-python = ">=3.12.[X], <3.13"
        resolution-markers = [
            "platform_machine == 'x86_64' and sys_platform == 'linux'",
            "platform_machine == 'AMD64' and sys_platform == 'win32'",
@ -27587,7 +27599,7 @@ fn windows_amd64_required() -> Result<()> {
            lock, @r#"
        version = 1
        revision = 2
-        requires-python = "==3.12.*"
+        requires-python = ">=3.12.[X], <3.13"
        required-markers = [
            "platform_machine == 'x86' and sys_platform == 'win32'",
            "platform_machine == 'AMD64' and sys_platform == 'win32'",
@ -28713,34 +28725,3 @@ fn lock_prefix_match() -> Result<()> {

    Ok(())
 }
-
-/// Regression test for <https://github.com/astral-sh/uv/issues/14231>.
-#[test]
-fn test_tilde_equals_python_version() -> Result<()> {
-    let context = TestContext::new("3.12");
-
-    let pyproject_toml = context.temp_dir.child("pyproject.toml");
-    pyproject_toml.write_str(
-        r#"
-        [project]
-        name = "debug"
-        version = "0.1.0"
-        requires-python = ">=3.9"
-        dependencies = [
-          "anyio==4.2.0; python_full_version >= '3.11'",
-          "anyio==4.3.0; python_full_version ~= '3.10.0'",
-        ]
-    "#,
-    )?;
-
-    uv_snapshot!(context.filters(), context.lock(), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    Resolved 7 packages in [TIME]
-    ");
-
-    Ok(())
-}
--- a/crates/uv/tests/it/pip_compile.rs
+++ b/crates/uv/tests/it/pip_compile.rs
@ -2909,16 +2909,16 @@ fn incompatible_narrowed_url_dependency() -> Result<()> {
    "})?;

    uv_snapshot!(context.filters(), context.pip_compile()
-            .arg("requirements.in"), @r"
+            .arg("requirements.in"), @r###"
    success: false
    exit_code: 2
    ----- stdout -----

    ----- stderr -----
    error: Requirements contain conflicting URLs for package `uv-public-pypackage`:
-    - git+https://github.com/astral-test/uv-public-pypackage@test-branch
    - git+https://github.com/astral-test/uv-public-pypackage@b270df1a2fb5d012294e9aaf05e7e0bab1e6a389
-    "
+    - git+https://github.com/astral-test/uv-public-pypackage@test-branch
+    "###
    );

    Ok(())
@ -14679,7 +14679,10 @@ fn compile_derivation_chain() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"/.*/src", "/[TMP]/src")])
+        .chain([
+            (r"exit code: 1", "exit status: 1"),
+            (r"/.*/src", "/[TMP]/src"),
+        ])
        .collect::<Vec<_>>();

    uv_snapshot!(filters, context.pip_compile().arg("pyproject.toml"), @r###"
@ -16342,7 +16345,7 @@ fn pep_751_compile_registry_wheel() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o pylock.toml
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "iniconfig"
@ -16391,7 +16394,7 @@ fn pep_751_compile_registry_sdist() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o pylock.toml
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "source-distribution"
@ -16475,7 +16478,7 @@ fn pep_751_compile_directory() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o pylock.toml
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "anyio"
@ -16546,7 +16549,7 @@ fn pep_751_compile_git() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o pylock.toml
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "uv-public-pypackage"
@ -16596,7 +16599,7 @@ fn pep_751_compile_url_wheel() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o pylock.toml
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "anyio"
@ -16660,7 +16663,7 @@ fn pep_751_compile_url_sdist() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o pylock.toml
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "anyio"
@ -16729,7 +16732,7 @@ fn pep_751_compile_path_wheel() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o pylock.toml
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "iniconfig"
@ -16767,7 +16770,7 @@ fn pep_751_compile_path_wheel() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o nested/pylock.toml
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "iniconfig"
@ -16808,7 +16811,7 @@ fn pep_751_compile_path_sdist() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o pylock.toml
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "iniconfig"
@ -16847,7 +16850,7 @@ fn pep_751_compile_path_sdist() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o nested/pylock.toml
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "iniconfig"
@ -16884,7 +16887,7 @@ fn pep_751_compile_preferences() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o pylock.toml
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "anyio"
@ -16925,7 +16928,7 @@ fn pep_751_compile_preferences() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o pylock.toml
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "anyio"
@ -16965,7 +16968,7 @@ fn pep_751_compile_preferences() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o pylock.toml
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "anyio"
@ -17004,7 +17007,7 @@ fn pep_751_compile_preferences() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o pylock.toml
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "anyio"
@ -17052,7 +17055,7 @@ fn pep_751_compile_warn() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o pylock.toml --emit-index-url
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "iniconfig"
@ -17265,7 +17268,7 @@ fn pep_751_compile_no_emit_package() -> Result<()> {
    #    uv pip compile --cache-dir [CACHE_DIR] requirements.txt --universal -o pylock.toml --no-emit-package idna
    lock-version = "1.0"
    created-by = "uv"
-    requires-python = ">=3.12"
+    requires-python = ">=3.12.[X]"

    [[packages]]
    name = "anyio"
@ -17559,47 +17562,3 @@ fn git_path_transitive_dependency() -> Result<()> {

    Ok(())
 }
-
-/// Ensure that `--emit-index-annotation` plays nicely with `--annotation-style=line`.
-#[test]
-fn omit_python_patch_universal() -> Result<()> {
-    let context = TestContext::new("3.11");
-
-    let requirements_in = context.temp_dir.child("requirements.in");
-    requirements_in.write_str("redis")?;
-
-    uv_snapshot!(context.filters(), context.pip_compile()
-        .arg("requirements.in"), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    # This file was autogenerated by uv via the following command:
-    #    uv pip compile --cache-dir [CACHE_DIR] requirements.in
-    redis==5.0.3
-        # via -r requirements.in
-
-    ----- stderr -----
-    Resolved 1 package in [TIME]
-    "
-    );
-
-    uv_snapshot!(context.filters(), context.pip_compile()
-        .arg("requirements.in")
-        .arg("--universal"), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    # This file was autogenerated by uv via the following command:
-    #    uv pip compile --cache-dir [CACHE_DIR] requirements.in --universal
-    async-timeout==4.0.3 ; python_full_version < '3.11.[X]'
-        # via redis
-    redis==5.0.3
-        # via -r requirements.in
-
-    ----- stderr -----
-    Resolved 2 packages in [TIME]
-    "
-    );
-
-    Ok(())
-}
--- a/crates/uv/tests/it/pip_install.rs
+++ b/crates/uv/tests/it/pip_install.rs
@ -342,7 +342,10 @@ dependencies = ["flask==1.0.x"]
    let requirements_txt = context.temp_dir.child("requirements.txt");
    requirements_txt.write_str("./path_dep")?;

-    uv_snapshot!(context.filters(), context.pip_install()
+    let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
+        .chain(context.filters())
+        .collect::<Vec<_>>();
+    uv_snapshot!(filters, context.pip_install()
        .arg("-r")
        .arg("requirements.txt"), @r###"
    success: false
@ -1512,16 +1515,16 @@ fn install_editable_incompatible_constraint_url() -> Result<()> {
        .arg("-e")
        .arg(context.workspace_root.join("scripts/packages/black_editable"))
        .arg("--constraint")
-        .arg("constraints.txt"), @r"
+        .arg("constraints.txt"), @r###"
    success: false
    exit_code: 2
    ----- stdout -----

    ----- stderr -----
    error: Requirements contain conflicting URLs for package `black`:
-    - file://[WORKSPACE]/scripts/packages/black_editable (editable)
+    - [WORKSPACE]/scripts/packages/black_editable
    - https://files.pythonhosted.org/packages/0f/89/294c9a6b6c75a08da55e9d05321d0707e9418735e3062b12ef0f54c33474/black-24.4.2-py3-none-any.whl
-    "
+    "###
    );

    Ok(())
@ -4927,7 +4930,10 @@ fn no_build_isolation() -> Result<()> {
    requirements_in.write_str("anyio @ https://files.pythonhosted.org/packages/db/4d/3970183622f0330d3c23d9b8a5f52e365e50381fd484d08e3285104333d3/anyio-4.3.0.tar.gz")?;

    // We expect the build to fail, because `setuptools` is not installed.
-    uv_snapshot!(context.filters(), context.pip_install()
+    let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
+        .chain(context.filters())
+        .collect::<Vec<_>>();
+    uv_snapshot!(filters, context.pip_install()
        .arg("-r")
        .arg("requirements.in")
        .arg("--no-build-isolation"), @r###"
@ -4995,7 +5001,10 @@ fn respect_no_build_isolation_env_var() -> Result<()> {
    requirements_in.write_str("anyio @ https://files.pythonhosted.org/packages/db/4d/3970183622f0330d3c23d9b8a5f52e365e50381fd484d08e3285104333d3/anyio-4.3.0.tar.gz")?;

    // We expect the build to fail, because `setuptools` is not installed.
-    uv_snapshot!(context.filters(), context.pip_install()
+    let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
+        .chain(context.filters())
+        .collect::<Vec<_>>();
+    uv_snapshot!(filters, context.pip_install()
        .arg("-r")
        .arg("requirements.in")
        .env(EnvVars::UV_NO_BUILD_ISOLATION, "yes"), @r###"
@ -8592,7 +8601,10 @@ fn install_build_isolation_package() -> Result<()> {
    )?;

    // Running `uv pip install` should fail for iniconfig.
-    uv_snapshot!(context.filters(), context.pip_install()
+    let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
+        .chain(context.filters())
+        .collect::<Vec<_>>();
+    uv_snapshot!(filters, context.pip_install()
        .arg("--no-build-isolation-package")
        .arg("iniconfig")
        .arg(package.path()), @r###"
@ -8919,7 +8931,10 @@ fn missing_top_level() {
 fn sklearn() {
    let context = TestContext::new("3.12");

-    uv_snapshot!(context.filters(), context.pip_install().arg("sklearn"), @r###"
+    let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
+        .chain(context.filters())
+        .collect::<Vec<_>>();
+    uv_snapshot!(filters, context.pip_install().arg("sklearn"), @r###"
    success: false
    exit_code: 1
    ----- stdout -----
@ -8969,7 +8984,10 @@ fn resolve_derivation_chain() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"/.*/src", "/[TMP]/src")])
+        .chain([
+            (r"exit code: 1", "exit status: 1"),
+            (r"/.*/src", "/[TMP]/src"),
+        ])
        .collect::<Vec<_>>();

    uv_snapshot!(filters, context.pip_install()
@ -11468,25 +11486,3 @@ fn pep_751_dependency() -> Result<()> {

    Ok(())
 }
-
-/// Test that we show an error instead of panicking for conflicting arguments in different levels,
-/// which are not caught by clap.
-#[test]
-fn conflicting_flags_clap_bug() {
-    let context = TestContext::new("3.12");
-
-    uv_snapshot!(context.filters(), context.command()
-        .arg("pip")
-        .arg("--offline")
-        .arg("install")
-        .arg("--no-offline")
-        .arg("tqdm"), @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: `--offline` and `--no-offline` cannot be used together. Boolean flags on different levels are currently not supported (https://github.com/clap-rs/clap/issues/6049)
-    "
-    );
-}
--- a/crates/uv/tests/it/run.rs
+++ b/crates/uv/tests/it/run.rs
@ -4777,7 +4777,7 @@ fn run_groups_include_requires_python() -> Result<()> {
        bar = ["iniconfig"]
        baz = ["iniconfig"]
        dev = ["sniffio", {include-group = "foo"}, {include-group = "baz"}]
-
+        

        [tool.uv.dependency-groups]
        foo = {requires-python="<3.13"}
@ -4876,7 +4876,7 @@ fn exit_status_signal() -> Result<()> {

 #[test]
 fn run_repeated() -> Result<()> {
-    let context = TestContext::new_with_versions(&["3.13", "3.12"]);
+    let context = TestContext::new_with_versions(&["3.13"]);

    let pyproject_toml = context.temp_dir.child("pyproject.toml");
    pyproject_toml.write_str(indoc! { r#"
@ -4923,25 +4923,22 @@ fn run_repeated() -> Result<()> {
    Resolved 1 package in [TIME]
    "###);

-    // Re-running as a tool does require reinstalling `typing-extensions`, since the base venv is
-    // different.
+    // Re-running as a tool shouldn't require reinstalling `typing-extensions`, since the environment is cached.
    uv_snapshot!(
        context.filters(),
-        context.tool_run().arg("--with").arg("typing-extensions").arg("python").arg("-c").arg("import typing_extensions; import iniconfig"), @r#"
+        context.tool_run().arg("--with").arg("typing-extensions").arg("python").arg("-c").arg("import typing_extensions; import iniconfig"), @r###"
    success: false
    exit_code: 1
    ----- stdout -----

    ----- stderr -----
    Resolved 1 package in [TIME]
-    Installed 1 package in [TIME]
-     + typing-extensions==4.10.0
    Traceback (most recent call last):
      File "<string>", line 1, in <module>
        import typing_extensions; import iniconfig
                                  ^^^^^^^^^^^^^^^^
    ModuleNotFoundError: No module named 'iniconfig'
-    "#);
+    "###);

    Ok(())
 }
@ -4982,25 +4979,22 @@ fn run_without_overlay() -> Result<()> {
     + typing-extensions==4.10.0
    "###);

-    // Import `iniconfig` in the context of a `tool run` command, which should fail. Note that
-    // typing-extensions gets installed again, because the venv is not shared.
+    // Import `iniconfig` in the context of a `tool run` command, which should fail.
    uv_snapshot!(
        context.filters(),
-        context.tool_run().arg("--with").arg("typing-extensions").arg("python").arg("-c").arg("import typing_extensions; import iniconfig"), @r#"
+        context.tool_run().arg("--with").arg("typing-extensions").arg("python").arg("-c").arg("import typing_extensions; import iniconfig"), @r###"
    success: false
    exit_code: 1
    ----- stdout -----

    ----- stderr -----
    Resolved 1 package in [TIME]
-    Installed 1 package in [TIME]
-     + typing-extensions==4.10.0
    Traceback (most recent call last):
      File "<string>", line 1, in <module>
        import typing_extensions; import iniconfig
                                  ^^^^^^^^^^^^^^^^
    ModuleNotFoundError: No module named 'iniconfig'
-    "#);
+    "###);

    // Re-running in the context of the project should reset the overlay.
    uv_snapshot!(
--- a/crates/uv/tests/it/sync.rs
+++ b/crates/uv/tests/it/sync.rs
@ -3,13 +3,12 @@ use assert_cmd::prelude::*;
 use assert_fs::{fixture::ChildPath, prelude::*};
 use indoc::{formatdoc, indoc};
 use insta::assert_snapshot;
-use predicates::prelude::predicate;
-use tempfile::tempdir_in;
-
-use uv_fs::Simplified;
-use uv_static::EnvVars;

 use crate::common::{TestContext, download_to_disk, packse_index_url, uv_snapshot, venv_bin_path};
+use predicates::prelude::predicate;
+use tempfile::tempdir_in;
+use uv_fs::Simplified;
+use uv_static::EnvVars;

 #[test]
 fn sync() -> Result<()> {
@ -1122,7 +1121,10 @@ fn sync_build_isolation_package() -> Result<()> {
    )?;

    // Running `uv sync` should fail for iniconfig.
-    uv_snapshot!(context.filters(), context.sync().arg("--no-build-isolation-package").arg("source-distribution"), @r###"
+    let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
+        .chain(context.filters())
+        .collect::<Vec<_>>();
+    uv_snapshot!(filters, context.sync().arg("--no-build-isolation-package").arg("source-distribution"), @r###"
    success: false
    exit_code: 1
    ----- stdout -----
@ -1212,7 +1214,10 @@ fn sync_build_isolation_extra() -> Result<()> {
    )?;

    // Running `uv sync` should fail for the `compile` extra.
-    uv_snapshot!(context.filters(), context.sync().arg("--extra").arg("compile"), @r###"
+    let filters = std::iter::once((r"exit code: 1", "exit status: 1"))
+        .chain(context.filters())
+        .collect::<Vec<_>>();
+    uv_snapshot!(&filters, context.sync().arg("--extra").arg("compile"), @r###"
    success: false
    exit_code: 1
    ----- stdout -----
@ -1233,7 +1238,7 @@ fn sync_build_isolation_extra() -> Result<()> {
    "###);

    // Running `uv sync` with `--all-extras` should also fail.
-    uv_snapshot!(context.filters(), context.sync().arg("--all-extras"), @r###"
+    uv_snapshot!(&filters, context.sync().arg("--all-extras"), @r###"
    success: false
    exit_code: 1
    ----- stdout -----
@ -6979,7 +6984,10 @@ fn sync_derivation_chain() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"/.*/src", "/[TMP]/src")])
+        .chain([
+            (r"exit code: 1", "exit status: 1"),
+            (r"/.*/src", "/[TMP]/src"),
+        ])
        .collect::<Vec<_>>();

    uv_snapshot!(filters, context.sync(), @r###"
@ -7042,7 +7050,10 @@ fn sync_derivation_chain_extra() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"/.*/src", "/[TMP]/src")])
+        .chain([
+            (r"exit code: 1", "exit status: 1"),
+            (r"/.*/src", "/[TMP]/src"),
+        ])
        .collect::<Vec<_>>();

    uv_snapshot!(filters, context.sync().arg("--extra").arg("wsgi"), @r###"
@ -7107,7 +7118,10 @@ fn sync_derivation_chain_group() -> Result<()> {
    let filters = context
        .filters()
        .into_iter()
-        .chain([(r"/.*/src", "/[TMP]/src")])
+        .chain([
+            (r"exit code: 1", "exit status: 1"),
+            (r"/.*/src", "/[TMP]/src"),
+        ])
        .collect::<Vec<_>>();

    uv_snapshot!(filters, context.sync().arg("--group").arg("wsgi"), @r###"
@ -9975,54 +9989,3 @@ fn sync_url_with_query_parameters() -> Result<()> {

    Ok(())
 }
-
-#[test]
-#[cfg(unix)]
-fn read_only() -> Result<()> {
-    use std::os::unix::fs::PermissionsExt;
-
-    let context = TestContext::new("3.12");
-
-    let pyproject_toml = context.temp_dir.child("pyproject.toml");
-    pyproject_toml.write_str(
-        r#"
-        [project]
-        name = "project"
-        version = "0.1.0"
-        requires-python = ">=3.12"
-        dependencies = ["iniconfig"]
-        "#,
-    )?;
-
-    uv_snapshot!(context.filters(), context.sync(), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    Resolved 2 packages in [TIME]
-    Prepared 1 package in [TIME]
-    Installed 1 package in [TIME]
-     + iniconfig==2.0.0
-    "###);
-
-    assert!(context.temp_dir.child("uv.lock").exists());
-
-    // Remove the flock.
-    fs_err::remove_file(context.venv.child(".lock"))?;
-
-    // Make the virtual environment read and execute (but not write).
-    fs_err::set_permissions(&context.venv, std::fs::Permissions::from_mode(0o555))?;
-
-    uv_snapshot!(context.filters(), context.sync(), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    Resolved 2 packages in [TIME]
-    Audited 1 package in [TIME]
-    ");
-
-    Ok(())
-}
--- a/crates/uv/tests/it/tool_install.rs
+++ b/crates/uv/tests/it/tool_install.rs
@ -448,13 +448,13 @@ fn tool_install_suggest_other_packages_with_executable() {
    uv_snapshot!(filters, context.tool_install()
        .arg("fastapi==0.111.0")
        .env(EnvVars::UV_TOOL_DIR, tool_dir.as_os_str())
-        .env(EnvVars::XDG_BIN_HOME, bin_dir.as_os_str()), @r"
+        .env(EnvVars::XDG_BIN_HOME, bin_dir.as_os_str()), @r###"
    success: false
    exit_code: 1
    ----- stdout -----
-    No executables are provided by package `fastapi`; removing tool
-    hint: An executable with the name `fastapi` is available via dependency `fastapi-cli`.
-          Did you mean `uv tool install fastapi-cli`?
+    No executables are provided by `fastapi`
+    However, an executable with the name `fastapi` is available via dependency `fastapi-cli`.
+    Did you mean `uv tool install fastapi-cli`?

    ----- stderr -----
    Resolved 35 packages in [TIME]
@ -494,7 +494,7 @@ fn tool_install_suggest_other_packages_with_executable() {
     + uvicorn==0.29.0
     + watchfiles==0.21.0
     + websockets==12.0
-    ");
+    "###);
 }

 /// Test installing a tool at a version
@ -821,11 +821,11 @@ fn tool_install_remove_on_empty() -> Result<()> {
        .arg(black.path())
        .env(EnvVars::UV_TOOL_DIR, tool_dir.as_os_str())
        .env(EnvVars::XDG_BIN_HOME, bin_dir.as_os_str())
-        .env(EnvVars::PATH, bin_dir.as_os_str()), @r"
+        .env(EnvVars::PATH, bin_dir.as_os_str()), @r###"
    success: false
    exit_code: 1
    ----- stdout -----
-    No executables are provided by package `black`; removing tool
+    No executables are provided by `black`

    ----- stderr -----
    Resolved 1 package in [TIME]
@ -839,7 +839,7 @@ fn tool_install_remove_on_empty() -> Result<()> {
     - packaging==24.0
     - pathspec==0.12.1
     - platformdirs==4.2.0
-    ");
+    "###);

    // Re-request `black`. It should reinstall, without requiring `--force`.
    uv_snapshot!(context.filters(), context.tool_install()
@ -1649,18 +1649,18 @@ fn tool_install_no_entrypoints() {
        .arg("iniconfig")
        .env(EnvVars::UV_TOOL_DIR, tool_dir.as_os_str())
        .env(EnvVars::XDG_BIN_HOME, bin_dir.as_os_str())
-        .env(EnvVars::PATH, bin_dir.as_os_str()), @r"
+        .env(EnvVars::PATH, bin_dir.as_os_str()), @r###"
    success: false
    exit_code: 1
    ----- stdout -----
-    No executables are provided by package `iniconfig`; removing tool
+    No executables are provided by `iniconfig`

    ----- stderr -----
    Resolved 1 package in [TIME]
    Prepared 1 package in [TIME]
    Installed 1 package in [TIME]
     + iniconfig==2.0.0
-    ");
+    "###);

    // Ensure the tool environment is not created.
    tool_dir
@ -1682,6 +1682,7 @@ fn tool_install_uninstallable() {
        .filters()
        .into_iter()
        .chain([
+            (r"exit code: 1", "exit status: 1"),
            (r"bdist\.[^/\\\s]+(-[^/\\\s]+)?", "bdist.linux-x86_64"),
            (r"\\\.", ""),
            (r"#+", "#"),
--- a/Show more
+++ b/Show more