diff --git a/Cargo.lock b/Cargo.lock index afb2778b6..4ca021810 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "async-broadcast" @@ -182,11 +182,11 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock 3.1.2", + "async-lock 3.2.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 2.0.1", + "futures-lite 2.1.0", "slab", ] @@ -228,14 +228,14 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" dependencies = [ - "async-lock 3.1.2", + "async-lock 3.2.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.0.1", + "futures-lite 2.1.0", "parking", "polling 3.3.1", - "rustix 0.38.25", + "rustix 0.38.28", "slab", "tracing", "windows-sys 0.52.0", @@ -252,9 +252,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.1.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea8b3453dd7cc96711834b75400d671b73e3656975fa68d9f277163b7f7e316" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" dependencies = [ "event-listener 4.0.0", "event-listener-strategy", @@ -280,7 +280,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.25", + "rustix 0.38.28", "windows-sys 0.48.0", ] @@ -292,7 +292,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -307,7 +307,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.25", + "rustix 0.38.28", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -321,13 +321,13 @@ checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -337,7 +337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f19c246be3876c6b6b6ae210174c137140de56e7588198ada05de9b9884e88a5" dependencies = [ "bisection", - "futures 0.3.29", + "futures 0.3.30", "http-content-range", "itertools 0.11.0", "memmap2 0.9.0", @@ -484,11 +484,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock 3.1.2", + "async-lock 3.2.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 2.0.1", + "futures-lite 2.1.0", "piper", "tracing", ] @@ -552,7 +552,7 @@ checksum = "142316461ed3a3dfcba10417317472da5bfd0461e4d276bf7c07b330766d9490" dependencies = [ "digest", "either", - "futures 0.3.29", + "futures 0.3.30", "hex", "libc", "memmap2 0.5.10", @@ -704,7 +704,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -721,9 +721,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] @@ -813,9 +813,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if", ] @@ -872,7 +872,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -883,7 +883,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -912,7 +912,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc333d47d4ec12897c2efd25031c02191ec115b4099470daeee10f8300035e0d" dependencies = [ "anyhow", - "futures 0.3.29", + "futures 0.3.30", "glob", "monch", "os_pipe", @@ -923,9 +923,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", @@ -1019,7 +1019,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -1040,7 +1040,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -1114,14 +1114,14 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall", + "windows-sys 0.52.0", ] [[package]] @@ -1176,7 +1176,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "rustix 0.38.25", + "rustix 0.38.28", "windows-sys 0.48.0", ] @@ -1204,9 +1204,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1219,9 +1219,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1229,15 +1229,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1246,9 +1246,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -1267,46 +1267,45 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" dependencies = [ "fastrand 2.0.1", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", ] [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1471,9 +1470,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes 1.5.0", "http", @@ -1538,9 +1537,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes 1.5.0", "futures-channel", @@ -1553,7 +1552,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -1589,16 +1588,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.51.1", + "windows-core", ] [[package]] @@ -1745,7 +1744,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.25", + "rustix 0.38.28", "windows-sys 0.48.0", ] @@ -1784,9 +1783,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jobserver" @@ -1820,9 +1819,9 @@ dependencies = [ [[package]] name = "keyring" -version = "2.0.5" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9549a129bd08149e0a71b2d1ce2729780d47127991bfd0a78cc1df697ec72492" +checksum = "ec6488afbd1d8202dbd6e2dd38c0753d8c0adba9ac9985fc6f732a0d551f75e1" dependencies = [ "byteorder", "lazy_static", @@ -1852,7 +1851,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -1863,9 +1862,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libloading" @@ -1891,7 +1890,7 @@ checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ "bitflags 2.4.1", "libc", - "redox_syscall 0.4.1", + "redox_syscall", ] [[package]] @@ -1927,9 +1926,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" @@ -1968,9 +1967,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -2046,7 +2045,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -2081,9 +2080,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "wasi", @@ -2114,6 +2113,12 @@ dependencies = [ "tempfile", ] +[[package]] +name = "netrc-rs" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2970fbbc8c785e8246234a7bd004ed66cd1ed1a35ec73669a92545e419b836" + [[package]] name = "nix" version = "0.26.4" @@ -2269,9 +2274,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" @@ -2281,9 +2286,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.60" +version = "0.10.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" +checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -2302,7 +2307,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -2313,9 +2318,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.96" +version = "0.9.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" +checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" dependencies = [ "cc", "libc", @@ -2370,7 +2375,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -2409,7 +2414,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", "windows-targets 0.48.5", ] @@ -2555,7 +2560,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", "unicase", ] @@ -2586,7 +2591,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -2626,7 +2631,7 @@ dependencies = [ "deno_task_shell", "dirs", "dunce", - "futures 0.3.29", + "futures 0.3.30", "indexmap 2.1.0", "indicatif", "insta", @@ -2641,7 +2646,7 @@ dependencies = [ "pep508_rs", "rattler", "rattler_conda_types", - "rattler_digest 0.14.0", + "rattler_digest 0.15.0", "rattler_installs_packages", "rattler_lock", "rattler_networking", @@ -2673,9 +2678,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" [[package]] name = "plist" @@ -2716,7 +2721,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.25", + "rustix 0.38.28", "tracing", "windows-sys 0.52.0", ] @@ -2775,9 +2780,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708" dependencies = [ "unicode-ident", ] @@ -2821,9 +2826,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2866,9 +2871,9 @@ dependencies = [ [[package]] name = "rattler" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a7fdc78bdcd0c9c2dec5c26c4905b0889d9527226a8eaa2a13f33f6a256c3e" +checksum = "7e9f2b5505b7244ff2641a3ac16261164daf1107b4079ea4bfa01ea90c33c8bd" dependencies = [ "anyhow", "async-compression 0.4.5", @@ -2876,7 +2881,7 @@ dependencies = [ "chrono", "digest", "dirs", - "futures 0.3.29", + "futures 0.3.30", "fxhash", "hex", "itertools 0.11.0", @@ -2886,7 +2891,7 @@ dependencies = [ "once_cell", "pin-project-lite", "rattler_conda_types", - "rattler_digest 0.14.0", + "rattler_digest 0.15.0", "rattler_networking", "rattler_package_streaming", "regex", @@ -2907,9 +2912,9 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63a3ec256e7f09020905578a31f1f68f99f01ad8bec1e7faa6fec5defcc8d04" +checksum = "369a250714e19587d74e77d450723184a5531f52014f9e2ebee469190b32d72a" dependencies = [ "chrono", "fxhash", @@ -2920,7 +2925,7 @@ dependencies = [ "lazy-regex", "nom", "purl", - "rattler_digest 0.14.0", + "rattler_digest 0.15.0", "rattler_macros", "regex", "serde", @@ -2952,9 +2957,9 @@ dependencies = [ [[package]] name = "rattler_digest" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f74f699950dbbe95eaea985d5bd6aae787b5e6fdcec8cdf7cfd2e6dbaa6ef56f" +checksum = "8e960e1db7e55759820edb86fa4f88b523bdc1b125d1bde081519c98a4eaaf1d" dependencies = [ "blake2", "digest", @@ -2987,7 +2992,7 @@ dependencies = [ "elsa", "flate2", "fs4", - "futures 0.3.29", + "futures 0.3.30", "html-escape", "http", "http-cache-semantics", @@ -3026,9 +3031,9 @@ dependencies = [ [[package]] name = "rattler_lock" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cfa5c99d6552c36b9a50e0e1eeb9b3111a443ede63cf0365951af608cec5540" +checksum = "45897c97fefc5eae13ce3a1fbac2a310c81f0cfe31686b7f21bdb7c4f2adfccb" dependencies = [ "chrono", "fxhash", @@ -3036,7 +3041,7 @@ dependencies = [ "pep440_rs", "pep508_rs", "rattler_conda_types", - "rattler_digest 0.14.0", + "rattler_digest 0.15.0", "serde", "serde-json-python-formatter", "serde_json", @@ -3048,19 +3053,19 @@ dependencies = [ [[package]] name = "rattler_macros" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c821dc2a5ce0ffc09fbe4a8cd0050f2f75c86ede4a9a56dc83c0b7fcc05a1655" +checksum = "8a2ce9ce6df32e0ad4d5bf28d9479d1eaff5fd605db086dfb13e8b22fc03e3cc" dependencies = [ "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] name = "rattler_networking" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af42cc8126f44bd969c51651c55abfa9312d2317270aeb4f027bc8dc45b672b0" +checksum = "ad3ea077d782ddf5a97db26c969faf5857ef5c68bc11bd6ab783c701bb8a1806" dependencies = [ "anyhow", "dirs", @@ -3070,6 +3075,7 @@ dependencies = [ "keyring", "lazy_static", "libc", + "netrc-rs", "once_cell", "reqwest", "retry-policies", @@ -3082,16 +3088,16 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb2a7f2fc7ebba8104d96c19574a5f44a5a742eb780386045741b79f4175f2c3" +checksum = "a9f07000a08adb1004ae9ac2f293d4f2b5f7913ca4f4399c81ba028b493d703c" dependencies = [ "bzip2", "chrono", "futures-util", "itertools 0.11.0", "rattler_conda_types", - "rattler_digest 0.14.0", + "rattler_digest 0.15.0", "rattler_networking", "reqwest", "serde_json", @@ -3106,16 +3112,16 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95cf08065825f4ab96466cdbcb2b17f13da8c7b17890dcea0b1b24fcbfe75c85" +checksum = "e2dd0069125dc8972be182948b7c8b19486cc40b48b3e0e921e0014009ff9c6b" dependencies = [ "anyhow", "async-compression 0.4.5", "blake2", "cache_control", "chrono", - "futures 0.3.29", + "futures 0.3.30", "hex", "humansize", "humantime", @@ -3127,7 +3133,7 @@ dependencies = [ "ouroboros", "pin-project-lite", "rattler_conda_types", - "rattler_digest 0.14.0", + "rattler_digest 0.15.0", "rattler_networking", "reqwest", "serde", @@ -3145,9 +3151,9 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c0dec335888d58bc16ae14a494bc44a3591cf7a0989ee8f15db5730c46f043" +checksum = "450adbb1d12c6bba18d0a2f56132e0b98b5fede6915761f5899efa65fa6a00c8" dependencies = [ "enum_dispatch", "indexmap 2.1.0", @@ -3163,16 +3169,16 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b2b9bb2e6d236ad444c2a059c8373734e68f54cefd6dd64f9503fd9e92d74d" +checksum = "86fe5b9a9d69555026576dfc6ba06df303a81eb0492b7ed42afb1796d1f7e286" dependencies = [ "anyhow", "chrono", "hex", "itertools 0.11.0", "rattler_conda_types", - "rattler_digest 0.14.0", + "rattler_digest 0.15.0", "resolvo", "serde", "tempfile", @@ -3183,9 +3189,9 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28d9295cedd1b97ef67be5d9d8221e089d1cfd534ec635eb3916fd1a867b7ec" +checksum = "f50d5d460859382bfde6cf830d4c00a77b80a65c3cc0179134b00482c1d9386d" dependencies = [ "cfg-if", "libloading", @@ -3219,15 +3225,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -3255,7 +3252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248fbed6f59e99c8ef6c6ecadc9b09c6e93713b8f921d73e41d6ed6017bf0624" dependencies = [ "cfg-if", - "rustix 0.38.25", + "rustix 0.38.28", "windows", ] @@ -3305,9 +3302,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ "async-compression 0.4.5", "base64", @@ -3376,9 +3373,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", "getrandom", @@ -3410,22 +3407,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.11", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.9" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", @@ -3472,9 +3469,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "safemem" @@ -3560,9 +3557,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.193" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" dependencies = [ "serde_derive", ] @@ -3578,20 +3575,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ "indexmap 2.1.0", "itoa", @@ -3607,7 +3604,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -3657,7 +3654,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -3680,7 +3677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" dependencies = [ "dashmap", - "futures 0.3.29", + "futures 0.3.30", "lazy_static", "log", "parking_lot", @@ -3695,7 +3692,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -3901,7 +3898,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -3957,9 +3954,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "1726efe18f42ae774cc644f330953a5e7b3c3003d3edcecf18850fe9d4dd9afb" dependencies = [ "proc-macro2", "quote", @@ -4021,15 +4018,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.25", - "windows-sys 0.48.0", + "redox_syscall", + "rustix 0.38.28", + "windows-sys 0.52.0", ] [[package]] @@ -4048,7 +4045,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.25", + "rustix 0.38.28", "windows-sys 0.48.0", ] @@ -4065,22 +4062,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -4095,9 +4092,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", @@ -4115,9 +4112,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -4145,9 +4142,9 @@ checksum = "d5e993a1c7c32fdf90a308cec4d457f507b2573acc909bd6e7a092321664fdb3" [[package]] name = "tokio" -version = "1.34.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes 1.5.0", @@ -4180,7 +4177,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -4301,7 +4298,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", ] [[package]] @@ -4354,9 +4351,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" @@ -4385,9 +4382,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-ident" @@ -4532,7 +4529,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", "wasm-bindgen-shared", ] @@ -4566,7 +4563,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.47", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4615,7 +4612,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.25", + "rustix 0.38.28", ] [[package]] @@ -4655,19 +4652,10 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core 0.52.0", + "windows-core", "windows-targets 0.52.0", ] -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-core" version = "0.52.0" @@ -4877,9 +4865,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "8434aeec7b290e8da5c3f0d628cb0eac6cabcb31d14bb74f779a08109a5914d6" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index a174e9bd6..e1e1275d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,15 +37,15 @@ minijinja = { version = "1.0.10", features = ["builtins"] } once_cell = "1.18.0" pep440_rs = "0.3.12" pep508_rs = { version = "0.2.3", features = ["modern"] } -rattler = { version = "0.14.0", default-features = false } -rattler_conda_types = { version = "0.14.0", default-features = false } -rattler_digest = { version = "0.14.0", default-features = false } -rattler_lock = { version = "0.14.0", default-features = false } -rattler_networking = { version = "0.14.0", default-features = false } -rattler_repodata_gateway = { version = "0.14.0", default-features = false, features = ["sparse"] } -rattler_shell = { version = "0.14.0", default-features = false, features = ["sysinfo"] } -rattler_solve = { version = "0.14.0", default-features = false, features = ["resolvo"] } -rattler_virtual_packages = { version = "0.14.0", default-features = false } +rattler = { version = "0.15.0", default-features = false } +rattler_conda_types = { version = "0.15.0", default-features = false } +rattler_digest = { version = "0.15.0", default-features = false } +rattler_lock = { version = "0.15.0", default-features = false } +rattler_networking = { version = "0.15.0", default-features = false } +rattler_repodata_gateway = { version = "0.15.0", default-features = false, features = ["sparse"] } +rattler_shell = { version = "0.15.0", default-features = false, features = ["sysinfo"] } +rattler_solve = { version = "0.15.0", default-features = false, features = ["resolvo"] } +rattler_virtual_packages = { version = "0.15.0", default-features = false } regex = "1.10.2" reqwest = { version = "0.11.22", default-features = false } rip = { package = "rattler_installs_packages", version = "0.1.0", default-features = false } @@ -71,7 +71,7 @@ libc = { version = "0.2.150", default-features = false } signal-hook = "0.3.17" [dev-dependencies] -rattler_digest = "0.14.0" +rattler_digest = "0.15.0" serde_json = "1.0.108" serial_test = "2.0.0" tokio = { version = "1.34.0", features = ["rt"] } diff --git a/src/cli/add.rs b/src/cli/add.rs index 221e30216..3077f5b60 100644 --- a/src/cli/add.rs +++ b/src/cli/add.rs @@ -10,7 +10,7 @@ use itertools::Itertools; use miette::{IntoDiagnostic, WrapErr}; use rattler_conda_types::{ version_spec::{LogicalOperator, RangeOperator}, - MatchSpec, NamelessMatchSpec, PackageName, Platform, Version, VersionSpec, + MatchSpec, NamelessMatchSpec, PackageName, Platform, Version, VersionBumpType, VersionSpec, }; use rattler_repodata_gateway::sparse::SparseRepoData; use rattler_solve::{resolvo, SolverImpl}; @@ -403,7 +403,8 @@ fn determine_version_constraint<'a>( let upper_bound = max_version .pop_segments(1) .unwrap_or_else(|| max_version.clone()) - .bump(); + .bump(VersionBumpType::Last) + .ok()?; Some(VersionSpec::Group( LogicalOperator::And, vec![ diff --git a/src/cli/auth.rs b/src/cli/auth.rs index aa5ee6988..a9af6be16 100644 --- a/src/cli/auth.rs +++ b/src/cli/auth.rs @@ -95,7 +95,9 @@ fn login(args: LoginArgs, storage: AuthenticationStorage) -> miette::Result<()> miette::bail!("Authentication with anaconda.org requires a conda token. Use `--conda-token` to provide one."); } - storage.store(&host, &auth).into_diagnostic()?; + storage + .store(&host, &auth) + .map_err(|e| miette::miette!(e.to_string()))?; Ok(()) } @@ -104,7 +106,9 @@ fn logout(args: LogoutArgs, storage: AuthenticationStorage) -> miette::Result<() println!("Removing authentication for {}", host); - storage.delete(&host).into_diagnostic()?; + storage + .delete(&host) + .map_err(|e| miette::miette!(e.to_string()))?; Ok(()) } diff --git a/src/cli/info.rs b/src/cli/info.rs index 00fefe939..970290e3c 100644 --- a/src/cli/info.rs +++ b/src/cli/info.rs @@ -4,7 +4,6 @@ use chrono::{DateTime, Local}; use clap::Parser; use miette::IntoDiagnostic; use rattler_conda_types::{GenericVirtualPackage, Platform}; -use rattler_networking::AuthenticationStorage; use rattler_virtual_packages::VirtualPackage; use serde::Serialize; use serde_with::serde_as; @@ -221,7 +220,9 @@ pub async fn execute(args: Args) -> miette::Result<()> { version: env!("CARGO_PKG_VERSION").to_string(), cache_dir: Some(cache_dir), cache_size, - auth_dir: AuthenticationStorage::default().fallback_storage.path, + auth_dir: rattler_networking::authentication_storage::backends::file::FileStorage::default( + ) + .path, project_info, }; diff --git a/src/project/manifest.rs b/src/project/manifest.rs index 8aa992d25..00c16f354 100644 --- a/src/project/manifest.rs +++ b/src/project/manifest.rs @@ -1204,6 +1204,11 @@ mod test { {PROJECT_BOILERPLATE} [dependencies] test_map = {{ version = ">=1.2.3", channel="conda-forge", build="py34_0" }} + test_build = {{ build = "bla" }} + test_channel = {{ channel = "conda-forge" }} + test_version = {{ version = ">=1.2.3" }} + test_version_channel = {{ version = ">=1.2.3", channel = "conda-forge" }} + test_version_build = {{ version = ">=1.2.3", build = "py34_0" }} "# ); diff --git a/src/project/snapshots/pixi__project__manifest__test__mapped_dependencies.snap b/src/project/snapshots/pixi__project__manifest__test__mapped_dependencies.snap index c7ac94b02..5abf7fe09 100644 --- a/src/project/snapshots/pixi__project__manifest__test__mapped_dependencies.snap +++ b/src/project/snapshots/pixi__project__manifest__test__mapped_dependencies.snap @@ -83,6 +83,137 @@ ProjectManifest { md5: None, sha256: None, }, + "test_build": NamelessMatchSpec { + version: None, + build: Some( + Exact( + "bla", + ), + ), + build_number: None, + file_name: None, + channel: None, + subdir: None, + namespace: None, + md5: None, + sha256: None, + }, + "test_channel": NamelessMatchSpec { + version: None, + build: None, + build_number: None, + file_name: None, + channel: Some( + Channel { + platforms: None, + base_url: Url { + scheme: "https", + cannot_be_a_base: false, + username: "", + password: None, + host: Some( + Domain( + "conda.anaconda.org", + ), + ), + port: None, + path: "/conda-forge/", + query: None, + fragment: None, + }, + name: Some( + "conda-forge", + ), + }, + ), + subdir: None, + namespace: None, + md5: None, + sha256: None, + }, + "test_version": NamelessMatchSpec { + version: Some( + Range( + GreaterEquals, + Version { + version: [[0], [1], [2], [3]], + local: [], + }, + ), + ), + build: None, + build_number: None, + file_name: None, + channel: None, + subdir: None, + namespace: None, + md5: None, + sha256: None, + }, + "test_version_channel": NamelessMatchSpec { + version: Some( + Range( + GreaterEquals, + Version { + version: [[0], [1], [2], [3]], + local: [], + }, + ), + ), + build: None, + build_number: None, + file_name: None, + channel: Some( + Channel { + platforms: None, + base_url: Url { + scheme: "https", + cannot_be_a_base: false, + username: "", + password: None, + host: Some( + Domain( + "conda.anaconda.org", + ), + ), + port: None, + path: "/conda-forge/", + query: None, + fragment: None, + }, + name: Some( + "conda-forge", + ), + }, + ), + subdir: None, + namespace: None, + md5: None, + sha256: None, + }, + "test_version_build": NamelessMatchSpec { + version: Some( + Range( + GreaterEquals, + Version { + version: [[0], [1], [2], [3]], + local: [], + }, + ), + ), + build: Some( + Exact( + "py34_0", + ), + ), + build_number: None, + file_name: None, + channel: None, + subdir: None, + namespace: None, + md5: None, + sha256: None, + }, }, host_dependencies: None, build_dependencies: None,