diff --git a/.github/workflows/python-release.yml b/.github/workflows/python-release.yml new file mode 100644 index 00000000..52675b20 --- /dev/null +++ b/.github/workflows/python-release.yml @@ -0,0 +1,464 @@ +name: "Python Release" + +on: + workflow_dispatch: + inputs: + tag: + description: "The version to tag, without the leading 'v'. If omitted, will initiate a dry run (no uploads)." + type: string + sha: + description: "The full sha of the commit to be released. If omitted, the latest commit on the default branch will be used." + default: "" + type: string + pull_request: + paths: + # When we change pyproject.toml, we want to ensure that the maturin builds still work + - py-rattler-build/pyproject.toml + # And when we change this workflow itself... + - .github/workflows/python-release.yml + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +env: + PACKAGE_NAME: py_rattler_build + PYTHON_VERSION: "3.11" + CARGO_INCREMENTAL: 0 + CARGO_NET_RETRY: 10 + CARGO_TERM_COLOR: always + RUSTUP_MAX_RETRIES: 10 + +jobs: + sdist: + name: Python Build sdist + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ inputs.sha }} + - uses: actions/setup-python@v5 + with: + python-version: ${{ env.PYTHON_VERSION }} + - name: "Build sdist" + uses: PyO3/maturin-action@v1 + with: + working-directory: py-rattler-build + command: sdist + args: --out dist + # - name: "Test sdist" + # run: | + # rustup default $(cat rust-toolchain) + # cd py-rattler-build + # pip install dist/${{ env.PACKAGE_NAME }}-*.tar.gz --force-reinstall + # python -c "import rattler_build; print(rattler_build.rattler_build_version())" + - name: "Upload sdist" + uses: actions/upload-artifact@v4 + with: + name: sdist + path: py-rattler-build/dist + + windows: + runs-on: windows-latest + name: Python Build ${{ matrix.platform.target }} + strategy: + fail-fast: false + matrix: + platform: + - target: x86_64-pc-windows-msvc + arch: x64 + - target: i686-pc-windows-msvc + arch: x86 +# There are a number of issues with cross compiling ring to windows on aarch64. +# For now, we just won't build a wheel, we will revisit this in the future. +# - target: aarch64-pc-windows-msvc +# arch: x64 + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ inputs.sha }} + - uses: actions/setup-python@v5 + with: + python-version: ${{ env.PYTHON_VERSION }} + architecture: ${{ matrix.platform.arch }} + - name: "Build wheels" + uses: PyO3/maturin-action@v1 + with: + working-directory: py-rattler-build + target: ${{ matrix.platform.target }} + args: --release --out dist --no-default-features --features rustls-tls + - name: "Test wheel" + if: ${{ !startsWith(matrix.platform.target, 'aarch64') }} + shell: bash + run: | + python -m pip install py-rattler-build/dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall + python -c "import rattler_build; print(rattler_build.rattler_build_version())" + - name: "Upload wheels" + uses: actions/upload-artifact@v4 + with: + name: windows-wheels-${{ matrix.platform.target }} + path: py-rattler-build/dist + + linux: + runs-on: ubuntu-latest + name: Python Build ${{ matrix.target }} + strategy: + fail-fast: false + matrix: + target: + - x86_64-unknown-linux-gnu + - i686-unknown-linux-gnu + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ inputs.sha }} + - uses: actions/setup-python@v5 + with: + python-version: ${{ env.PYTHON_VERSION }} + architecture: x64 + - name: "Build wheels" + uses: PyO3/maturin-action@v1 + with: + working-directory: py-rattler-build + target: ${{ matrix.target }} + manylinux: auto + args: --release --out dist --no-default-features --features rustls-tls + - name: "Test wheel" + if: ${{ startsWith(matrix.target, 'x86_64') }} + run: | + pip install py-rattler-build/dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall + python -c "import rattler_build; print(rattler_build.rattler_build_version())" + - name: "Upload wheels" + uses: actions/upload-artifact@v4 + with: + name: linux-wheels-${{ matrix.target }} + path: py-rattler-build/dist + + linux-cross: + runs-on: ubuntu-latest + name: Python Build ${{ matrix.platform.target }} + strategy: + fail-fast: false + matrix: + platform: + - target: aarch64-unknown-linux-gnu + arch: aarch64 + - target: armv7-unknown-linux-gnueabihf + arch: armv7 + + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ inputs.sha }} + - uses: actions/setup-python@v5 + with: + python-version: ${{ env.PYTHON_VERSION }} + - name: "Build wheels" + uses: PyO3/maturin-action@v1 + with: + working-directory: py-rattler-build + target: ${{ matrix.platform.target }} + manylinux: '2_28' + docker-options: ${{ matrix.platform.maturin_docker_options }} + args: --release --out dist --no-default-features --features rustls-tls + - uses: uraimo/run-on-arch-action@v2 + if: matrix.platform.arch != 'ppc64' + name: Test wheel + with: + arch: ${{ matrix.platform.arch }} + distro: ubuntu20.04 + githubToken: ${{ github.token }} + install: | + apt-get update + apt-get install -y --no-install-recommends python3 python3-pip + pip3 install -U pip + run: | + pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links py-rattler-build/dist/ --force-reinstall + python3 -c "import rattler_build; print(rattler_build.rattler_build_version())" + - name: "Upload wheels" + uses: actions/upload-artifact@v4 + with: + name: linux-wheels-${{ matrix.platform.target }} + path: py-rattler-build/dist + +# linux-cross-native-tls: +# runs-on: ubuntu-latest +# name: Python Build ${{ matrix.platform.target }} +# strategy: +# fail-fast: false +# matrix: +# platform: +# # - target: s390x-unknown-linux-gnu +# # arch: s390x +# - target: powerpc64le-unknown-linux-gnu +# arch: ppc64le +# - target: powerpc64-unknown-linux-gnu +# arch: ppc64 + +# steps: +# - uses: actions/checkout@v4 +# with: +# ref: ${{ inputs.sha }} +# - uses: actions/setup-python@v5 +# with: +# python-version: ${{ env.PYTHON_VERSION }} +# - name: "Build wheels" +# uses: PyO3/maturin-action@v1 +# with: +# working-directory: py-rattler-build +# target: ${{ matrix.platform.target }} +# manylinux: auto +# docker-options: ${{ matrix.platform.maturin_docker_options }} +# args: --release --out dist --no-default-features --features native-tls,vendored-openssl +# - uses: uraimo/run-on-arch-action@v2 +# if: matrix.platform.arch != 'ppc64' +# name: Test wheel +# with: +# arch: ${{ matrix.platform.arch }} +# distro: ubuntu20.04 +# githubToken: ${{ github.token }} +# install: | +# apt-get update +# apt-get install -y --no-install-recommends python3 python3-pip +# pip3 install -U pip +# run: | +# pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links py-rattler-build/dist/ --force-reinstall +# python3 -c "import rattler_build; print(rattler_build.rattler_build_version())" +# - name: "Upload wheels" +# uses: actions/upload-artifact@v4 +# with: +# name: linux-wheels-${{ matrix.platform.target }} +# path: py-rattler-build/dist + + musllinux: + runs-on: ubuntu-latest + name: Python Build ${{ matrix.target }} + strategy: + fail-fast: false + matrix: + target: + - x86_64-unknown-linux-musl + # - i686-unknown-linux-musl + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ inputs.sha }} + - uses: actions/setup-python@v5 + with: + python-version: ${{ env.PYTHON_VERSION }} + architecture: x64 + - name: "Build wheels (rustls-tls)" + if: matrix.target == 'x86_64-unknown-linux-musl' + uses: PyO3/maturin-action@v1 + with: + working-directory: py-rattler-build + target: ${{ matrix.target }} + manylinux: musllinux_1_2 + args: --release --out dist --no-default-features --features rustls-tls + - name: "Build wheels (native-tls)" + if: matrix.target != 'x86_64-unknown-linux-musl' + uses: PyO3/maturin-action@v1 + with: + working-directory: py-rattler-build + target: ${{ matrix.target }} + manylinux: musllinux_1_2 + args: --release --out dist --no-default-features --features native-tls,vendored-openssl + - name: "Test wheel" + if: matrix.target == 'x86_64-unknown-linux-musl' + uses: addnab/docker-run-action@v3 + with: + image: alpine:latest + options: -v ${{ github.workspace }}:/io -w /io + run: | + apk add py3-pip + pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/py-rattler-build/dist/ --force-reinstall --break-system-packages + python3 -c "import rattler_build; print(rattler_build.rattler_build_version())" + - name: "Upload wheels" + uses: actions/upload-artifact@v4 + with: + name: linux-wheels-${{ matrix.target }} + path: py-rattler-build/dist + + musllinux-cross: + runs-on: ubuntu-latest + name: Python Build ${{ matrix.platform.target }} + strategy: + fail-fast: false + matrix: + platform: + - target: aarch64-unknown-linux-musl + arch: aarch64 + - target: armv7-unknown-linux-musleabihf + arch: armv7 + + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ inputs.sha }} + - uses: actions/setup-python@v5 + with: + python-version: ${{ env.PYTHON_VERSION }} + - name: "Build wheels" + uses: PyO3/maturin-action@v1 + with: + working-directory: py-rattler-build + target: ${{ matrix.platform.target }} + manylinux: musllinux_1_2 + args: --release --out dist --no-default-features --features rustls-tls + docker-options: ${{ matrix.platform.maturin_docker_options }} + - uses: uraimo/run-on-arch-action@v2 + name: Test wheel + with: + arch: ${{ matrix.platform.arch }} + distro: alpine_latest + githubToken: ${{ github.token }} + install: | + apk add py3-pip + run: | + pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links py-rattler-build/dist/ --force-reinstall --break-system-packages + python3 -c "import rattler_build; print(rattler_build.rattler_build_version())" + - name: "Upload wheels" + uses: actions/upload-artifact@v4 + with: + name: linux-wheels-${{ matrix.platform.target }} + path: py-rattler-build/dist + + macos-x86_64: + runs-on: macos-13 # x86_64 runner + name: Python Build x86_64-macos + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ inputs.sha }} + - uses: actions/setup-python@v5 + with: + python-version: ${{ env.PYTHON_VERSION }} + architecture: x64 + - name: "Build wheels - x86_64" + uses: PyO3/maturin-action@v1 + with: + working-directory: py-rattler-build + target: x86_64 + args: --release --out dist --no-default-features --features rustls-tls + - name: "Test wheel - x86_64" + run: | + pip install py-rattler-build/dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall + python -c "import rattler_build; print(rattler_build.rattler_build_version())" + - name: "Upload wheels" + uses: actions/upload-artifact@v4 + with: + name: macos-wheels-x86_64 + path: py-rattler-build/dist + + macos-universal: + runs-on: macos-latest + name: Python Build universal2-apple-macos + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ inputs.sha }} + - uses: actions/setup-python@v5 + with: + python-version: ${{ env.PYTHON_VERSION }} + architecture: x64 + - name: "Build wheels - universal2" + uses: PyO3/maturin-action@v1 + with: + args: --release --target universal2-apple-darwin --out dist --no-default-features --features rustls-tls + working-directory: py-rattler-build + - name: "Test wheel - universal2" + run: | + pip install py-rattler-build/dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall + python -c "import rattler_build; print(rattler_build.rattler_build_version())" + - name: "Upload wheels" + uses: actions/upload-artifact@v4 + with: + name: macos-wheels-universal2 + path: py-rattler-build/dist + + validate-tag: + name: Validate tag + runs-on: ubuntu-latest + # If you don't set an input tag, it's a dry run (no uploads). + if: ${{ inputs.tag }} + steps: + - uses: actions/checkout@v4 + with: + ref: main # We checkout the main branch to check for the commit + - name: Check main branch + if: ${{ inputs.sha }} + run: | + # Fetch the main branch since a shallow checkout is used by default + git fetch origin main --unshallow + if ! git branch --contains ${{ inputs.sha }} | grep -E '(^|\s)main$'; then + echo "The specified sha is not on the main branch" >&2 + exit 1 + fi + - name: Check tag consistency + run: | + # Switch to the commit we want to release + git checkout ${{ inputs.sha }} + version=$(grep -m 1 "version = " py-rattler-build/Cargo.toml | sed -e 's/version = "\(.*\)"/\1/g') + if [ "${{ inputs.tag }}" != "${version}" ]; then + echo "The input tag does not match the version from Cargo.toml:" >&2 + echo "${{ inputs.tag }}" >&2 + echo "${version}" >&2 + exit 1 + else + echo "Releasing ${version}" + fi + + upload-release: + name: Upload to PyPI + runs-on: ubuntu-latest + needs: + - sdist + - macos-universal + - macos-x86_64 + - windows + - linux + - linux-cross + # - linux-cross-native-tls + - musllinux + - musllinux-cross + - validate-tag + # If you don't set an input tag, it's a dry run (no uploads). + if: ${{ inputs.tag }} + environment: + name: release + permissions: + # For pypi trusted publishing + id-token: write + steps: + - uses: actions/download-artifact@v4 + with: + merge-multiple: true + path: wheels + - name: Publish to PyPi + uses: pypa/gh-action-pypi-publish@release/v1 + with: + skip-existing: true + packages-dir: wheels + verbose: true + + tag-release: + name: Tag release + runs-on: ubuntu-latest + needs: upload-release + # If you don't set an input tag, it's a dry run (no uploads). + if: ${{ inputs.tag }} + permissions: + # For git tag + contents: write + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ inputs.sha }} + - name: git tag + run: | + git config user.email "hi@prefix.dev" + git config user.name "Prefix.dev Release CI" + git tag -m "py-rattler-build-v${{ inputs.tag }}" "py-rattler-build-v${{ inputs.tag }}" + # If there is duplicate tag, this will fail. The publish to pypi action will have been a noop (due to skip + # existing), so we make a non-destructive exit here + git push --tags diff --git a/py-rattler-build/Cargo.lock b/py-rattler-build/Cargo.lock index bc1f142f..ce8f21dd 100644 --- a/py-rattler-build/Cargo.lock +++ b/py-rattler-build/Cargo.lock @@ -58,9 +58,9 @@ checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" [[package]] name = "allocator-api2" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android-tzdata" @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "arbitrary" @@ -191,7 +191,7 @@ version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" dependencies = [ - "bzip2", + "bzip2 0.4.4", "flate2", "futures-core", "futures-io", @@ -497,9 +497,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22" +checksum = "786a307d683a5bf92e6fd5fd69a7eb613751668d1d8d67d802846dfe367c62c8" dependencies = [ "memchr", "serde", @@ -525,9 +525,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "bzip2" @@ -539,6 +539,16 @@ dependencies = [ "libc", ] +[[package]] +name = "bzip2" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bafdbf26611df8c14810e268ddceda071c297570a5fb360ceddf617fe417ef58" +dependencies = [ + "bzip2-sys", + "libc", +] + [[package]] name = "bzip2-sys" version = "0.1.11+1.0.8" @@ -594,9 +604,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.1" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf" dependencies = [ "jobserver", "libc", @@ -617,9 +627,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -669,9 +679,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.21" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" dependencies = [ "clap_builder", "clap_derive", @@ -679,9 +689,9 @@ dependencies = [ [[package]] name = "clap-verbosity-flag" -version = "2.2.3" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c77f67047557f62582784fd7482884697731b2932c7d37ced54bce2312e1e2" +checksum = "54381ae56ad222eea3f529c692879e9c65e07945ae48d3dc4d1cb18dbec8cf44" dependencies = [ "clap", "log", @@ -689,9 +699,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.21" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" dependencies = [ "anstream", "anstyle", @@ -732,9 +742,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "colorchoice" @@ -1184,12 +1194,12 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1205,9 +1215,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ "event-listener", "pin-project-lite", @@ -1215,14 +1225,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "file_url" -version = "0.1.7" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2789b7b3e160530d89d1e126aff9811c3421bb77ebb9b62ffa3abbeba69f12d" dependencies = [ "itertools 0.13.0", "percent-encoding", @@ -1586,7 +1597,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.6.0", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -1635,15 +1646,6 @@ version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.5", -] - [[package]] name = "hashlink" version = "0.9.1" @@ -1724,9 +1726,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -2096,9 +2098,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", "hashbrown 0.15.2", @@ -2193,10 +2195,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -2284,9 +2287,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.166" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libdbus-sys" @@ -2299,9 +2302,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", "windows-targets 0.52.6", @@ -2371,12 +2374,12 @@ dependencies = [ [[package]] name = "marked-yaml" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a90dc806da572b03203f1783ab213445cd497a44e147db7b6dc2857d4d9572" +checksum = "f2eb25a7ab146f4058d67a74dfea52e25c133c575f08ce5851da97d224e3ad8d" dependencies = [ "doc-comment", - "hashlink 0.9.1", + "hashlink", "yaml-rust2", ] @@ -2529,11 +2532,10 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi 0.3.9", "libc", "wasi", "windows-sys 0.52.0", @@ -2975,7 +2977,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.6.0", + "indexmap 2.7.0", ] [[package]] @@ -3084,7 +3086,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ "base64 0.22.1", - "indexmap 2.6.0", + "indexmap 2.7.0", "quick-xml", "serde", "time", @@ -3183,9 +3185,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.23.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54b3d09cbdd1f8c20650b28e7b09e338881482f4aa908a5f61a00c98fba2690" +checksum = "e484fd2c8b4cb67ab05a318f1fd6fa8f199fcc30819f08f07d200809dba26c15" dependencies = [ "cfg-if", "indoc", @@ -3202,9 +3204,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.23.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3015cf985888fe66cfb63ce0e321c603706cd541b7aec7ddd35c281390af45d8" +checksum = "dc0e0469a84f208e20044b98965e1561028180219e35352a2afaf2b942beff3b" dependencies = [ "once_cell", "target-lexicon", @@ -3212,9 +3214,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.23.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fca7cd8fd809b5ac4eefb89c1f98f7a7651d3739dfb341ca6980090f554c270" +checksum = "eb1547a7f9966f6f1a0f0227564a9945fe36b90da5a93b3933fc3dc03fae372d" dependencies = [ "libc", "pyo3-build-config", @@ -3222,9 +3224,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.23.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e657fa5379a79151b6ff5328d9216a84f55dc93b17b08e7c3609a969b73aa0" +checksum = "fdb6da8ec6fa5cedd1626c886fc8749bdcbb09424a86461eb8cdf096b7c33257" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -3234,9 +3236,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.23.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295548d5ffd95fd1981d2d3cf4458831b21d60af046b729b6fd143b0ba7aee2f" +checksum = "38a385202ff5a92791168b1136afae5059d3ac118457bb7bc304c197c2d33e7d" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3251,7 +3253,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95c3dd745f99aa3c554b7bb00859f7d18c2f1d6afd749ccc86d60b61e702abd9" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "pep440_rs", "pep508_rs", "serde", @@ -3280,7 +3282,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror 2.0.3", + "thiserror 2.0.6", "tokio", "tracing", ] @@ -3299,7 +3301,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.3", + "thiserror 2.0.6", "tinyvec", "tracing", "web-time", @@ -3307,9 +3309,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da" +checksum = "52cd4b1eff68bf27940dd39811292c49e007f4d0b4c357358dc9b0197be6b527" dependencies = [ "cfg_aliases", "libc", @@ -3366,8 +3368,9 @@ dependencies = [ [[package]] name = "rattler" -version = "0.28.3" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.28.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd552c29726ad42d6023060dc3f42c6bad97af00b479b4c1fb77d3c3e1f6db4" dependencies = [ "anyhow", "clap", @@ -3377,7 +3380,7 @@ dependencies = [ "fs-err 3.0.0", "futures", "humantime", - "indexmap 2.6.0", + "indexmap 2.7.0", "indicatif", "itertools 0.13.0", "memchr", @@ -3406,13 +3409,13 @@ dependencies = [ [[package]] name = "rattler-build" -version = "0.31.1" +version = "0.32.1" dependencies = [ "anyhow", "async-once-cell", "async-recursion", "base64 0.22.1", - "bzip2", + "bzip2 0.5.0", "chrono", "clap", "clap-verbosity-flag", @@ -3429,7 +3432,7 @@ dependencies = [ "goblin", "hex", "ignore", - "indexmap 2.6.0", + "indexmap 2.7.0", "indicatif", "itertools 0.13.0", "lazy_static", @@ -3472,7 +3475,7 @@ dependencies = [ "tar", "tempfile", "terminal_size", - "thiserror 2.0.3", + "thiserror 2.0.6", "tokio", "tokio-util", "toml", @@ -3489,13 +3492,15 @@ dependencies = [ [[package]] name = "rattler_cache" -version = "0.2.11" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2523385739abca920f8b9ac5c292b0835f003ee4fa3d5da89b44fa2e4be68961" dependencies = [ "anyhow", "dashmap", "digest", "dirs", + "fs-err 3.0.0", "fs4 0.11.1", "futures", "fxhash", @@ -3516,8 +3521,9 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.29.2" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fe3619a8d2903b0adfb2889fa58f906855fc5dd260c17d5a4dc2c447a701d1" dependencies = [ "chrono", "dirs", @@ -3525,7 +3531,7 @@ dependencies = [ "fxhash", "glob", "hex", - "indexmap 2.6.0", + "indexmap 2.7.0", "itertools 0.13.0", "lazy-regex", "nom", @@ -3568,7 +3574,8 @@ dependencies = [ [[package]] name = "rattler_digest" version = "1.0.3" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a97526971dd357657ea4c88f6d39b31b2875c87dfe9fd12aac305fec6c0f60" dependencies = [ "blake2", "digest", @@ -3583,8 +3590,9 @@ dependencies = [ [[package]] name = "rattler_index" -version = "0.19.36" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "188b27919eaf192845768c671515253bfc12ccc46151158b998047736e8b1542" dependencies = [ "fs-err 3.0.0", "rattler_conda_types", @@ -3623,7 +3631,7 @@ dependencies = [ "http", "http-cache-semantics", "include_dir", - "indexmap 2.6.0", + "indexmap 2.7.0", "itertools 0.12.1", "miette 7.4.0", "mime", @@ -3659,7 +3667,8 @@ dependencies = [ [[package]] name = "rattler_macros" version = "1.0.3" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19eadf6fea87bd67d9d4c372caa3c2bed33cd91cdc235ce86210d7bc513ae0a4" dependencies = [ "quote", "syn", @@ -3667,8 +3676,9 @@ dependencies = [ [[package]] name = "rattler_networking" -version = "0.21.6" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.21.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40f5ad1da789b5bbe9585b4d255f2df82c676a951e2f002a76bf9fa7389c4962" dependencies = [ "anyhow", "async-trait", @@ -3694,11 +3704,13 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.22.14" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.22.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e5d3a43c996a379bcc3c68bb8322d31baa11d6170f3746fc5667317cf10f8d" dependencies = [ - "bzip2", + "bzip2 0.4.4", "chrono", + "fs-err 3.0.0", "futures-util", "num_cpus", "rattler_conda_types", @@ -3721,8 +3733,9 @@ dependencies = [ [[package]] name = "rattler_redaction" -version = "0.1.3" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "575cd5c830c5c2d25412531c5a3d307a0ca66ddccc466baaa5219cfa9e90c60e" dependencies = [ "reqwest", "reqwest-middleware", @@ -3731,8 +3744,9 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.21.23" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.21.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "362e6e45d450eb443d9d227a1d4aba4b8e4cbd6a49f650d7b0a86f56d1f8c899" dependencies = [ "anyhow", "async-compression", @@ -3785,12 +3799,13 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.22.7" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.22.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86d2b039c5e575929d91f62364cd84c13c115a705e4a4d634d852b77f1fcb5af" dependencies = [ "enum_dispatch", "fs-err 3.0.0", - "indexmap 2.6.0", + "indexmap 2.7.0", "itertools 0.13.0", "rattler_conda_types", "serde_json", @@ -3803,8 +3818,9 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "1.2.3" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "1.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66b4be6b94bfb514d65041f39380454f121728ae2a075c73d1d83d74d1483381" dependencies = [ "chrono", "futures", @@ -3821,8 +3837,9 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "1.1.10" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "1.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd66de43800a3b7a05b87dae875dfe4f1af0009820fd895cf7608c35b27682b7" dependencies = [ "archspec", "libloading", @@ -3858,9 +3875,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ "bitflags", ] @@ -4045,7 +4062,7 @@ dependencies = [ "elsa", "event-listener", "futures", - "indexmap 2.6.0", + "indexmap 2.7.0", "itertools 0.13.0", "petgraph", "tracing", @@ -4105,28 +4122,28 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustix" -version = "0.38.41" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "rustls" -version = "0.23.18" +version = "0.23.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f" +checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" dependencies = [ "once_cell", "ring", @@ -4290,9 +4307,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] @@ -4310,9 +4327,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", @@ -4325,7 +4342,7 @@ version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "itoa", "memchr", "ryu", @@ -4374,7 +4391,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.6.0", + "indexmap 2.7.0", "serde", "serde_derive", "serde_json", @@ -4400,7 +4417,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "itoa", "ryu", "serde", @@ -4506,7 +4523,8 @@ dependencies = [ [[package]] name = "simple_spawn_blocking" version = "1.0.0" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b31ed96d1593e129cc76cb7aca364fb5c173558bfda922c15aac4e2f2f5844e" dependencies = [ "tokio", ] @@ -4548,9 +4566,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4663,9 +4681,9 @@ checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" [[package]] name = "syn" -version = "2.0.89" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -4758,9 +4776,9 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" +checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9" dependencies = [ "rustix", "windows-sys 0.59.0", @@ -4787,11 +4805,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.3" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" dependencies = [ - "thiserror-impl 2.0.3", + "thiserror-impl 2.0.6", ] [[package]] @@ -4807,9 +4825,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.3" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" dependencies = [ "proc-macro2", "quote", @@ -4828,9 +4846,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -4849,9 +4867,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -4890,9 +4908,9 @@ checksum = "b130bd8a58c163224b44e217b4239ca7b927d82bf6cc2fea1fc561d15056e3f7" [[package]] name = "tokio" -version = "1.41.1" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", @@ -4929,20 +4947,19 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ "rustls", - "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -4952,9 +4969,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", @@ -4991,7 +5008,7 @@ version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -5006,9 +5023,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -5050,9 +5067,9 @@ dependencies = [ [[package]] name = "tracing-serde" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" dependencies = [ "serde", "tracing-core", @@ -5060,9 +5077,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers", "nu-ansi-term", @@ -5271,9 +5288,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", "once_cell", @@ -5282,13 +5299,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -5297,21 +5313,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5319,9 +5336,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", @@ -5332,9 +5349,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "wasm-streams" @@ -5351,9 +5368,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" dependencies = [ "js-sys", "wasm-bindgen", @@ -5792,13 +5809,13 @@ dependencies = [ [[package]] name = "yaml-rust2" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8" +checksum = "2a1a1c0bc9823338a3bdf8c61f994f23ac004c6fa32c08cd152984499b445e8d" dependencies = [ "arraydeque", "encoding_rs", - "hashlink 0.8.4", + "hashlink", ] [[package]] @@ -5971,7 +5988,7 @@ checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "aes", "byteorder", - "bzip2", + "bzip2 0.4.4", "constant_time_eq", "crc32fast", "crossbeam-utils", @@ -5986,17 +6003,16 @@ dependencies = [ [[package]] name = "zip" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d52293fc86ea7cf13971b3bb81eb21683636e7ae24c729cdaf1b7c4157a352" +source = "git+https://github.com/wolfv/zip2?branch=patched#999f872ddc1b53fdaa296b96b92b699c885743a2" dependencies = [ "arbitrary", "crc32fast", "crossbeam-utils", "displaydoc", "flate2", - "indexmap 2.6.0", + "indexmap 2.7.0", "memchr", - "thiserror 2.0.3", + "thiserror 2.0.6", "time", "zopfli", ] @@ -6098,8 +6114,3 @@ dependencies = [ "quote", "syn", ] - -[[patch.unused]] -name = "zip" -version = "2.2.0" -source = "git+https://github.com/wolfv/zip2?branch=patched#d9ab99aee198b44fe6358febbbf5f8e57da351a8" diff --git a/py-rattler-build/Cargo.toml b/py-rattler-build/Cargo.toml index 20963ca2..8702574b 100644 --- a/py-rattler-build/Cargo.toml +++ b/py-rattler-build/Cargo.toml @@ -31,18 +31,5 @@ pyo3-build-config = "0.23.2" [patch.crates-io] zip = { git = "https://github.com/wolfv/zip2", branch = "patched"} -rattler = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_cache = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_conda_types = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_digest = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_index = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_networking = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_repodata_gateway = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_redaction = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_shell = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_solve = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_virtual_packages = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_package_streaming = { git = "https://github.com/conda/rattler", branch = "main" } - # Prevent package from thinking it's in the workspace [workspace]