From c11a453c45df79948dcbc7fdd471aa002bca3d3b Mon Sep 17 00:00:00 2001 From: Tim de Jager Date: Fri, 1 Nov 2024 15:41:46 +0100 Subject: [PATCH 1/3] feat: bump peps --- Cargo.toml | 4 ++-- crates/rattler_lock/Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7c114c4b9..cdba8f04f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -97,8 +97,8 @@ once_cell = "1.19.0" ouroboros = "0.18.3" parking_lot = "0.12.1" pathdiff = "0.2.1" -pep440_rs = { version = "0.6.0" } -pep508_rs = { version = "0.6.0" } +pep440_rs = { version = "0.7.2" } +pep508_rs = { version = "0.9.1" } percent-encoding = "2.3.1" pin-project-lite = "0.2.14" plist = "1" diff --git a/crates/rattler_lock/Cargo.toml b/crates/rattler_lock/Cargo.toml index b6824be63..3d1872687 100644 --- a/crates/rattler_lock/Cargo.toml +++ b/crates/rattler_lock/Cargo.toml @@ -18,8 +18,8 @@ itertools = { workspace = true } rattler_conda_types = { path = "../rattler_conda_types", version = "0.28.3", default-features = false } rattler_digest = { path = "../rattler_digest", version = "1.0.2", default-features = false } file_url = { path = "../file_url", version = "0.1.6" } -pep508_rs = { workspace = true, features = ["serde"] } -pep440_rs = { workspace = true, features = ["serde"] } +pep508_rs = { workspace = true } +pep440_rs = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_yaml = { workspace = true } serde_with = { workspace = true, features = ["indexmap_2"] } From cc0b8525d83cf1631f7ae11598d5dd5be3effd8e Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Fri, 1 Nov 2024 16:44:07 +0100 Subject: [PATCH 2/3] fix insta --- ...t__v0__pypi-matplotlib-conda-lock.yml.snap | 62 +++++++-------- ...r_lock__test__v4__path-based-lock.yml.snap | 76 +++++++++---------- ...k__test__v4__pypi-matplotlib-lock.yml.snap | 62 +++++++-------- ...r_lock__test__v5__flat-index-lock.yml.snap | 22 +++--- 4 files changed, 111 insertions(+), 111 deletions(-) diff --git a/crates/rattler_lock/src/snapshots/rattler_lock__test__v0__pypi-matplotlib-conda-lock.yml.snap b/crates/rattler_lock/src/snapshots/rattler_lock__test__v0__pypi-matplotlib-conda-lock.yml.snap index 0c55dffee..fe1a273c1 100644 --- a/crates/rattler_lock/src/snapshots/rattler_lock__test__v0__pypi-matplotlib-conda-lock.yml.snap +++ b/crates/rattler_lock/src/snapshots/rattler_lock__test__v0__pypi-matplotlib-conda-lock.yml.snap @@ -316,45 +316,45 @@ packages: url: "https://files.pythonhosted.org/packages/07/2e/0122487af85f542f8d65a883b6470f044ddb9d0159c95488a6747314d231/matplotlib-3.5.1-cp39-cp39-macosx_10_9_x86_64.whl" sha256: edf5e4e1d5fb22c18820e8586fb867455de3b109c309cb4fce3aaed85d9468d1 requires_dist: - - cycler >=0.10 - - fonttools >=4.22.0 - - kiwisolver >=1.0.1 - - numpy >=1.17 - - packaging >=20.0 - - pillow >=6.2.0 - - pyparsing >=2.2.1 - - python-dateutil >=2.7 - - setuptools-scm >=4 + - cycler>=0.10 + - fonttools>=4.22.0 + - kiwisolver>=1.0.1 + - numpy>=1.17 + - packaging>=20.0 + - pillow>=6.2.0 + - pyparsing>=2.2.1 + - python-dateutil>=2.7 + - setuptools-scm>=4 - kind: pypi name: matplotlib version: 3.5.1 url: "https://files.pythonhosted.org/packages/6a/52/703f568256a3e614a448503a698557d7832b7893fd63d3f7c2ebb54cd6e2/matplotlib-3.5.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl" sha256: 87900c67c0f1728e6db17c6809ec05c025c6624dcf96a8020326ea15378fe8e7 requires_dist: - - cycler >=0.10 - - fonttools >=4.22.0 - - kiwisolver >=1.0.1 - - numpy >=1.17 - - packaging >=20.0 - - pillow >=6.2.0 - - pyparsing >=2.2.1 - - python-dateutil >=2.7 - - setuptools-scm >=4 + - cycler>=0.10 + - fonttools>=4.22.0 + - kiwisolver>=1.0.1 + - numpy>=1.17 + - packaging>=20.0 + - pillow>=6.2.0 + - pyparsing>=2.2.1 + - python-dateutil>=2.7 + - setuptools-scm>=4 - kind: pypi name: matplotlib version: 3.5.1 url: "https://files.pythonhosted.org/packages/86/cd/619a45613393293117297f2f0e5086a619e1ea98c5e2ce6d0f554ddc97c3/matplotlib-3.5.1-cp39-cp39-win_amd64.whl" sha256: fe8d40c434a8e2c68d64c6d6a04e77f21791a93ff6afe0dce169597c110d3079 requires_dist: - - cycler >=0.10 - - fonttools >=4.22.0 - - kiwisolver >=1.0.1 - - numpy >=1.17 - - packaging >=20.0 - - pillow >=6.2.0 - - pyparsing >=2.2.1 - - python-dateutil >=2.7 - - setuptools-scm >=4 + - cycler>=0.10 + - fonttools>=4.22.0 + - kiwisolver>=1.0.1 + - numpy>=1.17 + - packaging>=20.0 + - pillow>=6.2.0 + - pyparsing>=2.2.1 + - python-dateutil>=2.7 + - setuptools-scm>=4 - kind: conda name: ncurses version: "6.3" @@ -427,7 +427,7 @@ packages: url: "https://files.pythonhosted.org/packages/05/8e/8de486cbd03baba4deef4142bd643a3e7bbe954a784dc1bb17142572d127/packaging-21.3-py3-none-any.whl" sha256: ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 requires_dist: - - "pyparsing !=3.0.5, >=2.0.2" + - "pyparsing>=2.0.2,!=3.0.5" - kind: pypi name: pillow version: 9.0.1 @@ -554,7 +554,7 @@ packages: url: "https://files.pythonhosted.org/packages/36/7a/87837f39d0296e723bb9b62bbb257d0355c7f6128853c78955f57342a56d/python_dateutil-2.8.2-py2.py3-none-any.whl" sha256: 961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 requires_dist: - - six >=1.5 + - six>=1.5 - kind: conda name: python_abi version: "3.9" @@ -645,8 +645,8 @@ packages: url: "https://files.pythonhosted.org/packages/e3/e5/c28b544051340e63e0d507eb893c9513d3a300e5e9183e2990518acbfe36/setuptools_scm-6.4.2-py3-none-any.whl" sha256: acea13255093849de7ccb11af9e1fb8bde7067783450cee9ef7a93139bddf6d4 requires_dist: - - packaging >=20.0 - - tomli >=1.0.0 + - packaging>=20.0 + - tomli>=1.0.0 - kind: pypi name: six version: 1.16.0 diff --git a/crates/rattler_lock/src/snapshots/rattler_lock__test__v4__path-based-lock.yml.snap b/crates/rattler_lock/src/snapshots/rattler_lock__test__v4__path-based-lock.yml.snap index e9a16fdf3..232270f45 100644 --- a/crates/rattler_lock/src/snapshots/rattler_lock__test__v4__path-based-lock.yml.snap +++ b/crates/rattler_lock/src/snapshots/rattler_lock__test__v4__path-based-lock.yml.snap @@ -95,26 +95,26 @@ packages: url: "direct+https://github.com/pallets/click/releases/download/8.1.7/click-8.1.7-py3-none-any.whl" requires_dist: - "colorama ; platform_system == 'Windows'" - - "importlib-metadata ; python_version < '3.8'" + - "importlib-metadata ; python_full_version < '3.8'" requires_python: ">=3.7" - kind: pypi name: colorama version: 0.4.6 url: "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl" sha256: 4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6 - requires_python: "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" + requires_python: ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*" - kind: pypi name: flask version: 3.0.2 url: "git+ssh://git@github.com/pallets/flask@b90a4f1f4a370e92054b9cc9db0efcb864f87ebe" requires_dist: - - werkzeug >=3.0.0 - - jinja2 >=3.1.2 - - itsdangerous >=2.1.2 - - click >=8.1.3 - - blinker >=1.6.2 - - "importlib-metadata >=3.6.0 ; python_version < '3.10'" - - "asgiref >=3.2 ; extra == 'async'" + - werkzeug>=3.0.0 + - jinja2>=3.1.2 + - itsdangerous>=2.1.2 + - click>=8.1.3 + - blinker>=1.6.2 + - "importlib-metadata>=3.6.0 ; python_full_version < '3.10'" + - "asgiref>=3.2 ; extra == 'async'" - "python-dotenv ; extra == 'dotenv'" requires_python: ">=3.8" - kind: pypi @@ -135,8 +135,8 @@ packages: url: "https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl" sha256: 7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa requires_dist: - - markupsafe >=2.0 - - "babel >=2.7 ; extra == 'i18n'" + - markupsafe>=2.0 + - "babel>=2.7 ; extra == 'i18n'" requires_python: ">=3.7" - kind: conda name: libexpat @@ -208,17 +208,17 @@ packages: url: "https://files.pythonhosted.org/packages/42/d7/1ec15b46af6af88f19b8e5ffea08fa375d433c998b8a7639e76935c14f1f/markdown_it_py-3.0.0-py3-none-any.whl" sha256: 355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1 requires_dist: - - mdurl ~=0.1 + - mdurl~=0.1 - "psutil ; extra == 'benchmarking'" - "pytest ; extra == 'benchmarking'" - "pytest-benchmark ; extra == 'benchmarking'" - - "pre-commit ~=3.0 ; extra == 'code_style'" - - "commonmark ~=0.9 ; extra == 'compare'" - - "markdown ~=3.4 ; extra == 'compare'" - - "mistletoe ~=1.0 ; extra == 'compare'" - - "mistune ~=2.0 ; extra == 'compare'" - - "panflute ~=2.3 ; extra == 'compare'" - - "linkify-it-py >=1, <3 ; extra == 'linkify'" + - "pre-commit~=3.0 ; extra == 'code-style'" + - "commonmark~=0.9 ; extra == 'compare'" + - "markdown~=3.4 ; extra == 'compare'" + - "mistletoe~=1.0 ; extra == 'compare'" + - "mistune~=2.0 ; extra == 'compare'" + - "panflute~=2.3 ; extra == 'compare'" + - "linkify-it-py>=1,<3 ; extra == 'linkify'" - "mdit-py-plugins ; extra == 'plugins'" - "gprof2dot ; extra == 'profiling'" - "mdit-py-plugins ; extra == 'rtd'" @@ -277,8 +277,8 @@ packages: url: "https://files.pythonhosted.org/packages/97/9c/372fef8377a6e340b1704768d20daaded98bf13282b5327beb2e2fe2c7ef/pygments-2.17.2-py3-none-any.whl" sha256: b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c requires_dist: - - "importlib-metadata ; python_version < '3.8' and extra == 'plugins'" - - "colorama >=0.4.6 ; extra == 'windows-terminal'" + - "importlib-metadata ; python_full_version < '3.8' and extra == 'plugins'" + - "colorama>=0.4.6 ; extra == 'windows-terminal'" requires_python: ">=3.7" - kind: conda name: python @@ -311,12 +311,12 @@ packages: version: 2.31.0 url: "git+https://github.com/psf/requests.git@0106aced5faa299e6ede89d1230bd6784f2c3660" requires_dist: - - "charset-normalizer <4, >=2" - - "idna <4, >=2.5" - - "urllib3 <3, >=1.21.1" - - certifi >=2017.4.17 - - "pysocks !=1.5.7, >=1.5.6 ; extra == 'socks'" - - "chardet <6, >=3.0.2 ; extra == 'use_chardet_on_py3'" + - "charset-normalizer>=2,<4" + - "idna>=2.5,<4" + - "urllib3>=1.21.1,<3" + - certifi>=2017.4.17 + - "pysocks>=1.5.6,!=1.5.7 ; extra == 'socks'" + - "chardet>=3.0.2,<6 ; extra == 'use-chardet-on-py3'" requires_python: ">=3.7" - kind: pypi name: rich @@ -324,10 +324,10 @@ packages: url: "https://files.pythonhosted.org/packages/87/67/a37f6214d0e9fe57f6ae54b2956d550ca8365857f42a1ce0392bb21d9410/rich-13.7.1-py3-none-any.whl" sha256: 4edbae314f59eb482f54e9e30bf00d33350aaa94f4bfcd4e9e3110e64d0d7222 requires_dist: - - "ipywidgets >=7.5.1, <9 ; extra == 'jupyter'" - - markdown-it-py >=2.2.0 - - "pygments >=2.13.0, <3.0.0" - - "typing-extensions >=4.0.0, <5.0 ; python_version < '3.9'" + - "ipywidgets>=7.5.1,<9 ; extra == 'jupyter'" + - markdown-it-py>=2.2.0 + - "pygments>=2.13.0,<3.0.0" + - "typing-extensions>=4.0.0,<5.0 ; python_full_version < '3.9'" requires_python: ">=3.7.0" - kind: conda name: tk @@ -378,11 +378,11 @@ packages: url: "https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl" sha256: 450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d requires_dist: - - "brotli >=1.0.9 ; platform_python_implementation == 'CPython' and extra == 'brotli'" - - "brotlicffi >=0.8.0 ; platform_python_implementation != 'CPython' and extra == 'brotli'" - - "h2 <5, >=4 ; extra == 'h2'" - - "pysocks !=1.5.7, <2.0, >=1.5.6 ; extra == 'socks'" - - "zstandard >=0.18.0 ; extra == 'zstd'" + - "brotli>=1.0.9 ; platform_python_implementation == 'CPython' and extra == 'brotli'" + - "brotlicffi>=0.8.0 ; platform_python_implementation != 'CPython' and extra == 'brotli'" + - "h2>=4,<5 ; extra == 'h2'" + - "pysocks>=1.5.6,!=1.5.7,<2.0 ; extra == 'socks'" + - "zstandard>=0.18.0 ; extra == 'zstd'" requires_python: ">=3.8" - kind: conda name: vc @@ -439,8 +439,8 @@ packages: url: "https://files.pythonhosted.org/packages/c3/fc/254c3e9b5feb89ff5b9076a23218dafbc99c96ac5941e900b71206e6313b/werkzeug-3.0.1-py3-none-any.whl" sha256: 90a285dc0e42ad56b34e696398b8122ee4c681833fb35b8334a095d82c56da10 requires_dist: - - markupsafe >=2.1.1 - - "watchdog >=2.3 ; extra == 'watchdog'" + - markupsafe>=2.1.1 + - "watchdog>=2.3 ; extra == 'watchdog'" requires_python: ">=3.8" - kind: conda name: xz diff --git a/crates/rattler_lock/src/snapshots/rattler_lock__test__v4__pypi-matplotlib-lock.yml.snap b/crates/rattler_lock/src/snapshots/rattler_lock__test__v4__pypi-matplotlib-lock.yml.snap index 0c55dffee..fe1a273c1 100644 --- a/crates/rattler_lock/src/snapshots/rattler_lock__test__v4__pypi-matplotlib-lock.yml.snap +++ b/crates/rattler_lock/src/snapshots/rattler_lock__test__v4__pypi-matplotlib-lock.yml.snap @@ -316,45 +316,45 @@ packages: url: "https://files.pythonhosted.org/packages/07/2e/0122487af85f542f8d65a883b6470f044ddb9d0159c95488a6747314d231/matplotlib-3.5.1-cp39-cp39-macosx_10_9_x86_64.whl" sha256: edf5e4e1d5fb22c18820e8586fb867455de3b109c309cb4fce3aaed85d9468d1 requires_dist: - - cycler >=0.10 - - fonttools >=4.22.0 - - kiwisolver >=1.0.1 - - numpy >=1.17 - - packaging >=20.0 - - pillow >=6.2.0 - - pyparsing >=2.2.1 - - python-dateutil >=2.7 - - setuptools-scm >=4 + - cycler>=0.10 + - fonttools>=4.22.0 + - kiwisolver>=1.0.1 + - numpy>=1.17 + - packaging>=20.0 + - pillow>=6.2.0 + - pyparsing>=2.2.1 + - python-dateutil>=2.7 + - setuptools-scm>=4 - kind: pypi name: matplotlib version: 3.5.1 url: "https://files.pythonhosted.org/packages/6a/52/703f568256a3e614a448503a698557d7832b7893fd63d3f7c2ebb54cd6e2/matplotlib-3.5.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl" sha256: 87900c67c0f1728e6db17c6809ec05c025c6624dcf96a8020326ea15378fe8e7 requires_dist: - - cycler >=0.10 - - fonttools >=4.22.0 - - kiwisolver >=1.0.1 - - numpy >=1.17 - - packaging >=20.0 - - pillow >=6.2.0 - - pyparsing >=2.2.1 - - python-dateutil >=2.7 - - setuptools-scm >=4 + - cycler>=0.10 + - fonttools>=4.22.0 + - kiwisolver>=1.0.1 + - numpy>=1.17 + - packaging>=20.0 + - pillow>=6.2.0 + - pyparsing>=2.2.1 + - python-dateutil>=2.7 + - setuptools-scm>=4 - kind: pypi name: matplotlib version: 3.5.1 url: "https://files.pythonhosted.org/packages/86/cd/619a45613393293117297f2f0e5086a619e1ea98c5e2ce6d0f554ddc97c3/matplotlib-3.5.1-cp39-cp39-win_amd64.whl" sha256: fe8d40c434a8e2c68d64c6d6a04e77f21791a93ff6afe0dce169597c110d3079 requires_dist: - - cycler >=0.10 - - fonttools >=4.22.0 - - kiwisolver >=1.0.1 - - numpy >=1.17 - - packaging >=20.0 - - pillow >=6.2.0 - - pyparsing >=2.2.1 - - python-dateutil >=2.7 - - setuptools-scm >=4 + - cycler>=0.10 + - fonttools>=4.22.0 + - kiwisolver>=1.0.1 + - numpy>=1.17 + - packaging>=20.0 + - pillow>=6.2.0 + - pyparsing>=2.2.1 + - python-dateutil>=2.7 + - setuptools-scm>=4 - kind: conda name: ncurses version: "6.3" @@ -427,7 +427,7 @@ packages: url: "https://files.pythonhosted.org/packages/05/8e/8de486cbd03baba4deef4142bd643a3e7bbe954a784dc1bb17142572d127/packaging-21.3-py3-none-any.whl" sha256: ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 requires_dist: - - "pyparsing !=3.0.5, >=2.0.2" + - "pyparsing>=2.0.2,!=3.0.5" - kind: pypi name: pillow version: 9.0.1 @@ -554,7 +554,7 @@ packages: url: "https://files.pythonhosted.org/packages/36/7a/87837f39d0296e723bb9b62bbb257d0355c7f6128853c78955f57342a56d/python_dateutil-2.8.2-py2.py3-none-any.whl" sha256: 961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 requires_dist: - - six >=1.5 + - six>=1.5 - kind: conda name: python_abi version: "3.9" @@ -645,8 +645,8 @@ packages: url: "https://files.pythonhosted.org/packages/e3/e5/c28b544051340e63e0d507eb893c9513d3a300e5e9183e2990518acbfe36/setuptools_scm-6.4.2-py3-none-any.whl" sha256: acea13255093849de7ccb11af9e1fb8bde7067783450cee9ef7a93139bddf6d4 requires_dist: - - packaging >=20.0 - - tomli >=1.0.0 + - packaging>=20.0 + - tomli>=1.0.0 - kind: pypi name: six version: 1.16.0 diff --git a/crates/rattler_lock/src/snapshots/rattler_lock__test__v5__flat-index-lock.yml.snap b/crates/rattler_lock/src/snapshots/rattler_lock__test__v5__flat-index-lock.yml.snap index 6912aaa62..3ce9e2c34 100644 --- a/crates/rattler_lock/src/snapshots/rattler_lock__test__v5__flat-index-lock.yml.snap +++ b/crates/rattler_lock/src/snapshots/rattler_lock__test__v5__flat-index-lock.yml.snap @@ -202,12 +202,12 @@ packages: version: 2.31.0 path: "./links/requests-2.31.0-py3-none-any.whl" requires_dist: - - "charset-normalizer <4, >=2" - - "idna <4, >=2.5" - - "urllib3 <3, >=1.21.1" - - certifi >=2017.4.17 - - "pysocks !=1.5.7, >=1.5.6 ; extra == 'socks'" - - "chardet <6, >=3.0.2 ; extra == 'use_chardet_on_py3'" + - "charset-normalizer>=2,<4" + - "idna>=2.5,<4" + - "urllib3>=1.21.1,<3" + - certifi>=2017.4.17 + - "pysocks>=1.5.6,!=1.5.7 ; extra == 'socks'" + - "chardet>=3.0.2,<6 ; extra == 'use-chardet-on-py3'" requires_python: ">=3.7" - kind: conda name: tk @@ -242,11 +242,11 @@ packages: url: "https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl" sha256: 450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d requires_dist: - - "brotli >=1.0.9 ; platform_python_implementation == 'CPython' and extra == 'brotli'" - - "brotlicffi >=0.8.0 ; platform_python_implementation != 'CPython' and extra == 'brotli'" - - "h2 <5, >=4 ; extra == 'h2'" - - "pysocks !=1.5.7, <2.0, >=1.5.6 ; extra == 'socks'" - - "zstandard >=0.18.0 ; extra == 'zstd'" + - "brotli>=1.0.9 ; platform_python_implementation == 'CPython' and extra == 'brotli'" + - "brotlicffi>=0.8.0 ; platform_python_implementation != 'CPython' and extra == 'brotli'" + - "h2>=4,<5 ; extra == 'h2'" + - "pysocks>=1.5.6,!=1.5.7,<2.0 ; extra == 'socks'" + - "zstandard>=0.18.0 ; extra == 'zstd'" requires_python: ">=3.8" - kind: conda name: xz From 42625138601f22b8889cc43e62dcb7a6ae1c7e9d Mon Sep 17 00:00:00 2001 From: Tim de Jager Date: Mon, 4 Nov 2024 13:44:39 +0100 Subject: [PATCH 3/3] fix: upgrade pyrattler --- py-rattler/Cargo.lock | 758 +++++++++++++++--------------------------- py-rattler/Cargo.toml | 2 +- 2 files changed, 277 insertions(+), 483 deletions(-) diff --git a/py-rattler/Cargo.lock b/py-rattler/Cargo.lock index 8cae814eb..c6e5b8db2 100644 --- a/py-rattler/Cargo.lock +++ b/py-rattler/Cargo.lock @@ -79,9 +79,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" [[package]] name = "arbitrary" @@ -132,9 +132,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857" dependencies = [ "bzip2", "flate2", @@ -242,7 +242,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -271,13 +271,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -319,12 +319,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "bitflags" version = "2.6.0" @@ -383,6 +377,12 @@ dependencies = [ "piper", ] +[[package]] +name = "boxcar" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba19c552ee63cb6646b75e1166d1bdb8a6d34a6d19e319dec88c8adadff2db3" + [[package]] name = "bumpalo" version = "3.16.0" @@ -397,9 +397,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "bzip2" @@ -503,7 +503,7 @@ dependencies = [ "encode_unicode", "lazy_static", "libc", - "unicode-width", + "unicode-width 0.1.14", "windows-sys 0.52.0", ] @@ -517,6 +517,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -578,7 +588,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.77", + "syn", ] [[package]] @@ -589,7 +599,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -645,17 +655,6 @@ dependencies = [ "serde", ] -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive_arbitrary" version = "1.3.2" @@ -664,7 +663,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -707,7 +706,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -755,7 +754,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -767,7 +766,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -788,7 +787,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -846,7 +845,7 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "file_url" -version = "0.1.5" +version = "0.1.6" dependencies = [ "itertools 0.13.0", "percent-encoding", @@ -892,15 +891,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "fluent-uri" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "fnv" version = "1.0.7" @@ -941,13 +931,23 @@ dependencies = [ "tokio", ] +[[package]] +name = "fs-err" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bb60e7409f34ef959985bc9d9c5ee8f5db24ee46ed9775850548021710f807f" +dependencies = [ + "autocfg", + "tokio", +] + [[package]] name = "fs4" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c6b3bd49c37d2aa3f3f2220233b29a7cd23f79d1fe70e5337d25fb390793de" +checksum = "ec6fcfb3c0c1d71612528825042261419d5dade9678c39a781e05b63677d9b32" dependencies = [ - "fs-err", + "fs-err 2.11.0", "rustix", "windows-sys 0.52.0", ] @@ -970,9 +970,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -985,9 +985,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -995,15 +995,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1012,9 +1012,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -1031,32 +1031,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1117,9 +1117,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "google-cloud-auth" -version = "0.13.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf7cb7864f08a92e77c26bb230d021ea57691788fb5dd51793f96965d19e7f9" +checksum = "357160f51a60ec3e32169ad687f4abe0ee1e90c73b449aa5d11256c4f1cf2ff6" dependencies = [ "async-trait", "base64 0.21.7", @@ -1127,7 +1127,7 @@ dependencies = [ "google-cloud-token", "home", "jsonwebtoken", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "thiserror", @@ -1139,11 +1139,11 @@ dependencies = [ [[package]] name = "google-cloud-metadata" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc279bfb50487d7bcd900e8688406475fc750fe474a835b2ab9ade9eb1fc90e2" +checksum = "04f945a208886a13d07636f38fb978da371d0abc3e34bad338124b9f8c135a8f" dependencies = [ - "reqwest 0.11.27", + "reqwest", "thiserror", "tokio", ] @@ -1157,25 +1157,6 @@ dependencies = [ "async-trait", ] -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.5.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h2" version = "0.4.6" @@ -1187,8 +1168,8 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.1.0", - "indexmap 2.5.0", + "http", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -1221,6 +1202,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "heck" version = "0.4.1" @@ -1281,17 +1268,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http" version = "1.1.0" @@ -1303,17 +1279,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - [[package]] name = "http-body" version = "1.0.1" @@ -1321,7 +1286,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http", ] [[package]] @@ -1332,8 +1297,8 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", - "http-body 1.0.1", + "http", + "http-body", "pin-project-lite", ] @@ -1343,9 +1308,9 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92baf25cf0b8c9246baecf3a444546360a97b569168fdf92563ee6a47829920c" dependencies = [ - "http 1.1.0", + "http", "http-serde", - "reqwest 0.12.7", + "reqwest", "serde", "time", ] @@ -1356,7 +1321,7 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f056c8559e3757392c8d091e796416e4649d8e49e88b8d76df6c002f05027fd" dependencies = [ - "http 1.1.0", + "http", "serde", ] @@ -1366,12 +1331,6 @@ version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - [[package]] name = "humansize" version = "2.1.3" @@ -1387,30 +1346,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "hyper" -version = "0.14.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" version = "1.4.1" @@ -1420,9 +1355,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", - "http 1.1.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "httparse", "itoa", "pin-project-lite", @@ -1431,20 +1366,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.12", - "hyper 0.14.30", - "rustls 0.21.12", - "tokio", - "tokio-rustls 0.24.1", -] - [[package]] name = "hyper-rustls" version = "0.27.3" @@ -1452,28 +1373,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http 1.1.0", - "hyper 1.4.1", + "http", + "hyper", "hyper-util", - "rustls 0.23.13", + "rustls", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tower-service", - "webpki-roots 0.26.6", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper 0.14.30", - "native-tls", - "tokio", - "tokio-native-tls", + "webpki-roots", ] [[package]] @@ -1484,7 +1392,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.4.1", + "hyper", "hyper-util", "native-tls", "tokio", @@ -1501,9 +1409,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "hyper 1.4.1", + "http", + "http-body", + "hyper", "pin-project-lite", "socket2", "tokio", @@ -1564,12 +1472,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -1583,7 +1491,7 @@ dependencies = [ "instant", "number_prefix", "portable-atomic", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -1667,9 +1575,9 @@ dependencies = [ [[package]] name = "json-patch" -version = "2.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" +checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" dependencies = [ "jsonptr", "serde", @@ -1679,11 +1587,10 @@ dependencies = [ [[package]] name = "jsonptr" -version = "0.4.7" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" +checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70" dependencies = [ - "fluent-uri", "serde", "serde_json", ] @@ -1705,14 +1612,16 @@ dependencies = [ [[package]] name = "keyring" -version = "3.3.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fa83d1ca02db069b5fbe94b23b584d588e989218310c9c15015bb5571ef1a94" +checksum = "2f8fe839464d4e4b37d756d7e910063696af79a7e877282cb1825e4ec5f10833" dependencies = [ "byteorder", "dbus-secret-service", + "log", "secret-service", - "security-framework", + "security-framework 2.11.1", + "security-framework 3.0.0", "windows-sys 0.59.0", "zbus", ] @@ -1737,7 +1646,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.77", + "syn", ] [[package]] @@ -1783,7 +1692,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags", "libc", "redox_syscall", ] @@ -1895,7 +1804,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", "tempfile", ] @@ -1912,7 +1821,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.6.0", + "bitflags", "cfg-if", "cfg_aliases", "libc", @@ -2035,9 +1944,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl" @@ -2045,7 +1954,7 @@ version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.6.0", + "bitflags", "cfg-if", "foreign-types", "libc", @@ -2062,7 +1971,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2131,7 +2040,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2181,31 +2090,36 @@ dependencies = [ [[package]] name = "pep440_rs" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "466eada3179c2e069ca897b99006cbb33f816290eaeec62464eea907e22ae385" +checksum = "0922a442c78611fa8c5ed6065d2d898a820cf12fa90604217fdb2d01675efec7" dependencies = [ - "once_cell", "serde", - "unicode-width", + "unicode-width 0.2.0", "unscanny", + "version-ranges", ] [[package]] name = "pep508_rs" -version = "0.6.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8877489a99ccc80012333123e434f84e645fe1ede3b30e9d3b815887a12979" +checksum = "8c2feee999fa547bacab06a4881bacc74688858b92fa8ef1e206c748b0a76048" dependencies = [ - "derivative", + "boxcar", + "indexmap 2.6.0", + "itertools 0.13.0", "once_cell", "pep440_rs", "regex", + "rustc-hash", "serde", + "smallvec", "thiserror", - "unicode-width", + "unicode-width 0.2.0", "url", "urlencoding", + "version-ranges", ] [[package]] @@ -2221,7 +2135,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.5.0", + "indexmap 2.6.0", ] [[package]] @@ -2254,7 +2168,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.77", + "syn", "unicase", ] @@ -2285,14 +2199,14 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -2324,7 +2238,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ "base64 0.22.1", - "indexmap 2.5.0", + "indexmap 2.6.0", "quick-xml", "serde", "time", @@ -2392,7 +2306,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", "version_check", "yansi", ] @@ -2435,7 +2349,7 @@ dependencies = [ "rattler_shell", "rattler_solve", "rattler_virtual_packages", - "reqwest 0.12.7", + "reqwest", "reqwest-middleware", "thiserror", "tokio", @@ -2514,7 +2428,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2527,7 +2441,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config 0.20.3", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2550,7 +2464,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.13", + "rustls", "socket2", "thiserror", "tokio", @@ -2567,7 +2481,7 @@ dependencies = [ "rand", "ring", "rustc-hash", - "rustls 0.23.13", + "rustls", "slab", "thiserror", "tinyvec", @@ -2634,16 +2548,16 @@ dependencies = [ [[package]] name = "rattler" -version = "0.27.15" +version = "0.27.16" dependencies = [ "anyhow", "console", "digest", "dirs", - "fs-err", + "fs-err 3.0.0", "futures", "humantime", - "indexmap 2.5.0", + "indexmap 2.6.0", "indicatif", "itertools 0.13.0", "memchr", @@ -2658,7 +2572,7 @@ dependencies = [ "rattler_shell", "reflink-copy", "regex", - "reqwest 0.12.7", + "reqwest", "reqwest-middleware", "simple_spawn_blocking", "smallvec", @@ -2672,7 +2586,7 @@ dependencies = [ [[package]] name = "rattler_cache" -version = "0.2.6" +version = "0.2.7" dependencies = [ "anyhow", "dashmap", @@ -2687,7 +2601,7 @@ dependencies = [ "rattler_digest", "rattler_networking", "rattler_package_streaming", - "reqwest 0.12.7", + "reqwest", "reqwest-middleware", "simple_spawn_blocking", "thiserror", @@ -2698,7 +2612,7 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.28.2" +version = "0.28.3" dependencies = [ "chrono", "dirs", @@ -2706,7 +2620,7 @@ dependencies = [ "fxhash", "glob", "hex", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.13.0", "lazy-regex", "nom", @@ -2747,9 +2661,9 @@ dependencies = [ [[package]] name = "rattler_index" -version = "0.19.32" +version = "0.19.33" dependencies = [ - "fs-err", + "fs-err 3.0.0", "rattler_conda_types", "rattler_digest", "rattler_package_streaming", @@ -2760,12 +2674,12 @@ dependencies = [ [[package]] name = "rattler_lock" -version = "0.22.27" +version = "0.22.28" dependencies = [ "chrono", "file_url", "fxhash", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.13.0", "pep440_rs", "pep508_rs", @@ -2784,7 +2698,7 @@ name = "rattler_macros" version = "1.0.2" dependencies = [ "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2799,11 +2713,11 @@ dependencies = [ "fslock", "getrandom", "google-cloud-auth", - "http 1.1.0", + "http", "itertools 0.13.0", "keyring", "netrc-rs", - "reqwest 0.12.7", + "reqwest", "reqwest-middleware", "retry-policies", "serde", @@ -2825,7 +2739,7 @@ dependencies = [ "rattler_digest", "rattler_networking", "rattler_redaction", - "reqwest 0.12.7", + "reqwest", "reqwest-middleware", "serde_json", "tar", @@ -2843,14 +2757,14 @@ dependencies = [ name = "rattler_redaction" version = "0.1.2" dependencies = [ - "reqwest 0.12.7", + "reqwest", "reqwest-middleware", "url", ] [[package]] name = "rattler_repodata_gateway" -version = "0.21.17" +version = "0.21.18" dependencies = [ "anyhow", "async-compression", @@ -2863,10 +2777,10 @@ dependencies = [ "dashmap", "dirs", "file_url", - "fs-err", + "fs-err 3.0.0", "futures", "hex", - "http 1.1.0", + "http", "http-cache-semantics", "humansize", "humantime", @@ -2883,7 +2797,7 @@ dependencies = [ "rattler_digest", "rattler_networking", "rattler_redaction", - "reqwest 0.12.7", + "reqwest", "reqwest-middleware", "rmp-serde", "serde", @@ -2897,7 +2811,7 @@ dependencies = [ "tokio-util", "tracing", "url", - "windows-sys 0.52.0", + "windows-sys 0.59.0", "zstd", ] @@ -2906,7 +2820,7 @@ name = "rattler_shell" version = "0.22.4" dependencies = [ "enum_dispatch", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.13.0", "rattler_conda_types", "serde_json", @@ -2954,7 +2868,7 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ - "bitflags 2.6.0", + "bitflags", ] [[package]] @@ -2985,7 +2899,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3001,9 +2915,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -3013,9 +2927,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -3024,72 +2938,29 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "reqwest" -version = "0.11.27" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "hyper-rustls 0.24.2", - "hyper-tls 0.5.0", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-rustls 0.24.1", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.25.4", - "winreg", -] +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "async-compression", "base64 0.22.1", "bytes", + "encoding_rs", "futures-core", "futures-util", - "h2 0.4.6", - "http 1.1.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "http-body-util", - "hyper 1.4.1", - "hyper-rustls 0.27.3", - "hyper-tls 0.6.0", + "hyper", + "hyper-rustls", + "hyper-tls", "hyper-util", "ipnet", "js-sys", @@ -3100,16 +2971,16 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.13", - "rustls-pemfile 2.1.3", + "rustls", + "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper", "tokio", "tokio-native-tls", - "tokio-rustls 0.26.0", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -3117,7 +2988,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.26.6", + "webpki-roots", "windows-registry", ] @@ -3129,8 +3000,8 @@ checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04" dependencies = [ "anyhow", "async-trait", - "http 1.1.0", - "reqwest 0.12.7", + "http", + "reqwest", "serde", "thiserror", "tower-service", @@ -3147,7 +3018,7 @@ dependencies = [ "elsa", "event-listener", "futures", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.13.0", "petgraph", "tracing", @@ -3217,25 +3088,13 @@ version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.6.0", + "bitflags", "errno", "libc", "linux-raw-sys", "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - [[package]] name = "rustls" version = "0.23.13" @@ -3245,20 +3104,11 @@ dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.8", + "rustls-webpki", "subtle", "zeroize", ] -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - [[package]] name = "rustls-pemfile" version = "2.1.3" @@ -3275,16 +3125,6 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "rustls-webpki" version = "0.102.8" @@ -3332,16 +3172,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "secret-service" version = "4.0.0" @@ -3367,8 +3197,21 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", - "core-foundation", + "bitflags", + "core-foundation 0.9.4", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d0283c0a4a22a0f1b0e4edca251aa20b92fc96eaa09b84bec052f9415e9d71" +dependencies = [ + "bitflags", + "core-foundation 0.10.0", "core-foundation-sys", "libc", "security-framework-sys", @@ -3386,9 +3229,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] @@ -3406,22 +3249,22 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itoa", "memchr", "ryu", @@ -3436,7 +3279,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3453,15 +3296,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.5.0", + "indexmap 2.6.0", "serde", "serde_derive", "serde_json", @@ -3471,14 +3314,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3487,7 +3330,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itoa", "ryu", "serde", @@ -3539,9 +3382,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simd-json" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f0b376aada35f30a0012f5790e50aed62f91804a0682669aefdbe81c7fcb91" +checksum = "b1df0290e9bfe79ddd5ff8798ca887cd107b75353d2957efe9777296e17f26b5" dependencies = [ "getrandom", "halfbrown", @@ -3665,7 +3508,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn", ] [[package]] @@ -3682,32 +3525,15 @@ checksum = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f" [[package]] name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.1" @@ -3723,7 +3549,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" dependencies = [ - "bitflags 2.6.0", + "bitflags", "byteorder", "enum-as-inner", "libc", @@ -3731,27 +3557,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tap" version = "1.0.1" @@ -3760,9 +3565,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.41" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" dependencies = [ "filetime", "libc", @@ -3777,9 +3582,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -3790,22 +3595,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "3b3c6efbfc763e64eb85c11c25320f0737cb7364c4b6336db90aa9ebe27a0bbd" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "b607164372e89797d78b8e23a6d67d5d1038c1c65efd52e1389ef8b77caba2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3856,9 +3661,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ "backtrace", "bytes", @@ -3879,7 +3684,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3892,23 +3697,13 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.12", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.13", + "rustls", "rustls-pki-types", "tokio", ] @@ -3938,7 +3733,7 @@ version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "toml_datetime", "winnow", ] @@ -3989,7 +3784,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -4009,9 +3804,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typed-path" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c0c7479c430935701ff2532e3091e6680ec03f2f89ffcd9988b08e885b90a5" +checksum = "82205ffd44a9697e34fc145491aa47310f9871540bb7909eaa9365e0a9a46607" [[package]] name = "typeid" @@ -4072,6 +3867,12 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + [[package]] name = "unindent" version = "0.2.3" @@ -4116,9 +3917,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom", "rand", @@ -4142,6 +3943,15 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "version-ranges" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284649eba55872c1253f3f6ec15f22303a784e60684babd01d01e4c6ebb85b91" +dependencies = [ + "smallvec", +] + [[package]] name = "version_check" version = "0.9.5" @@ -4195,7 +4005,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn", "wasm-bindgen-shared", ] @@ -4229,7 +4039,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4263,12 +4073,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "webpki-roots" version = "0.26.6" @@ -4349,7 +4153,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -4360,7 +4164,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -4550,16 +4354,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "wyz" version = "0.5.1" @@ -4643,7 +4437,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.77", + "syn", "zvariant_utils", ] @@ -4676,7 +4470,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -4696,7 +4490,7 @@ dependencies = [ "crossbeam-utils", "displaydoc", "flate2", - "indexmap 2.5.0", + "indexmap 2.6.0", "memchr", "thiserror", "time", @@ -4767,7 +4561,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.77", + "syn", "zvariant_utils", ] @@ -4779,5 +4573,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] diff --git a/py-rattler/Cargo.toml b/py-rattler/Cargo.toml index 1ae8a22b8..9d291431c 100644 --- a/py-rattler/Cargo.toml +++ b/py-rattler/Cargo.toml @@ -52,7 +52,7 @@ thiserror = "1.0.61" url = "2.5.0" openssl = { version = "0.10", optional = true } -pep508_rs = "0.6.0" +pep508_rs = "0.9.1" [build-dependencies] pyo3-build-config = "0.21"