diff --git a/Cargo.lock b/Cargo.lock index 7b274474d..2d5c1dcf0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,9 +135,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "archspec" @@ -171,9 +171,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", "event-listener 5.3.0", @@ -202,11 +202,10 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", "fastrand 2.0.2", @@ -316,7 +315,7 @@ checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -345,20 +344,20 @@ checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] name = "async_http_range_reader" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf8eeab30c68da4dc2c51f3afc4327ab06fe0f3f028ca423f7ca398c7ed8c5e7" +checksum = "8561e6613f8361df8bed11c0eef05b98384643bc81f6b753eec7c1d91f097509" dependencies = [ "bisection", "futures", @@ -376,8 +375,8 @@ dependencies = [ [[package]] name = "async_zip" -version = "0.0.16" -source = "git+https://github.com/charliermarsh/rs-async-zip?rev=d76801da0943de985254fc6255c0e476b57c5836#d76801da0943de985254fc6255c0e476b57c5836" +version = "0.0.17" +source = "git+https://github.com/charliermarsh/rs-async-zip?rev=1dcb40cfe1bf5325a6fd4bfcf9894db40241f585#1dcb40cfe1bf5325a6fd4bfcf9894db40241f585" dependencies = [ "async-compression", "crc32fast", @@ -450,6 +449,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "bincode" version = "1.3.3" @@ -572,9 +577,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytecheck" @@ -633,9 +638,9 @@ dependencies = [ [[package]] name = "cacache" -version = "12.0.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142316461ed3a3dfcba10417317472da5bfd0461e4d276bf7c07b330766d9490" +checksum = "a61ff12b19d89c752c213316b87fdb4a587f073d219b893cc56974b8c9f39bf7" dependencies = [ "digest", "either", @@ -661,7 +666,7 @@ dependencies = [ [[package]] name = "cache-key" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "hex", "seahash", @@ -708,9 +713,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.91" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd97381a8cc6493395a5afc4c691c1084b3768db713b73aa215217aa245d153" +checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" dependencies = [ "jobserver", "libc", @@ -740,9 +745,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -750,7 +755,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -797,9 +802,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" +checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" dependencies = [ "clap", ] @@ -813,7 +818,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -976,7 +981,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -987,7 +992,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -1104,7 +1109,7 @@ dependencies = [ [[package]] name = "distribution-filename" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "pep440_rs", "platform-tags", @@ -1118,7 +1123,7 @@ dependencies = [ [[package]] name = "distribution-types" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", "cache-key", @@ -1151,9 +1156,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "elsa" @@ -1172,9 +1177,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1197,7 +1202,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -1209,7 +1214,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -1230,7 +1235,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -1510,7 +1515,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -1621,25 +1626,6 @@ dependencies = [ "regex-syntax 0.8.3", ] -[[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", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -1720,9 +1706,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1731,20 +1717,32 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" dependencies = [ "bytes", + "futures-core", "http", + "http-body", "pin-project-lite", ] [[package]] name = "http-cache" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5ab65432bbdfe8490dfde21d0366353a8d39f2bc24aca0146889f931b0b4b5" +checksum = "d6ffb12b95bb2a369fe47ca8924016c72c2fa0e6059ba98bd1516f558696c5a8" dependencies = [ "async-trait", "bincode", @@ -1758,9 +1756,9 @@ dependencies = [ [[package]] name = "http-cache-reqwest" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8285341ce7e709c56a0f259ff1c789c70edfbaa88acd69d27e4d63980b92dc" +checksum = "be3e27c4e2e510571cbcc601407b639667146aa9a4e818d5cc1d97c8b4b27d61" dependencies = [ "anyhow", "async-trait", @@ -1770,15 +1768,14 @@ dependencies = [ "reqwest", "reqwest-middleware", "serde", - "task-local-extensions", "url", ] [[package]] name = "http-cache-semantics" -version = "1.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aec9f678bca3f4a15194b980f20ed9bfe0dd38e8d298c65c559a93dfbd6380a" +checksum = "92baf25cf0b8c9246baecf3a444546360a97b569168fdf92563ee6a47829920c" dependencies = [ "http", "http-serde", @@ -1794,9 +1791,9 @@ checksum = "9f0d1a8ef218a86416107794b34cc446958d9203556c312bb41eab4c924c1d2e" [[package]] name = "http-serde" -version = "1.1.3" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" +checksum = "1133cafcce27ea69d35e56b3a8772e265633e04de73c5f4e1afdffc1d19b5419" dependencies = [ "http", "serde", @@ -1837,53 +1834,74 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.6", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", "http", "hyper", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", + "http-body-util", "hyper", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.6", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2000,7 +2018,7 @@ dependencies = [ [[package]] name = "install-wheel-rs" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "configparser", "csv", @@ -2090,9 +2108,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "685a7d121ee3f65ae4fddd72b25a04bb36b6af81bc0828f7d5434c0fe60fa3a2" dependencies = [ "libc", ] @@ -2162,7 +2180,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -2198,7 +2216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2405,7 +2423,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -2416,7 +2434,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -2425,21 +2443,11 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "minijinja" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb3bf58a1ec4f3f228bec851a2066c7717ad308817cd8a08f67c10660c6ff7b" +checksum = "fb5c5e3d2b4c0a6832bd3d571f7c19a7c1c1f05f11a6e85ae1a29f76be5f9455" dependencies = [ "serde", ] @@ -2573,9 +2581,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" dependencies = [ "num-bigint", "num-complex", @@ -2680,7 +2688,7 @@ dependencies = [ [[package]] name = "once-map" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "dashmap", "tokio", @@ -2721,7 +2729,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -2800,7 +2808,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -2875,6 +2883,15 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +[[package]] +name = "path-absolutize" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5" +dependencies = [ + "path-dedot", +] + [[package]] name = "path-dedot" version = "3.1.1" @@ -2893,10 +2910,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pep440_rs" version = "0.5.0" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "once_cell", - "pubgrub", "rkyv", "serde", "unicode-width", @@ -2906,7 +2922,7 @@ dependencies = [ [[package]] name = "pep508_rs" version = "0.4.2" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "derivative", "once_cell", @@ -2966,7 +2982,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", "unicase", ] @@ -2997,7 +3013,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -3078,7 +3094,7 @@ dependencies = [ "requirements-txt", "reqwest", "reqwest-middleware", - "reqwest-retry 0.4.0", + "reqwest-retry", "rstest", "self-replace", "serde", @@ -3105,13 +3121,15 @@ dependencies = [ "uv-build", "uv-cache", "uv-client", + "uv-configuration", "uv-dispatch", "uv-distribution", + "uv-git", "uv-installer", "uv-interpreter", "uv-normalize", "uv-resolver", - "uv-traits", + "uv-types", "xxhash-rust", "zip", ] @@ -3124,9 +3142,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platform-info" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6259c4860e53bf665016f1b2f46a8859cadfa717581dc9d597ae4069de6300f" +checksum = "d5ff316b9c4642feda973c18f0decd6c8b0919d4722566f6e4337cce0dd88217" dependencies = [ "libc", "winapi", @@ -3135,7 +3153,7 @@ dependencies = [ [[package]] name = "platform-tags" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "rustc-hash", "serde", @@ -3228,9 +3246,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -3243,7 +3261,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", "version_check", "yansi", ] @@ -3271,7 +3289,7 @@ dependencies = [ [[package]] name = "pubgrub" version = "0.2.1" -source = "git+https://github.com/astral-sh/pubgrub?rev=e981e4dfe315582e84e2fd724832fb0e0c50b7aa#e981e4dfe315582e84e2fd724832fb0e0c50b7aa" +source = "git+https://github.com/astral-sh/pubgrub?rev=c26e485213e39582c6f2e4d45c0328422670e7a7#c26e485213e39582c6f2e4d45c0328422670e7a7" dependencies = [ "indexmap 2.2.6", "log", @@ -3298,9 +3316,10 @@ dependencies = [ [[package]] name = "pypi-types" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "chrono", + "indexmap 2.2.6", "mailparse", "once_cell", "pep440_rs", @@ -3309,6 +3328,7 @@ dependencies = [ "rkyv", "serde", "thiserror", + "toml", "tracing", "url", "uv-normalize", @@ -3338,9 +3358,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -3389,12 +3409,10 @@ dependencies = [ [[package]] name = "rattler" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cf17592e2097c40bb78458d5894cd0c4f4e54fa3c7e48a4ca2cdc09bf48d18f" +version = "0.21.0" +source = "git+https://github.com/mamba-org/rattler?branch=main#e47528f4ca6eea1885ba7632e3ec976dbb0d056e" dependencies = [ "anyhow", - "async-compression", "bytes", "chrono", "clap", @@ -3403,31 +3421,25 @@ dependencies = [ "fs-err", "futures", "fxhash", - "hex", "indexmap 2.2.6", "itertools", "memchr", "memmap2 0.9.4", - "nom", "once_cell", - "pin-project-lite", "rattler_conda_types", "rattler_digest", "rattler_networking", "rattler_package_streaming", + "rattler_shell", "reflink-copy", "regex", "reqwest", "reqwest-middleware", - "serde", - "serde_json", - "serde_with", "smallvec", "tempfile", "thiserror", "tokio", "tokio-stream", - "tokio-util", "tracing", "url", "uuid", @@ -3436,14 +3448,12 @@ dependencies = [ [[package]] name = "rattler_conda_types" version = "0.20.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22355c9ca09dcba831e8530c09787516d29ebfdd78eebd6e3157cdffa9ebde70" +source = "git+https://github.com/mamba-org/rattler?branch=main#e47528f4ca6eea1885ba7632e3ec976dbb0d056e" dependencies = [ "chrono", "fxhash", "glob", "hex", - "indexmap 2.2.6", "itertools", "lazy-regex", "nom", @@ -3455,7 +3465,6 @@ dependencies = [ "serde_json", "serde_repr", "serde_with", - "serde_yaml", "smallvec", "strum", "thiserror", @@ -3466,8 +3475,7 @@ dependencies = [ [[package]] name = "rattler_digest" version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a15f14fa0e0fdf3fbacabd21d66a3d6b15af5c7c0cda2e0e29bd6605dec4569" +source = "git+https://github.com/mamba-org/rattler?branch=main#e47528f4ca6eea1885ba7632e3ec976dbb0d056e" dependencies = [ "blake2", "digest", @@ -3482,8 +3490,7 @@ dependencies = [ [[package]] name = "rattler_lock" version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf007f6e5a6f27ae33d15185a72c198e4662bf38be53c30ceea8b86a504c8ff" +source = "git+https://github.com/mamba-org/rattler?branch=main#e47528f4ca6eea1885ba7632e3ec976dbb0d056e" dependencies = [ "chrono", "fxhash", @@ -3495,7 +3502,6 @@ dependencies = [ "rattler_conda_types", "rattler_digest", "serde", - "serde-json-python-formatter", "serde_json", "serde_with", "serde_yaml", @@ -3506,22 +3512,20 @@ dependencies = [ [[package]] name = "rattler_macros" version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6c3aedd4fa6a50b41be9537c8abc7190ae24f1b0add0ab722275fa0ec8d6d" +source = "git+https://github.com/mamba-org/rattler?branch=main#e47528f4ca6eea1885ba7632e3ec976dbb0d056e" dependencies = [ "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] name = "rattler_networking" version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235b836c1acac144780e2255d8b514fd89d3f7e5e865553f22ff0cc2a5744d21" +source = "git+https://github.com/mamba-org/rattler?branch=main#e47528f4ca6eea1885ba7632e3ec976dbb0d056e" dependencies = [ "anyhow", "async-trait", - "base64 0.21.7", + "base64 0.22.0", "chrono", "dirs", "fslock", @@ -3529,16 +3533,12 @@ dependencies = [ "http", "itertools", "keyring", - "lazy_static", - "libc", "netrc-rs", - "once_cell", "reqwest", "reqwest-middleware", - "retry-policies 0.3.0", + "retry-policies", "serde", "serde_json", - "task-local-extensions", "thiserror", "tracing", "url", @@ -3546,14 +3546,12 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ab40c7851026ce066437a7aa8f41bd855631de1df7119cd6c4592f5e7c8761" +version = "0.20.3" +source = "git+https://github.com/mamba-org/rattler?branch=main#e47528f4ca6eea1885ba7632e3ec976dbb0d056e" dependencies = [ "bzip2", "chrono", "futures-util", - "itertools", "num_cpus", "rattler_conda_types", "rattler_digest", @@ -3573,9 +3571,8 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5a431bebc785418239234de099d93c762f36ee9eccc25fb771e66f7e67dc478" +version = "0.19.6" +source = "git+https://github.com/mamba-org/rattler?branch=main#e47528f4ca6eea1885ba7632e3ec976dbb0d056e" dependencies = [ "anyhow", "async-compression", @@ -3589,7 +3586,6 @@ dependencies = [ "itertools", "json-patch", "libc", - "md-5", "memmap2 0.9.4", "ouroboros", "pin-project-lite", @@ -3614,8 +3610,7 @@ dependencies = [ [[package]] name = "rattler_shell" version = "0.19.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0786444f12ae6ad5a159a4c5cdca90a8fab06d45998da04e176d3cd1eee0757" +source = "git+https://github.com/mamba-org/rattler?branch=main#e47528f4ca6eea1885ba7632e3ec976dbb0d056e" dependencies = [ "enum_dispatch", "indexmap 2.2.6", @@ -3632,18 +3627,14 @@ dependencies = [ [[package]] name = "rattler_solve" version = "0.20.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c04b27a7c16d0be56a398236a08575c5180752a07de9b86fa9ae5ccae59326" +source = "git+https://github.com/mamba-org/rattler?branch=main#e47528f4ca6eea1885ba7632e3ec976dbb0d056e" dependencies = [ - "anyhow", "chrono", "futures", - "hex", "itertools", "rattler_conda_types", "rattler_digest", "resolvo", - "serde", "tempfile", "thiserror", "tracing", @@ -3653,11 +3644,9 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" version = "0.19.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078daeab0c71d739969e28b280bd58450b85e9d360b75feedd23e2b6613b531" +source = "git+https://github.com/mamba-org/rattler?branch=main#e47528f4ca6eea1885ba7632e3ec976dbb0d056e" dependencies = [ "archspec", - "cfg-if", "libloading", "nom", "once_cell", @@ -3729,13 +3718,13 @@ dependencies = [ [[package]] name = "reflink-copy" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52b1349400e2ffd64a9fb5ed9008e33c0b8ef86bd5bae8f73080839c7082f1d5" +checksum = "4dea9fb2ba3bcc8c51607906e56fe392ba2eb9947dcc84597f26d73f56877c66" dependencies = [ "cfg-if", "rustix 0.38.32", - "windows 0.54.0", + "windows 0.56.0", ] [[package]] @@ -3800,9 +3789,8 @@ dependencies = [ [[package]] name = "requirements-txt" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ - "async-recursion", "fs-err", "pep508_rs", "regex", @@ -3811,6 +3799,7 @@ dependencies = [ "unscanny", "url", "uv-client", + "uv-configuration", "uv-fs", "uv-normalize", "uv-warnings", @@ -3818,27 +3807,27 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" dependencies = [ "async-compression", - "base64 0.21.7", + "base64 0.22.0", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-rustls", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", "mime", - "mime_guess", "native-tls", "once_cell", "percent-encoding", @@ -3846,11 +3835,11 @@ dependencies = [ "rustls", "rustls-native-certs", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", @@ -3867,47 +3856,24 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216" +checksum = "0209efb52486ad88136190094ee214759ef7507068b27992256ed6610eb71a01" dependencies = [ "anyhow", "async-trait", "http", "reqwest", "serde", - "task-local-extensions", "thiserror", + "tower-service", ] [[package]] name = "reqwest-retry" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9af20b65c2ee9746cc575acb6bd28a05ffc0d15e25c992a8f4462d8686aacb4f" -dependencies = [ - "anyhow", - "async-trait", - "chrono", - "futures", - "getrandom", - "http", - "hyper", - "parking_lot 0.11.2", - "reqwest", - "reqwest-middleware", - "retry-policies 0.2.1", - "task-local-extensions", - "tokio", - "tracing", - "wasm-timer", -] - -[[package]] -name = "reqwest-retry" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadced6a67c5c2d1c819cc2d7e6ddf066f32b9b6a04f8866203ceeb44b79c37f" +checksum = "40f342894422862af74c50e1e9601cf0931accc9c6981e5eb413c46603b616b5" dependencies = [ "anyhow", "async-trait", @@ -3919,8 +3885,7 @@ dependencies = [ "parking_lot 0.11.2", "reqwest", "reqwest-middleware", - "retry-policies 0.3.0", - "task-local-extensions", + "retry-policies", "tokio", "tracing", "wasm-timer", @@ -3941,17 +3906,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "retry-policies" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17dd00bff1d737c40dbcd47d4375281bf4c17933f9eef0a185fc7bacca23ecbd" -dependencies = [ - "anyhow", - "chrono", - "rand", -] - [[package]] name = "retry-policies" version = "0.3.0" @@ -4009,9 +3963,9 @@ dependencies = [ [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "bddb316f4b9cae1a3e89c02f1926d557d1142d0d2e684b038c11c1b77705229a" dependencies = [ "byteorder", "num-traits", @@ -4020,9 +3974,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "938a142ab806f18b88a97b0dea523d39e0fd730a064b035726adcfc58a8a5188" dependencies = [ "byteorder", "rmp", @@ -4054,7 +4008,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.58", + "syn 2.0.59", "unicode-ident", ] @@ -4117,44 +4071,55 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" dependencies = [ "log", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", "rustls-pemfile", + "rustls-pki-types", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", + "rustls-pki-types", ] +[[package]] +name = "rustls-pki-types" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" + [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] @@ -4194,16 +4159,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 = "seahash" version = "4.1.0" @@ -4271,22 +4226,13 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] -[[package]] -name = "serde-json-python-formatter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db62ee54077c67a8cff258c919175f0b3cb78d2b6dcafb0d166ff98dcb21aa5d" -dependencies = [ - "serde_json", -] - [[package]] name = "serde-untagged" version = "0.1.5" @@ -4299,20 +4245,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "indexmap 2.2.6", "itoa", @@ -4322,13 +4268,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -4379,7 +4325,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -4417,7 +4363,7 @@ checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -4647,7 +4593,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -4696,9 +4642,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" dependencies = [ "proc-macro2", "quote", @@ -4737,9 +4683,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.8" +version = "0.30.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b1a378e48fb3ce3a5cf04359c456c9c98ff689bcf1c1bc6e6a31f247686f275" +checksum = "26d7c217777061d5a2d652aea771fb9ba98b6dade657204b08c4b9604d11555b" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4750,27 +4696,6 @@ dependencies = [ "windows 0.52.0", ] -[[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 = "tabwriter" version = "1.4.0" @@ -4797,15 +4722,6 @@ dependencies = [ "xattr", ] -[[package]] -name = "task-local-extensions" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" -dependencies = [ - "pin-utils", -] - [[package]] name = "tempfile" version = "3.10.1" @@ -4856,7 +4772,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -4871,9 +4787,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -4892,9 +4808,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -4947,7 +4863,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -4962,11 +4878,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ "rustls", + "rustls-pki-types", "tokio", ] @@ -5054,9 +4971,31 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.6", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -5069,6 +5008,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -5082,7 +5022,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", ] [[package]] @@ -5259,15 +5199,15 @@ dependencies = [ [[package]] name = "uv-auth" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "async-trait", - "base64 0.21.7", + "base64 0.22.0", + "http", "once_cell", "reqwest", "reqwest-middleware", "rust-netrc", - "task-local-extensions", "thiserror", "tracing", "url", @@ -5277,7 +5217,7 @@ dependencies = [ [[package]] name = "uv-build" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", "distribution-types", @@ -5296,16 +5236,17 @@ dependencies = [ "tokio", "toml", "tracing", + "uv-configuration", "uv-fs", "uv-interpreter", - "uv-traits", + "uv-types", "uv-virtualenv", ] [[package]] name = "uv-cache" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "cache-key", "cachedir", @@ -5328,7 +5269,7 @@ dependencies = [ [[package]] name = "uv-client" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", "async-trait", @@ -5349,16 +5290,12 @@ dependencies = [ "pypi-types", "reqwest", "reqwest-middleware", - "reqwest-retry 0.3.0", + "reqwest-retry", "rkyv", "rmp-serde", - "rustc-hash", - "rustls", - "rustls-native-certs", "serde", "serde_json", "sys-info", - "task-local-extensions", "tempfile", "thiserror", "tl", @@ -5369,21 +5306,36 @@ dependencies = [ "urlencoding", "uv-auth", "uv-cache", + "uv-configuration", "uv-fs", "uv-normalize", "uv-version", "uv-warnings", - "webpki-roots", +] + +[[package]] +name = "uv-configuration" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +dependencies = [ + "anyhow", + "itertools", + "pep508_rs", + "rustc-hash", + "serde", + "serde_json", + "uv-normalize", ] [[package]] name = "uv-dispatch" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", "distribution-types", "futures", + "install-wheel-rs", "itertools", "pep508_rs", "rustc-hash", @@ -5391,16 +5343,17 @@ dependencies = [ "uv-build", "uv-cache", "uv-client", + "uv-configuration", "uv-installer", "uv-interpreter", "uv-resolver", - "uv-traits", + "uv-types", ] [[package]] name = "uv-distribution" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", "cache-key", @@ -5409,7 +5362,9 @@ dependencies = [ "fs-err", "futures", "install-wheel-rs", + "md-5", "nanoid", + "once_cell", "pep440_rs", "pep508_rs", "platform-tags", @@ -5419,6 +5374,7 @@ dependencies = [ "rmp-serde", "rustc-hash", "serde", + "sha2", "tempfile", "thiserror", "tokio", @@ -5427,25 +5383,29 @@ dependencies = [ "url", "uv-cache", "uv-client", + "uv-configuration", "uv-extract", "uv-fs", "uv-git", "uv-normalize", - "uv-traits", + "uv-types", "zip", ] [[package]] name = "uv-extract" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "async-compression", "async_zip", "fs-err", "futures", + "md-5", + "pypi-types", "rayon", "rustc-hash", + "sha2", "thiserror", "tokio", "tokio-tar", @@ -5457,7 +5417,7 @@ dependencies = [ [[package]] name = "uv-fs" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "backoff", "dunce", @@ -5466,6 +5426,7 @@ dependencies = [ "fs2", "junction", "once_cell", + "path-absolutize", "tempfile", "tokio", "tracing", @@ -5476,10 +5437,10 @@ dependencies = [ [[package]] name = "uv-git" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", - "base64 0.21.7", + "base64 0.22.0", "cache-key", "cargo-util", "fs-err", @@ -5499,7 +5460,7 @@ dependencies = [ [[package]] name = "uv-installer" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", "async-channel", @@ -5511,9 +5472,9 @@ dependencies = [ "pep508_rs", "platform-tags", "pypi-types", - "pyproject-toml", "rayon", "requirements-txt", + "rmp-serde", "rustc-hash", "serde", "tempfile", @@ -5524,12 +5485,13 @@ dependencies = [ "url", "uv-cache", "uv-client", + "uv-configuration", "uv-distribution", "uv-extract", "uv-fs", "uv-interpreter", "uv-normalize", - "uv-traits", + "uv-types", "uv-warnings", "walkdir", ] @@ -5537,7 +5499,7 @@ dependencies = [ [[package]] name = "uv-interpreter" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "cache-key", "configparser", @@ -5558,6 +5520,7 @@ dependencies = [ "tracing", "uv-cache", "uv-fs", + "uv-toolchain", "which", "winapi", ] @@ -5565,7 +5528,7 @@ dependencies = [ [[package]] name = "uv-normalize" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "rkyv", "serde", @@ -5574,7 +5537,7 @@ dependencies = [ [[package]] name = "uv-resolver" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anstream", "anyhow", @@ -5587,6 +5550,7 @@ dependencies = [ "either", "futures", "indexmap 2.2.6", + "install-wheel-rs", "itertools", "once-map", "once_cell", @@ -5600,6 +5564,7 @@ dependencies = [ "requirements-txt", "rkyv", "rustc-hash", + "textwrap", "thiserror", "tokio", "tokio-stream", @@ -5607,38 +5572,70 @@ dependencies = [ "url", "uv-cache", "uv-client", + "uv-configuration", "uv-distribution", "uv-interpreter", "uv-normalize", - "uv-traits", + "uv-types", "uv-warnings", ] [[package]] -name = "uv-traits" +name = "uv-toolchain" +version = "0.1.0" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +dependencies = [ + "anyhow", + "fs-err", + "futures", + "once_cell", + "pep440_rs", + "pep508_rs", + "reqwest", + "reqwest-middleware", + "tempfile", + "thiserror", + "tokio", + "tokio-util", + "tracing", + "url", + "uv-client", + "uv-extract", + "uv-fs", +] + +[[package]] +name = "uv-types" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", "distribution-types", + "itertools", "once-map", + "pep440_rs", "pep508_rs", + "pypi-types", + "rustc-hash", "serde", "serde_json", + "thiserror", + "url", "uv-cache", + "uv-configuration", "uv-interpreter", "uv-normalize", ] [[package]] name = "uv-version" -version = "0.1.24" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +version = "0.1.32" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" [[package]] name = "uv-virtualenv" version = "0.0.4" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anstream", "cachedir", @@ -5657,7 +5654,7 @@ dependencies = [ [[package]] name = "uv-warnings" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anstream", "once_cell", @@ -5735,7 +5732,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", "wasm-bindgen-shared", ] @@ -5769,7 +5766,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.59", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5820,9 +5817,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "which" @@ -5874,17 +5874,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] name = "windows" -version = "0.54.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ - "windows-core 0.54.0", - "windows-targets 0.52.4", + "windows-core 0.56.0", + "windows-targets 0.52.5", ] [[package]] @@ -5893,26 +5893,50 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] name = "windows-core" -version = "0.54.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" dependencies = [ + "windows-implement", + "windows-interface", "windows-result", - "windows-targets 0.52.4", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.59", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.59", ] [[package]] name = "windows-result" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5930,7 +5954,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5950,17 +5974,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -5971,9 +5996,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -5983,9 +6008,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -5995,9 +6020,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -6007,9 +6038,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -6019,9 +6050,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -6031,9 +6062,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -6043,9 +6074,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -6058,18 +6089,18 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", diff --git a/Cargo.toml b/Cargo.toml index ae1138bfe..9961a3fae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,19 +45,19 @@ crossbeam-channel = "0.5.12" deno_task_shell = "0.16.0" dialoguer = "0.11.0" dirs = "5.0.1" -distribution-filename = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } -distribution-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } +distribution-filename = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +distribution-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } dunce = "1.0.4" flate2 = "1.0.28" futures = "0.3.30" -http-cache-reqwest = "0.13.0" +http-cache-reqwest = "0.14.0" human_bytes = "0.4.3" humantime = "2.1.0" ignore = "0.4.22" indexmap = { version = "2.2.6", features = ["serde"] } indicatif = "0.17.8" -install-wheel-rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } +install-wheel-rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } is_executable = "1.0.1" itertools = "0.12.1" lazy_static = "1.4.0" @@ -71,12 +71,12 @@ miette = { version = "7.2.0", features = [ ] } minijinja = { version = "1.0.16", features = ["builtins"] } once_cell = "1.19.0" -pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } -pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } -platform-tags = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } -pypi-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } +pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +platform-tags = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +pypi-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } pyproject-toml = "0.10.0" -rattler = { version = "0.20.0", default-features = false, features = [ +rattler = { version = "0.21.0", default-features = false, features = [ "cli-tools", ] } rattler_conda_types = { version = "0.20.4", default-features = false } @@ -94,10 +94,10 @@ rattler_solve = { version = "0.20.4", default-features = false, features = [ ] } rattler_virtual_packages = { version = "0.19.5", default-features = false } regex = "1.10.4" -requirements-txt = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } -reqwest = { version = "0.11.27", default-features = false } -reqwest-middleware = "0.2.5" -reqwest-retry = "0.4.0" +requirements-txt = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +reqwest = { version = "0.12.3", default-features = false } +reqwest-middleware = "0.3.0" +reqwest-retry = "0.5.0" self-replace = "1.3.7" serde = "1.0.197" serde-untagged = "0.1.5" @@ -121,16 +121,18 @@ toml_edit = { version = "0.22.9", features = ["serde"] } tracing = "0.1.40" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } url = "2.5.0" -uv-build = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } -uv-cache = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } -uv-client = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } -uv-dispatch = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } -uv-distribution = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } -uv-installer = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } -uv-interpreter = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } -uv-normalize = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } -uv-resolver = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } -uv-traits = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } +uv-build = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +uv-cache = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +uv-client = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +uv-configuration = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +uv-dispatch = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +uv-distribution = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +uv-git = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +uv-installer = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +uv-interpreter = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +uv-normalize = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +uv-resolver = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +uv-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } xxhash-rust = "0.8.10" zip = { version = "0.6.6", default-features = false, features = [ "deflate", @@ -159,26 +161,28 @@ toml = "0.8.12" [patch.crates-io] # For pyproject-toml # If you change this also change the versions in the the patch section for uv -pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } -pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } +pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } +pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" } # deno_task_shell = { path = "../deno_task_shell" } -# rattler = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" } -# rattler_conda_types = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" } -# rattler_digest = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" } -# rattler_lock = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" } -# rattler_networking = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" } -# rattler_repodata_gateway = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" } -# rattler_shell = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" } -# rattler_solve = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" } -# rattler_virtual_packages = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" } -#rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" } -#rattler_digest = { path = "../rattler/crates/rattler_digest" } -#rattler_networking = { path = "../rattler/crates/rattler_networking" } -#rattler_repodata_gateway = { path = "../rattler/crates/rattler_repodata_gateway" } -#rattler_shell = { path = "../rattler/crates/rattler_shell" } -#rattler_solve = { path = "../rattler/crates/rattler_solve" } -#rattler_virtual_packages = { path = "../rattler/crates/rattler_virtual_packages" } -#rattler_lock = { path = "../rattler/crates/rattler_lock" } +rattler = { git = "https://github.com/mamba-org/rattler", branch = "main" } +rattler_conda_types = { git = "https://github.com/mamba-org/rattler", branch = "main" } +rattler_digest = { git = "https://github.com/mamba-org/rattler", branch = "main" } +rattler_lock = { git = "https://github.com/mamba-org/rattler", branch = "main" } +rattler_networking = { git = "https://github.com/mamba-org/rattler", branch = "main" } +rattler_repodata_gateway = { git = "https://github.com/mamba-org/rattler", branch = "main" } +rattler_shell = { git = "https://github.com/mamba-org/rattler", branch = "main" } +rattler_solve = { git = "https://github.com/mamba-org/rattler", branch = "main" } +rattler_virtual_packages = { git = "https://github.com/mamba-org/rattler", branch = "main" } +# rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" } +# rattler_digest = { path = "../rattler/crates/rattler_digest" } +# rattler_networking = { path = "../rattler/crates/rattler_networking" } +# rattler_repodata_gateway = { path = "../rattler/crates/rattler_repodata_gateway" } +# rattler_shell = { path = "../rattler/crates/rattler_shell" } +# rattler_solve = { path = "../rattler/crates/rattler_solve" } +# rattler_virtual_packages = { path = "../rattler/crates/rattler_virtual_packages" } +# rattler_lock = { path = "../rattler/crates/rattler_lock" } +# rattler_package_streaming = { path = "../rattler/crates/rattler_package_streaming" } +# rattler = { path = "../rattler/crates/rattler" } # Change these lines if you want a patched version of uv [patch.'https://github.com/astral-sh/uv'] @@ -193,31 +197,10 @@ pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" } # uv-interpreter = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" } # uv-normalize = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" } # uv-resolver = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" } -# uv-traits = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" } +# uv-types = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" } # distribution-filename = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" } # distribution-types = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" } # install-wheel-rs = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" } # platform-tags = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" } # pypi-types = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" } # requirements-txt = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" } - -# deno_task_shell = { path = "../deno_task_shell" } -# rattler = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" } -# rattler_conda_types = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" } -# rattler_digest = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" } -# rattler_lock = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" } -# rattler_networking = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" } -# rattler_repodata_gateway = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" } -# rattler_shell = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" } -# rattler_solve = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" } -# rattler_virtual_packages = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" } - - -# rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" } -# rattler_digest = { path = "../rattler/crates/rattler_digest" } -# rattler_networking = { path = "../rattler/crates/rattler_networking" } -# rattler_repodata_gateway = { path = "../rattler/crates/rattler_repodata_gateway" } -# rattler_shell = { path = "../rattler/crates/rattler_shell" } -# rattler_solve = { path = "../rattler/crates/rattler_solve" } -# rattler_virtual_packages = { path = "../rattler/crates/rattler_virtual_packages" } -# rattler_lock = { path = "../rattler/crates/rattler_lock" } diff --git a/examples/pypi-source-deps/pixi.lock b/examples/pypi-source-deps/pixi.lock index 72c2d5a38..e8373ddf1 100644 --- a/examples/pypi-source-deps/pixi.lock +++ b/examples/pypi-source-deps/pixi.lock @@ -21,7 +21,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.4.20240210-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.2.1-hd590300_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.2-hab00c5b_0_cpython.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda @@ -30,10 +30,10 @@ environments: - pypi: https://files.pythonhosted.org/packages/ba/06/a07f096c664aeb9f01624f858c3add0a4e913d6c96257acb4fce61e7de14/certifi-2024.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ee/fb/14d30eb4956408ee3ae09ad34299131fb383c47df355ddb428a7331cfa1e/charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: direct+https://github.com/pallets/click/releases/download/8.1.7/click-8.1.7-py3-none-any.whl - - pypi: git+ssh://git@github.com/pallets/flask@b90a4f1f4a370e92054b9cc9db0efcb864f87ebe - - pypi: https://files.pythonhosted.org/packages/c2/e7/a82b05cf63a603df6e68d59ae6a68bf5064484a0718ea5033660af4b54a9/idna-3.6-py3-none-any.whl + - pypi: git+ssh://git@github.com/pallets/flask@2c7f57ad5bd19743312eb34ea5fb838a1349474e + - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/68/5f/447e04e828f47465eeab35b5d408b7ebaaaee207f48b7136c5a7267a30ae/itsdangerous-2.1.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/42/d7/1ec15b46af6af88f19b8e5ffea08fa375d433c998b8a7639e76935c14f1f/markdown_it_py-3.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0a/0d/2454f072fae3b5a137c119abf15465d1771319dfe9e4acbb31722a0fff91/MarkupSafe-2.1.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl @@ -41,11 +41,11 @@ environments: - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/a5/5b/0cc789b59e8cc1bf288b38111d002d8c5917123194d45b29dcdac64723cc/pluggy-1.4.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/97/9c/372fef8377a6e340b1704768d20daaded98bf13282b5327beb2e2fe2c7ef/pygments-2.17.2-py3-none-any.whl - - pypi: git+https://github.com/pytest-dev/pytest.git@12e061e2e838fb2c17d54df40a4a11aeb8723c6b + - pypi: git+https://github.com/pytest-dev/pytest.git@58844247f7ae4a7a213a73c8af2462253b3d8fc7 - pypi: git+https://github.com/psf/requests.git@0106aced5faa299e6ede89d1230bd6784f2c3660 - pypi: https://files.pythonhosted.org/packages/87/67/a37f6214d0e9fe57f6ae54b2956d550ca8365857f42a1ce0392bb21d9410/rich-13.7.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/c3/fc/254c3e9b5feb89ff5b9076a23218dafbc99c96ac5941e900b71206e6313b/werkzeug-3.0.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e3/23/c9843d7550092ae7ad380611c238f44afef66f58f76c1dab7dcf313e4339/werkzeug-3.0.2-py3-none-any.whl - pypi: ./minimal-project osx-64: - conda: https://conda.anaconda.org/conda-forge/osx-64/bzip2-1.0.8-h10d778d_5.conda @@ -56,7 +56,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-64/libzlib-1.2.13-h8a1eda9_5.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/ncurses-6.4.20240210-h73e2aa4_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/openssl-3.2.1-hd75f5a5_1.conda - - conda: https://conda.anaconda.org/conda-forge/osx-64/python-3.12.2-h9f0c242_0_cpython.conda + - conda: https://conda.anaconda.org/conda-forge/osx-64/python-3.12.3-h1411813_0_cpython.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/readline-8.2-h9e318b2_1.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/tk-8.6.13-h1abcd95_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda @@ -65,10 +65,10 @@ environments: - pypi: https://files.pythonhosted.org/packages/ba/06/a07f096c664aeb9f01624f858c3add0a4e913d6c96257acb4fce61e7de14/certifi-2024.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/2e/7d/2259318c202f3d17f3fe6438149b3b9e706d1070fe3fcbb28049730bb25c/charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_x86_64.whl - pypi: direct+https://github.com/pallets/click/releases/download/8.1.7/click-8.1.7-py3-none-any.whl - - pypi: git+ssh://git@github.com/pallets/flask@b90a4f1f4a370e92054b9cc9db0efcb864f87ebe - - pypi: https://files.pythonhosted.org/packages/c2/e7/a82b05cf63a603df6e68d59ae6a68bf5064484a0718ea5033660af4b54a9/idna-3.6-py3-none-any.whl + - pypi: git+ssh://git@github.com/pallets/flask@2c7f57ad5bd19743312eb34ea5fb838a1349474e + - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/68/5f/447e04e828f47465eeab35b5d408b7ebaaaee207f48b7136c5a7267a30ae/itsdangerous-2.1.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/42/d7/1ec15b46af6af88f19b8e5ffea08fa375d433c998b8a7639e76935c14f1f/markdown_it_py-3.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/48/d6/e7cd795fc710292c3af3a06d80868ce4b02bfbbf370b7cee11d282815a2a/MarkupSafe-2.1.5-cp312-cp312-macosx_10_9_x86_64.whl @@ -76,11 +76,11 @@ environments: - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/a5/5b/0cc789b59e8cc1bf288b38111d002d8c5917123194d45b29dcdac64723cc/pluggy-1.4.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/97/9c/372fef8377a6e340b1704768d20daaded98bf13282b5327beb2e2fe2c7ef/pygments-2.17.2-py3-none-any.whl - - pypi: git+https://github.com/pytest-dev/pytest.git@12e061e2e838fb2c17d54df40a4a11aeb8723c6b + - pypi: git+https://github.com/pytest-dev/pytest.git@58844247f7ae4a7a213a73c8af2462253b3d8fc7 - pypi: git+https://github.com/psf/requests.git@0106aced5faa299e6ede89d1230bd6784f2c3660 - pypi: https://files.pythonhosted.org/packages/87/67/a37f6214d0e9fe57f6ae54b2956d550ca8365857f42a1ce0392bb21d9410/rich-13.7.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/c3/fc/254c3e9b5feb89ff5b9076a23218dafbc99c96ac5941e900b71206e6313b/werkzeug-3.0.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e3/23/c9843d7550092ae7ad380611c238f44afef66f58f76c1dab7dcf313e4339/werkzeug-3.0.2-py3-none-any.whl - pypi: ./minimal-project osx-arm64: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/bzip2-1.0.8-h93a5062_5.conda @@ -91,7 +91,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libzlib-1.2.13-h53f4e23_5.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/ncurses-6.4.20240210-h078ce10_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/openssl-3.2.1-h0d3ecfb_1.conda - - conda: https://conda.anaconda.org/conda-forge/osx-arm64/python-3.12.2-hdf0ec26_0_cpython.conda + - conda: https://conda.anaconda.org/conda-forge/osx-arm64/python-3.12.3-h4a7b5fc_0_cpython.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/readline-8.2-h92ec313_1.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/tk-8.6.13-h5083fa2_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda @@ -100,10 +100,10 @@ environments: - pypi: https://files.pythonhosted.org/packages/ba/06/a07f096c664aeb9f01624f858c3add0a4e913d6c96257acb4fce61e7de14/certifi-2024.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/3a/52/9f9d17c3b54dc238de384c4cb5a2ef0e27985b42a0e5cc8e8a31d918d48d/charset_normalizer-3.3.2-cp312-cp312-macosx_11_0_arm64.whl - pypi: direct+https://github.com/pallets/click/releases/download/8.1.7/click-8.1.7-py3-none-any.whl - - pypi: git+ssh://git@github.com/pallets/flask@b90a4f1f4a370e92054b9cc9db0efcb864f87ebe - - pypi: https://files.pythonhosted.org/packages/c2/e7/a82b05cf63a603df6e68d59ae6a68bf5064484a0718ea5033660af4b54a9/idna-3.6-py3-none-any.whl + - pypi: git+ssh://git@github.com/pallets/flask@2c7f57ad5bd19743312eb34ea5fb838a1349474e + - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/68/5f/447e04e828f47465eeab35b5d408b7ebaaaee207f48b7136c5a7267a30ae/itsdangerous-2.1.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/42/d7/1ec15b46af6af88f19b8e5ffea08fa375d433c998b8a7639e76935c14f1f/markdown_it_py-3.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/53/bd/583bf3e4c8d6a321938c13f49d44024dbe5ed63e0a7ba127e454a66da974/MarkupSafe-2.1.5-cp312-cp312-macosx_10_9_universal2.whl @@ -111,11 +111,11 @@ environments: - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/a5/5b/0cc789b59e8cc1bf288b38111d002d8c5917123194d45b29dcdac64723cc/pluggy-1.4.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/97/9c/372fef8377a6e340b1704768d20daaded98bf13282b5327beb2e2fe2c7ef/pygments-2.17.2-py3-none-any.whl - - pypi: git+https://github.com/pytest-dev/pytest.git@12e061e2e838fb2c17d54df40a4a11aeb8723c6b + - pypi: git+https://github.com/pytest-dev/pytest.git@58844247f7ae4a7a213a73c8af2462253b3d8fc7 - pypi: git+https://github.com/psf/requests.git@0106aced5faa299e6ede89d1230bd6784f2c3660 - pypi: https://files.pythonhosted.org/packages/87/67/a37f6214d0e9fe57f6ae54b2956d550ca8365857f42a1ce0392bb21d9410/rich-13.7.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/c3/fc/254c3e9b5feb89ff5b9076a23218dafbc99c96ac5941e900b71206e6313b/werkzeug-3.0.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e3/23/c9843d7550092ae7ad380611c238f44afef66f58f76c1dab7dcf313e4339/werkzeug-3.0.2-py3-none-any.whl - pypi: ./minimal-project win-64: - conda: https://conda.anaconda.org/conda-forge/win-64/bzip2-1.0.8-hcfcfb64_5.conda @@ -125,7 +125,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.45.2-hcfcfb64_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/libzlib-1.2.13-hcfcfb64_5.conda - conda: https://conda.anaconda.org/conda-forge/win-64/openssl-3.2.1-hcfcfb64_1.conda - - conda: https://conda.anaconda.org/conda-forge/win-64/python-3.12.2-h2628c8c_0_cpython.conda + - conda: https://conda.anaconda.org/conda-forge/win-64/python-3.12.3-h2628c8c_0_cpython.conda - conda: https://conda.anaconda.org/conda-forge/win-64/tk-8.6.13-h5226925_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/ucrt-10.0.22621.0-h57928b3_0.tar.bz2 @@ -138,10 +138,10 @@ environments: - pypi: https://files.pythonhosted.org/packages/b6/7c/8debebb4f90174074b827c63242c23851bdf00a532489fba57fef3416e40/charset_normalizer-3.3.2-cp312-cp312-win_amd64.whl - pypi: direct+https://github.com/pallets/click/releases/download/8.1.7/click-8.1.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl - - pypi: git+ssh://git@github.com/pallets/flask@b90a4f1f4a370e92054b9cc9db0efcb864f87ebe - - pypi: https://files.pythonhosted.org/packages/c2/e7/a82b05cf63a603df6e68d59ae6a68bf5064484a0718ea5033660af4b54a9/idna-3.6-py3-none-any.whl + - pypi: git+ssh://git@github.com/pallets/flask@2c7f57ad5bd19743312eb34ea5fb838a1349474e + - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/68/5f/447e04e828f47465eeab35b5d408b7ebaaaee207f48b7136c5a7267a30ae/itsdangerous-2.1.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/42/d7/1ec15b46af6af88f19b8e5ffea08fa375d433c998b8a7639e76935c14f1f/markdown_it_py-3.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/3f/14/c3554d512d5f9100a95e737502f4a2323a1959f6d0d01e0d0997b35f7b10/MarkupSafe-2.1.5-cp312-cp312-win_amd64.whl @@ -149,11 +149,11 @@ environments: - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/a5/5b/0cc789b59e8cc1bf288b38111d002d8c5917123194d45b29dcdac64723cc/pluggy-1.4.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/97/9c/372fef8377a6e340b1704768d20daaded98bf13282b5327beb2e2fe2c7ef/pygments-2.17.2-py3-none-any.whl - - pypi: git+https://github.com/pytest-dev/pytest.git@12e061e2e838fb2c17d54df40a4a11aeb8723c6b + - pypi: git+https://github.com/pytest-dev/pytest.git@58844247f7ae4a7a213a73c8af2462253b3d8fc7 - pypi: git+https://github.com/psf/requests.git@0106aced5faa299e6ede89d1230bd6784f2c3660 - pypi: https://files.pythonhosted.org/packages/87/67/a37f6214d0e9fe57f6ae54b2956d550ca8365857f42a1ce0392bb21d9410/rich-13.7.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/c3/fc/254c3e9b5feb89ff5b9076a23218dafbc99c96ac5941e900b71206e6313b/werkzeug-3.0.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e3/23/c9843d7550092ae7ad380611c238f44afef66f58f76c1dab7dcf313e4339/werkzeug-3.0.2-py3-none-any.whl - pypi: ./minimal-project packages: - kind: conda @@ -305,12 +305,6 @@ packages: url: https://files.pythonhosted.org/packages/2e/7d/2259318c202f3d17f3fe6438149b3b9e706d1070fe3fcbb28049730bb25c/charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_x86_64.whl sha256: ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b requires_python: '>=3.7.0' -- kind: pypi - name: charset-normalizer - version: 3.3.2 - url: https://files.pythonhosted.org/packages/3a/52/9f9d17c3b54dc238de384c4cb5a2ef0e27985b42a0e5cc8e8a31d918d48d/charset_normalizer-3.3.2-cp312-cp312-macosx_11_0_arm64.whl - sha256: 55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6 - requires_python: '>=3.7.0' - kind: pypi name: charset-normalizer version: 3.3.2 @@ -323,6 +317,12 @@ packages: url: https://files.pythonhosted.org/packages/ee/fb/14d30eb4956408ee3ae09ad34299131fb383c47df355ddb428a7331cfa1e/charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sha256: 90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b requires_python: '>=3.7.0' +- kind: pypi + name: charset-normalizer + version: 3.3.2 + url: https://files.pythonhosted.org/packages/3a/52/9f9d17c3b54dc238de384c4cb5a2ef0e27985b42a0e5cc8e8a31d918d48d/charset_normalizer-3.3.2-cp312-cp312-macosx_11_0_arm64.whl + sha256: 55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6 + requires_python: '>=3.7.0' - kind: pypi name: click version: 8.1.7 @@ -339,8 +339,8 @@ packages: requires_python: '!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7' - kind: pypi name: flask - version: 3.0.2 - url: git+ssh://git@github.com/pallets/flask@b90a4f1f4a370e92054b9cc9db0efcb864f87ebe + version: 3.1.0.dev0 + url: git+ssh://git@github.com/pallets/flask@2c7f57ad5bd19743312eb34ea5fb838a1349474e requires_dist: - werkzeug>=3.0.0 - jinja2>=3.1.2 @@ -353,9 +353,9 @@ packages: requires_python: '>=3.8' - kind: pypi name: idna - version: '3.6' - url: https://files.pythonhosted.org/packages/c2/e7/a82b05cf63a603df6e68d59ae6a68bf5064484a0718ea5033660af4b54a9/idna-3.6-py3-none-any.whl - sha256: c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f + version: '3.7' + url: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl + sha256: 82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0 requires_python: '>=3.5' - kind: pypi name: iniconfig @@ -365,10 +365,10 @@ packages: requires_python: '>=3.7' - kind: pypi name: itsdangerous - version: 2.1.2 - url: https://files.pythonhosted.org/packages/68/5f/447e04e828f47465eeab35b5d408b7ebaaaee207f48b7136c5a7267a30ae/itsdangerous-2.1.2-py3-none-any.whl - sha256: 2c2349112351b88699d8d4b6b075022c0808887cb7ad10069318a8b0bc88db44 - requires_python: '>=3.7' + version: 2.2.0 + url: https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl + sha256: c6242fc49e35958c8b15141343aa660db5fc54d4f13a1db01a3f5891b98700ef + requires_python: '>=3.8' - kind: pypi name: jinja2 version: 3.1.3 @@ -741,12 +741,6 @@ packages: url: https://files.pythonhosted.org/packages/48/d6/e7cd795fc710292c3af3a06d80868ce4b02bfbbf370b7cee11d282815a2a/MarkupSafe-2.1.5-cp312-cp312-macosx_10_9_x86_64.whl sha256: 3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4 requires_python: '>=3.7' -- kind: pypi - name: markupsafe - version: 2.1.5 - url: https://files.pythonhosted.org/packages/53/bd/583bf3e4c8d6a321938c13f49d44024dbe5ed63e0a7ba127e454a66da974/MarkupSafe-2.1.5-cp312-cp312-macosx_10_9_universal2.whl - sha256: 8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1 - requires_python: '>=3.7' - kind: pypi name: markupsafe version: 2.1.5 @@ -759,6 +753,12 @@ packages: url: https://files.pythonhosted.org/packages/0a/0d/2454f072fae3b5a137c119abf15465d1771319dfe9e4acbb31722a0fff91/MarkupSafe-2.1.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sha256: f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5 requires_python: '>=3.7' +- kind: pypi + name: markupsafe + version: 2.1.5 + url: https://files.pythonhosted.org/packages/53/bd/583bf3e4c8d6a321938c13f49d44024dbe5ed63e0a7ba127e454a66da974/MarkupSafe-2.1.5-cp312-cp312-macosx_10_9_universal2.whl + sha256: 8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1 + requires_python: '>=3.7' - kind: pypi name: mdurl version: 0.1.2 @@ -906,8 +906,8 @@ packages: requires_python: '>=3.7' - kind: pypi name: pytest - version: 8.2.0.dev60+g12e061e2e - url: git+https://github.com/pytest-dev/pytest.git@12e061e2e838fb2c17d54df40a4a11aeb8723c6b + version: 8.2.0.dev90+g58844247f + url: git+https://github.com/pytest-dev/pytest.git@58844247f7ae4a7a213a73c8af2462253b3d8fc7 requires_dist: - iniconfig - packaging @@ -926,75 +926,72 @@ packages: requires_python: '>=3.8' - kind: conda name: python - version: 3.12.2 - build: h2628c8c_0_cpython - subdir: win-64 - url: https://conda.anaconda.org/conda-forge/win-64/python-3.12.2-h2628c8c_0_cpython.conda - sha256: b8eda863b48ae4531635e23fd15e759d93212b6204c6847d591e25fa5fd67477 - md5: be8803e9f75a477df61d4aabea3c1246 + version: 3.12.3 + build: h1411813_0_cpython + subdir: osx-64 + url: https://conda.anaconda.org/conda-forge/osx-64/python-3.12.3-h1411813_0_cpython.conda + sha256: 3b327ffc152a245011011d1d730781577a8274fde1cf6243f073749ead8f1c2a + md5: df1448ec6cbf8eceb03d29003cf72ae6 depends: + - __osx >=10.9 - bzip2 >=1.0.8,<2.0a0 - - libexpat >=2.5.0,<3.0a0 + - libexpat >=2.6.2,<3.0a0 - libffi >=3.4,<4.0a0 - - libsqlite >=3.45.1,<4.0a0 + - libsqlite >=3.45.2,<4.0a0 - libzlib >=1.2.13,<1.3.0a0 + - ncurses >=6.4.20240210,<7.0a0 - openssl >=3.2.1,<4.0a0 + - readline >=8.2,<9.0a0 - tk >=8.6.13,<8.7.0a0 - tzdata - - ucrt >=10.0.20348.0 - - vc >=14.2,<15 - - vc14_runtime >=14.29.30139 - xz >=5.2.6,<6.0a0 constrains: - python_abi 3.12.* *_cp312 license: Python-2.0 - size: 16083296 - timestamp: 1708116662336 + size: 14557341 + timestamp: 1713208068012 - kind: conda name: python - version: 3.12.2 - build: h9f0c242_0_cpython - subdir: osx-64 - url: https://conda.anaconda.org/conda-forge/osx-64/python-3.12.2-h9f0c242_0_cpython.conda - sha256: 7647ac06c3798a182a4bcb1ff58864f1ef81eb3acea6971295304c23e43252fb - md5: 0179b8007ba008cf5bec11f3b3853902 + version: 3.12.3 + build: h2628c8c_0_cpython + subdir: win-64 + url: https://conda.anaconda.org/conda-forge/win-64/python-3.12.3-h2628c8c_0_cpython.conda + sha256: 1a95494abe572a8819c933f978df89f00bde72ea9432d46a70632599e8029ea4 + md5: f07c8c5dd98767f9a652de5d039b284e depends: - bzip2 >=1.0.8,<2.0a0 - - libexpat >=2.5.0,<3.0a0 + - libexpat >=2.6.2,<3.0a0 - libffi >=3.4,<4.0a0 - - libsqlite >=3.45.1,<4.0a0 + - libsqlite >=3.45.2,<4.0a0 - libzlib >=1.2.13,<1.3.0a0 - - ncurses >=6.4,<7.0a0 - openssl >=3.2.1,<4.0a0 - - readline >=8.2,<9.0a0 - tk >=8.6.13,<8.7.0a0 - tzdata + - ucrt >=10.0.20348.0 + - vc >=14.2,<15 + - vc14_runtime >=14.29.30139 - xz >=5.2.6,<6.0a0 constrains: - python_abi 3.12.* *_cp312 license: Python-2.0 - size: 14596811 - timestamp: 1708118065292 + size: 16179248 + timestamp: 1713205644673 - kind: conda name: python - version: 3.12.2 - build: hab00c5b_0_cpython - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.2-hab00c5b_0_cpython.conda - sha256: ddb7a2d8d78046bda5d7631e6814f9468d2eb054e10f86f4648c9d1fdaa30c0f - md5: ad7b68400f3a6ebe72b00be093c7f301 + version: 3.12.3 + build: h4a7b5fc_0_cpython + subdir: osx-arm64 + url: https://conda.anaconda.org/conda-forge/osx-arm64/python-3.12.3-h4a7b5fc_0_cpython.conda + sha256: c761fb3713ea66bce3889b33b6f400afb2dd192d1fc2686446e9d8166cfcec6b + md5: 8643ab37bece6ae8f112464068d9df9c depends: + - __osx >=11.0 - bzip2 >=1.0.8,<2.0a0 - - ld_impl_linux-64 >=2.36.1 - - libexpat >=2.5.0,<3.0a0 + - libexpat >=2.6.2,<3.0a0 - libffi >=3.4,<4.0a0 - - libgcc-ng >=12 - - libnsl >=2.0.1,<2.1.0a0 - - libsqlite >=3.45.1,<4.0a0 - - libuuid >=2.38.1,<3.0a0 - - libxcrypt >=4.4.36 + - libsqlite >=3.45.2,<4.0a0 - libzlib >=1.2.13,<1.3.0a0 - - ncurses >=6.4,<7.0a0 + - ncurses >=6.4.20240210,<7.0a0 - openssl >=3.2.1,<4.0a0 - readline >=8.2,<9.0a0 - tk >=8.6.13,<8.7.0a0 @@ -1003,23 +1000,28 @@ packages: constrains: - python_abi 3.12.* *_cp312 license: Python-2.0 - size: 32312631 - timestamp: 1708118077305 + size: 13207557 + timestamp: 1713206576646 - kind: conda name: python - version: 3.12.2 - build: hdf0ec26_0_cpython - subdir: osx-arm64 - url: https://conda.anaconda.org/conda-forge/osx-arm64/python-3.12.2-hdf0ec26_0_cpython.conda - sha256: ccd6c55a286d51d907c878ed2bfa7d1becce0fee71374a9386c5eb90d803ac72 - md5: 85e91138ae921a2771f57a50120272bd + version: 3.12.3 + build: hab00c5b_0_cpython + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda + sha256: f9865bcbff69f15fd89a33a2da12ad616e98d65ce7c83c644b92e66e5016b227 + md5: 2540b74d304f71d3e89c81209db4db84 depends: - bzip2 >=1.0.8,<2.0a0 - - libexpat >=2.5.0,<3.0a0 + - ld_impl_linux-64 >=2.36.1 + - libexpat >=2.6.2,<3.0a0 - libffi >=3.4,<4.0a0 - - libsqlite >=3.45.1,<4.0a0 + - libgcc-ng >=12 + - libnsl >=2.0.1,<2.1.0a0 + - libsqlite >=3.45.2,<4.0a0 + - libuuid >=2.38.1,<3.0a0 + - libxcrypt >=4.4.36 - libzlib >=1.2.13,<1.3.0a0 - - ncurses >=6.4,<7.0a0 + - ncurses >=6.4.20240210,<7.0a0 - openssl >=3.2.1,<4.0a0 - readline >=8.2,<9.0a0 - tk >=8.6.13,<8.7.0a0 @@ -1028,8 +1030,8 @@ packages: constrains: - python_abi 3.12.* *_cp312 license: Python-2.0 - size: 13085901 - timestamp: 1708117361381 + size: 31991381 + timestamp: 1713208036041 - kind: conda name: readline version: '8.2' @@ -1251,9 +1253,9 @@ packages: timestamp: 1702511261442 - kind: pypi name: werkzeug - version: 3.0.1 - url: https://files.pythonhosted.org/packages/c3/fc/254c3e9b5feb89ff5b9076a23218dafbc99c96ac5941e900b71206e6313b/werkzeug-3.0.1-py3-none-any.whl - sha256: 90a285dc0e42ad56b34e696398b8122ee4c681833fb35b8334a095d82c56da10 + version: 3.0.2 + url: https://files.pythonhosted.org/packages/e3/23/c9843d7550092ae7ad380611c238f44afef66f58f76c1dab7dcf313e4339/werkzeug-3.0.2-py3-none-any.whl + sha256: 3aac3f5da756f93030740bc235d3e09449efcf65f2f55e3602e1d851b8f48795 requires_dist: - markupsafe>=2.1.1 - watchdog>=2.3 ; extra == 'watchdog' diff --git a/examples/pypi/pixi.lock b/examples/pypi/pixi.lock index dcf2606c1..cd335cd6d 100644 --- a/examples/pypi/pixi.lock +++ b/examples/pypi/pixi.lock @@ -68,7 +68,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/af/26/f231ee425c8df93c1abbead3d90ea4a5ff3d6aa49e0edfd3b4c017e74844/h5py-3.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/8a/15/ea245239487bbd8d7203fe010ea48c7539e42bf1fde0592313241a3fba3a/ipython-8.23.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/68/5f/447e04e828f47465eeab35b5d408b7ebaaaee207f48b7136c5a7267a30ae/itsdangerous-2.1.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/20/9f/bc63f0f0737ad7a60800bfd472a4836661adae21f9c2535f3957b1e54ceb/jedi-0.19.1-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/fe/58/34d4d8f1aa11120c2d36d7ad27d0526164b1a8ae45990a2fede31d0e59bf/keras-2.14.0-py3-none-any.whl @@ -76,7 +76,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/fc/b3/0c0c994fe49cd661084f8d5dc06562af53818cc0abefaca35bdc894577c3/Markdown-3.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/97/18/c30da5e7a0e7f4603abfc6780574131221d9148f323752c2755d48abad30/MarkupSafe-2.1.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/80/3b/e363612ac1a514abfb5505aa209dd5b724b3232a6de98710d7759559706a/matplotlib-3.8.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/f2/51/c34d7a1d528efaae3d8ddb18ef45a41f284eacf9e514523b191b7d0872cc/matplotlib_inline-0.1.6-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/8f/8e/9ad090d3553c280a8060fbf6e24dc1c0c29704ee7d1c372f0c174aa59285/matplotlib_inline-0.1.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/87/91/d57c2d22e4801edeb7f3e7939214c0ea8a28c6e16f85208c2df2145e0213/ml_dtypes-0.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/7e/80/cab10959dc1faead58dc8384a781dfbf93cb4d33d50988f7a69f1b7c9bbe/oauthlib-3.2.2-py3-none-any.whl @@ -108,7 +108,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/70/8e/0e2d847013cb52cd35b38c009bb167a1a26b2ce6cd6965bf26b47bc0bf44/requests-2.31.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/3b/5d/63d4ae3b9daea098d5d6f5da83984853c1bbacd5dc826764b249fe119d24/requests_oauthlib-2.0.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/49/97/fa78e3d2f65c02c8e1268b9aba606569fe97f6c8f7c2d74394553347c145/rsa-4.9-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/92/e1/1c8bb3420105e70bdf357d57dd5567202b4ef8d27f810e98bb962d950834/setuptools-69.2.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/f7/29/13965af254e3373bceae8fb9a0e6ea0d0e571171b80d6646932131d6439b/setuptools-69.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/f1/7b/ce1eafaf1a76852e2ec9b22edecf1daa58175c090266e9f6c64afcd81d91/stack_data-0.6.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/f4/f1/990741d5bb2487d529d20a433210ffa136a367751e454214013b441c4575/tenacity-8.2.3-py3-none-any.whl @@ -144,7 +144,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-64/libllvm16-16.0.6-hbedff68_3.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/libopenblas-0.3.25-openmp_hfef2a42_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/libsqlite-3.45.2-h92b6c6a_0.conda - - conda: https://conda.anaconda.org/conda-forge/osx-64/libxml2-2.12.6-hc0ae0f7_1.conda + - conda: https://conda.anaconda.org/conda-forge/osx-64/libxml2-2.12.6-hc0ae0f7_2.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/libzlib-1.2.13-h8a1eda9_5.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/llvm-openmp-18.1.3-hb6ac08f_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/ncurses-6.4.20240210-h73e2aa4_0.conda @@ -183,7 +183,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/a0/52/38bb74cc4362738cc7ef819503fc54d70f0c3a7378519ccb0ac309389122/h5py-3.11.0-cp311-cp311-macosx_10_9_x86_64.whl - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/8a/15/ea245239487bbd8d7203fe010ea48c7539e42bf1fde0592313241a3fba3a/ipython-8.23.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/68/5f/447e04e828f47465eeab35b5d408b7ebaaaee207f48b7136c5a7267a30ae/itsdangerous-2.1.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/20/9f/bc63f0f0737ad7a60800bfd472a4836661adae21f9c2535f3957b1e54ceb/jedi-0.19.1-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/fe/58/34d4d8f1aa11120c2d36d7ad27d0526164b1a8ae45990a2fede31d0e59bf/keras-2.14.0-py3-none-any.whl @@ -191,7 +191,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/fc/b3/0c0c994fe49cd661084f8d5dc06562af53818cc0abefaca35bdc894577c3/Markdown-3.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/6b/cb/aed7a284c00dfa7c0682d14df85ad4955a350a21d2e3b06d8240497359bf/MarkupSafe-2.1.5-cp311-cp311-macosx_10_9_x86_64.whl - pypi: https://files.pythonhosted.org/packages/36/11/62250ea25780d4b59c2c6044ec161235c47cc05a18d0ec0a05657de75b7d/matplotlib-3.8.4-cp311-cp311-macosx_10_12_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/f2/51/c34d7a1d528efaae3d8ddb18ef45a41f284eacf9e514523b191b7d0872cc/matplotlib_inline-0.1.6-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/8f/8e/9ad090d3553c280a8060fbf6e24dc1c0c29704ee7d1c372f0c174aa59285/matplotlib_inline-0.1.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/15/da/43bee505963da0c730ee50e951c604bfdb90d4cccc9c0044c946b10e68a7/ml_dtypes-0.2.0-cp311-cp311-macosx_10_9_universal2.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/7e/80/cab10959dc1faead58dc8384a781dfbf93cb4d33d50988f7a69f1b7c9bbe/oauthlib-3.2.2-py3-none-any.whl @@ -223,7 +223,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/70/8e/0e2d847013cb52cd35b38c009bb167a1a26b2ce6cd6965bf26b47bc0bf44/requests-2.31.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/3b/5d/63d4ae3b9daea098d5d6f5da83984853c1bbacd5dc826764b249fe119d24/requests_oauthlib-2.0.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/49/97/fa78e3d2f65c02c8e1268b9aba606569fe97f6c8f7c2d74394553347c145/rsa-4.9-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/92/e1/1c8bb3420105e70bdf357d57dd5567202b4ef8d27f810e98bb962d950834/setuptools-69.2.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/f7/29/13965af254e3373bceae8fb9a0e6ea0d0e571171b80d6646932131d6439b/setuptools-69.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/f1/7b/ce1eafaf1a76852e2ec9b22edecf1daa58175c090266e9f6c64afcd81d91/stack_data-0.6.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/f4/f1/990741d5bb2487d529d20a433210ffa136a367751e454214013b441c4575/tenacity-8.2.3-py3-none-any.whl @@ -259,7 +259,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libllvm16-16.0.6-haab561b_3.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libopenblas-0.3.25-openmp_h6c19121_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libsqlite-3.45.2-h091b4b1_0.conda - - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libxml2-2.12.6-h0d0cfa8_1.conda + - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libxml2-2.12.6-h0d0cfa8_2.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libzlib-1.2.13-h53f4e23_5.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/llvm-openmp-18.1.3-hcd81f8e_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/ncurses-6.4.20240210-h078ce10_0.conda @@ -298,7 +298,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/f0/af/dfbea0c69fe725e9e77259d42f4e14eb582eb094200aaf697feb36f513d8/h5py-3.11.0-cp311-cp311-macosx_11_0_arm64.whl - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/8a/15/ea245239487bbd8d7203fe010ea48c7539e42bf1fde0592313241a3fba3a/ipython-8.23.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/68/5f/447e04e828f47465eeab35b5d408b7ebaaaee207f48b7136c5a7267a30ae/itsdangerous-2.1.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/20/9f/bc63f0f0737ad7a60800bfd472a4836661adae21f9c2535f3957b1e54ceb/jedi-0.19.1-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/fe/58/34d4d8f1aa11120c2d36d7ad27d0526164b1a8ae45990a2fede31d0e59bf/keras-2.14.0-py3-none-any.whl @@ -306,7 +306,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/fc/b3/0c0c994fe49cd661084f8d5dc06562af53818cc0abefaca35bdc894577c3/Markdown-3.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/11/e7/291e55127bb2ae67c64d66cef01432b5933859dfb7d6949daa721b89d0b3/MarkupSafe-2.1.5-cp311-cp311-macosx_10_9_universal2.whl - pypi: https://files.pythonhosted.org/packages/14/60/12d4f27b859a74359306662da69c2d08826a2b05cfe7f96e66b490f41573/matplotlib-3.8.4-cp311-cp311-macosx_11_0_arm64.whl - - pypi: https://files.pythonhosted.org/packages/f2/51/c34d7a1d528efaae3d8ddb18ef45a41f284eacf9e514523b191b7d0872cc/matplotlib_inline-0.1.6-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/8f/8e/9ad090d3553c280a8060fbf6e24dc1c0c29704ee7d1c372f0c174aa59285/matplotlib_inline-0.1.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/15/da/43bee505963da0c730ee50e951c604bfdb90d4cccc9c0044c946b10e68a7/ml_dtypes-0.2.0-cp311-cp311-macosx_10_9_universal2.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/7e/80/cab10959dc1faead58dc8384a781dfbf93cb4d33d50988f7a69f1b7c9bbe/oauthlib-3.2.2-py3-none-any.whl @@ -338,7 +338,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/70/8e/0e2d847013cb52cd35b38c009bb167a1a26b2ce6cd6965bf26b47bc0bf44/requests-2.31.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/3b/5d/63d4ae3b9daea098d5d6f5da83984853c1bbacd5dc826764b249fe119d24/requests_oauthlib-2.0.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/49/97/fa78e3d2f65c02c8e1268b9aba606569fe97f6c8f7c2d74394553347c145/rsa-4.9-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/92/e1/1c8bb3420105e70bdf357d57dd5567202b4ef8d27f810e98bb962d950834/setuptools-69.2.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/f7/29/13965af254e3373bceae8fb9a0e6ea0d0e571171b80d6646932131d6439b/setuptools-69.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/f1/7b/ce1eafaf1a76852e2ec9b22edecf1daa58175c090266e9f6c64afcd81d91/stack_data-0.6.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/f4/f1/990741d5bb2487d529d20a433210ffa136a367751e454214013b441c4575/tenacity-8.2.3-py3-none-any.whl @@ -360,18 +360,18 @@ environments: win-64: - conda: https://conda.anaconda.org/conda-forge/win-64/bzip2-1.0.8-hcfcfb64_5.conda - conda: https://conda.anaconda.org/conda-forge/win-64/ca-certificates-2024.2.2-h56e8100_0.conda - - conda: https://conda.anaconda.org/conda-forge/win-64/intel-openmp-2024.1.0-h57928b3_964.conda + - conda: https://conda.anaconda.org/conda-forge/win-64/intel-openmp-2024.1.0-h57928b3_965.conda - conda: https://conda.anaconda.org/conda-forge/win-64/libblas-3.9.0-22_win64_mkl.conda - conda: https://conda.anaconda.org/conda-forge/win-64/libcblas-3.9.0-22_win64_mkl.conda - conda: https://conda.anaconda.org/conda-forge/win-64/libclang-16.0.6-default_h3a3e6c3_6.conda - conda: https://conda.anaconda.org/conda-forge/win-64/libclang13-16.0.6-default_hf64faad_6.conda - conda: https://conda.anaconda.org/conda-forge/win-64/libexpat-2.6.2-h63175ca_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/libffi-3.4.2-h8ffe710_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/win-64/libhwloc-2.9.3-default_haede6df_1009.conda + - conda: https://conda.anaconda.org/conda-forge/win-64/libhwloc-2.10.0-default_h2fffb23_1000.conda - conda: https://conda.anaconda.org/conda-forge/win-64/libiconv-1.17-hcfcfb64_2.conda - conda: https://conda.anaconda.org/conda-forge/win-64/liblapack-3.9.0-22_win64_mkl.conda - conda: https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.45.2-hcfcfb64_0.conda - - conda: https://conda.anaconda.org/conda-forge/win-64/libxml2-2.12.6-hc3477c8_1.conda + - conda: https://conda.anaconda.org/conda-forge/win-64/libxml2-2.12.6-hc3477c8_2.conda - conda: https://conda.anaconda.org/conda-forge/win-64/libzlib-1.2.13-hcfcfb64_5.conda - conda: https://conda.anaconda.org/conda-forge/win-64/mkl-2024.1.0-h66d3029_692.conda - conda: https://conda.anaconda.org/conda-forge/win-64/numpy-1.26.4-py311h0b4df5a_0.conda @@ -380,7 +380,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/win-64/python-3.11.8-h2628c8c_0_cpython.conda - conda: https://conda.anaconda.org/conda-forge/win-64/python_abi-3.11-4_cp311.conda - conda: https://conda.anaconda.org/conda-forge/win-64/scipy-1.11.4-py311h0b4df5a_0.conda - - conda: https://conda.anaconda.org/conda-forge/win-64/tbb-2021.11.0-h91493d7_1.conda + - conda: https://conda.anaconda.org/conda-forge/win-64/tbb-2021.12.0-h91493d7_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/tk-8.6.13-h5226925_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/ucrt-10.0.22621.0-h57928b3_0.tar.bz2 @@ -415,7 +415,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/d8/5e/b7b83cfe60504cc4d24746aed04353af7ea8ec104e597e5ae71b8d0390cb/h5py-3.11.0-cp311-cp311-win_amd64.whl - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/8a/15/ea245239487bbd8d7203fe010ea48c7539e42bf1fde0592313241a3fba3a/ipython-8.23.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/68/5f/447e04e828f47465eeab35b5d408b7ebaaaee207f48b7136c5a7267a30ae/itsdangerous-2.1.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/20/9f/bc63f0f0737ad7a60800bfd472a4836661adae21f9c2535f3957b1e54ceb/jedi-0.19.1-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/fe/58/34d4d8f1aa11120c2d36d7ad27d0526164b1a8ae45990a2fede31d0e59bf/keras-2.14.0-py3-none-any.whl @@ -423,7 +423,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/fc/b3/0c0c994fe49cd661084f8d5dc06562af53818cc0abefaca35bdc894577c3/Markdown-3.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b7/a2/c78a06a9ec6d04b3445a949615c4c7ed86a0b2eb68e44e7541b9d57067cc/MarkupSafe-2.1.5-cp311-cp311-win_amd64.whl - pypi: https://files.pythonhosted.org/packages/2d/d5/6227732ecab9165586966ccb54301e3164f61b470c954c4cf6940654fbe1/matplotlib-3.8.4-cp311-cp311-win_amd64.whl - - pypi: https://files.pythonhosted.org/packages/f2/51/c34d7a1d528efaae3d8ddb18ef45a41f284eacf9e514523b191b7d0872cc/matplotlib_inline-0.1.6-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/8f/8e/9ad090d3553c280a8060fbf6e24dc1c0c29704ee7d1c372f0c174aa59285/matplotlib_inline-0.1.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/08/89/c727fde1a3d12586e0b8c01abf53754707d76beaa9987640e70807d4545f/ml_dtypes-0.2.0-cp311-cp311-win_amd64.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/7e/80/cab10959dc1faead58dc8384a781dfbf93cb4d33d50988f7a69f1b7c9bbe/oauthlib-3.2.2-py3-none-any.whl @@ -453,7 +453,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/70/8e/0e2d847013cb52cd35b38c009bb167a1a26b2ce6cd6965bf26b47bc0bf44/requests-2.31.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/3b/5d/63d4ae3b9daea098d5d6f5da83984853c1bbacd5dc826764b249fe119d24/requests_oauthlib-2.0.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/49/97/fa78e3d2f65c02c8e1268b9aba606569fe97f6c8f7c2d74394553347c145/rsa-4.9-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/92/e1/1c8bb3420105e70bdf357d57dd5567202b4ef8d27f810e98bb962d950834/setuptools-69.2.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/f7/29/13965af254e3373bceae8fb9a0e6ea0d0e571171b80d6646932131d6439b/setuptools-69.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/f1/7b/ce1eafaf1a76852e2ec9b22edecf1daa58175c090266e9f6c64afcd81d91/stack_data-0.6.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/f4/f1/990741d5bb2487d529d20a433210ffa136a367751e454214013b441c4575/tenacity-8.2.3-py3-none-any.whl @@ -532,8 +532,8 @@ packages: - kind: pypi name: black version: 23.12.1 - url: https://files.pythonhosted.org/packages/37/bf/a80abc6fcdb00f0d4d3d74184b172adbf2197f6b002913fa0fb6af4dc6db/black-23.12.1-cp311-cp311-win_amd64.whl - sha256: 0808494f2b2df923ffc5723ed3c7b096bd76341f6213989759287611e9837d50 + url: https://files.pythonhosted.org/packages/eb/59/1f5c8eb7bba8a8b1bb5c87f097d16410c93a48a6655be3773db5d2783deb/black-23.12.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: 9c4352800f14be5b4864016882cdba10755bd50805c95f728011bcb47a4afd59 requires_dist: - click >=8.0.0 - mypy-extensions >=0.4.3 @@ -552,8 +552,8 @@ packages: - kind: pypi name: black version: 23.12.1 - url: https://files.pythonhosted.org/packages/eb/59/1f5c8eb7bba8a8b1bb5c87f097d16410c93a48a6655be3773db5d2783deb/black-23.12.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: 9c4352800f14be5b4864016882cdba10755bd50805c95f728011bcb47a4afd59 + url: https://files.pythonhosted.org/packages/72/e2/d981a3ff05ba9abe3cfa33e70c986facb0614fd57c4f802ef435f4dd1697/black-23.12.1-cp311-cp311-macosx_11_0_arm64.whl + sha256: 602cfb1196dc692424c70b6507593a2b29aac0547c1be9a1d1365f0d964c353b requires_dist: - click >=8.0.0 - mypy-extensions >=0.4.3 @@ -572,8 +572,8 @@ packages: - kind: pypi name: black version: 23.12.1 - url: https://files.pythonhosted.org/packages/72/e2/d981a3ff05ba9abe3cfa33e70c986facb0614fd57c4f802ef435f4dd1697/black-23.12.1-cp311-cp311-macosx_11_0_arm64.whl - sha256: 602cfb1196dc692424c70b6507593a2b29aac0547c1be9a1d1365f0d964c353b + url: https://files.pythonhosted.org/packages/ed/2c/d9b1a77101e6e5f294f6553d76c39322122bfea2a438aeea4eb6d4b22749/black-23.12.1-cp311-cp311-macosx_10_9_x86_64.whl + sha256: 8d4df77958a622f9b5a4c96edb4b8c0034f8434032ab11077ec6c56ae9f384ba requires_dist: - click >=8.0.0 - mypy-extensions >=0.4.3 @@ -592,8 +592,8 @@ packages: - kind: pypi name: black version: 23.12.1 - url: https://files.pythonhosted.org/packages/ed/2c/d9b1a77101e6e5f294f6553d76c39322122bfea2a438aeea4eb6d4b22749/black-23.12.1-cp311-cp311-macosx_10_9_x86_64.whl - sha256: 8d4df77958a622f9b5a4c96edb4b8c0034f8434032ab11077ec6c56ae9f384ba + url: https://files.pythonhosted.org/packages/37/bf/a80abc6fcdb00f0d4d3d74184b172adbf2197f6b002913fa0fb6af4dc6db/black-23.12.1-cp311-cp311-win_amd64.whl + sha256: 0808494f2b2df923ffc5723ed3c7b096bd76341f6213989759287611e9837d50 requires_dist: - click >=8.0.0 - mypy-extensions >=0.4.3 @@ -729,12 +729,6 @@ packages: url: https://files.pythonhosted.org/packages/ba/06/a07f096c664aeb9f01624f858c3add0a4e913d6c96257acb4fce61e7de14/certifi-2024.2.2-py3-none-any.whl sha256: dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1 requires_python: '>=3.6' -- kind: pypi - name: charset-normalizer - version: 3.3.2 - url: https://files.pythonhosted.org/packages/57/ec/80c8d48ac8b1741d5b963797b7c0c869335619e13d4744ca2f67fc11c6fc/charset_normalizer-3.3.2-cp311-cp311-win_amd64.whl - sha256: 663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77 - requires_python: '>=3.7.0' - kind: pypi name: charset-normalizer version: 3.3.2 @@ -753,6 +747,12 @@ packages: url: https://files.pythonhosted.org/packages/3e/33/21a875a61057165e92227466e54ee076b73af1e21fe1b31f1e292251aa1e/charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_x86_64.whl sha256: 573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96 requires_python: '>=3.7.0' +- kind: pypi + name: charset-normalizer + version: 3.3.2 + url: https://files.pythonhosted.org/packages/57/ec/80c8d48ac8b1741d5b963797b7c0c869335619e13d4744ca2f67fc11c6fc/charset_normalizer-3.3.2-cp311-cp311-win_amd64.whl + sha256: 663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77 + requires_python: '>=3.7.0' - kind: pypi name: click version: 8.1.7 @@ -771,8 +771,8 @@ packages: - kind: pypi name: contourpy version: 1.2.1 - url: https://files.pythonhosted.org/packages/d6/4f/76d0dd0bca417691918484c26c74dd9dd44fbf528bbfeb30d754886e2c54/contourpy-1.2.1-cp311-cp311-win_amd64.whl - sha256: 2855c8b0b55958265e8b5888d6a615ba02883b225f2227461aa9127c578a4922 + url: https://files.pythonhosted.org/packages/ee/c0/9bd123d676eb61750e116a2cd915b06483fc406143cfc36c7f263f0f5368/contourpy-1.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: d4492d82b3bc7fbb7e3610747b159869468079fe149ec5c4d771fa1f614a14df requires_dist: - numpy >=1.20 - furo ; extra == 'docs' @@ -795,8 +795,8 @@ packages: - kind: pypi name: contourpy version: 1.2.1 - url: https://files.pythonhosted.org/packages/ee/c0/9bd123d676eb61750e116a2cd915b06483fc406143cfc36c7f263f0f5368/contourpy-1.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: d4492d82b3bc7fbb7e3610747b159869468079fe149ec5c4d771fa1f614a14df + url: https://files.pythonhosted.org/packages/9f/6b/8a1ca4b81d426c104fe42b3cfad9488eaaef0a03fcf98eaecc22b628a013/contourpy-1.2.1-cp311-cp311-macosx_11_0_arm64.whl + sha256: ef5adb9a3b1d0c645ff694f9bca7702ec2c70f4d734f9922ea34de02294fdf72 requires_dist: - numpy >=1.20 - furo ; extra == 'docs' @@ -819,8 +819,8 @@ packages: - kind: pypi name: contourpy version: 1.2.1 - url: https://files.pythonhosted.org/packages/9f/6b/8a1ca4b81d426c104fe42b3cfad9488eaaef0a03fcf98eaecc22b628a013/contourpy-1.2.1-cp311-cp311-macosx_11_0_arm64.whl - sha256: ef5adb9a3b1d0c645ff694f9bca7702ec2c70f4d734f9922ea34de02294fdf72 + url: https://files.pythonhosted.org/packages/33/0e/51ff72fac17e2500baf30b6b2a24be423a8d27e1625e5de99f585b852d74/contourpy-1.2.1-cp311-cp311-macosx_10_9_x86_64.whl + sha256: 6022cecf8f44e36af10bd9118ca71f371078b4c168b6e0fab43d4a889985dbb5 requires_dist: - numpy >=1.20 - furo ; extra == 'docs' @@ -843,8 +843,8 @@ packages: - kind: pypi name: contourpy version: 1.2.1 - url: https://files.pythonhosted.org/packages/33/0e/51ff72fac17e2500baf30b6b2a24be423a8d27e1625e5de99f585b852d74/contourpy-1.2.1-cp311-cp311-macosx_10_9_x86_64.whl - sha256: 6022cecf8f44e36af10bd9118ca71f371078b4c168b6e0fab43d4a889985dbb5 + url: https://files.pythonhosted.org/packages/d6/4f/76d0dd0bca417691918484c26c74dd9dd44fbf528bbfeb30d754886e2c54/contourpy-1.2.1-cp311-cp311-win_amd64.whl + sha256: 2855c8b0b55958265e8b5888d6a615ba02883b225f2227461aa9127c578a4922 requires_dist: - numpy >=1.20 - furo ; extra == 'docs' @@ -927,8 +927,8 @@ packages: - kind: pypi name: fonttools version: 4.51.0 - url: https://files.pythonhosted.org/packages/c5/d4/f426fa1ca42e47bcfff0c878fa9d49d9c03379d00903a7c178f95b97867a/fonttools-4.51.0-cp311-cp311-win_amd64.whl - sha256: 0f08c901d3866a8905363619e3741c33f0a83a680d92a9f0e575985c2634fcc1 + url: https://files.pythonhosted.org/packages/c6/b5/dc17e93f60567fa1b0fa3720c2f28e0df5293927e2356e066e87af9adaba/fonttools-4.51.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: b2b92381f37b39ba2fc98c3a45a9d6383bfc9916a87d66ccb6553f7bdd129097 requires_dist: - fs <3, >=2.2.0 ; extra == 'all' - lxml >=4.0 ; extra == 'all' @@ -964,8 +964,8 @@ packages: - kind: pypi name: fonttools version: 4.51.0 - url: https://files.pythonhosted.org/packages/c6/b5/dc17e93f60567fa1b0fa3720c2f28e0df5293927e2356e066e87af9adaba/fonttools-4.51.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: b2b92381f37b39ba2fc98c3a45a9d6383bfc9916a87d66ccb6553f7bdd129097 + url: https://files.pythonhosted.org/packages/33/47/f2ca671af61757eaaac608963dda5b76ec9100621e45d0fd63a153fd8cd7/fonttools-4.51.0-cp311-cp311-macosx_10_9_universal2.whl + sha256: a8feca65bab31479d795b0d16c9a9852902e3a3c0630678efb0b2b7941ea9c74 requires_dist: - fs <3, >=2.2.0 ; extra == 'all' - lxml >=4.0 ; extra == 'all' @@ -1001,8 +1001,8 @@ packages: - kind: pypi name: fonttools version: 4.51.0 - url: https://files.pythonhosted.org/packages/33/47/f2ca671af61757eaaac608963dda5b76ec9100621e45d0fd63a153fd8cd7/fonttools-4.51.0-cp311-cp311-macosx_10_9_universal2.whl - sha256: a8feca65bab31479d795b0d16c9a9852902e3a3c0630678efb0b2b7941ea9c74 + url: https://files.pythonhosted.org/packages/84/51/8203a3e6e475e6766ac950638d42f45470f36c6a4f0615ff0a1c1f2ed0d6/fonttools-4.51.0-cp311-cp311-macosx_10_9_x86_64.whl + sha256: 8ac27f436e8af7779f0bb4d5425aa3535270494d3bc5459ed27de3f03151e4c2 requires_dist: - fs <3, >=2.2.0 ; extra == 'all' - lxml >=4.0 ; extra == 'all' @@ -1038,8 +1038,8 @@ packages: - kind: pypi name: fonttools version: 4.51.0 - url: https://files.pythonhosted.org/packages/84/51/8203a3e6e475e6766ac950638d42f45470f36c6a4f0615ff0a1c1f2ed0d6/fonttools-4.51.0-cp311-cp311-macosx_10_9_x86_64.whl - sha256: 8ac27f436e8af7779f0bb4d5425aa3535270494d3bc5459ed27de3f03151e4c2 + url: https://files.pythonhosted.org/packages/c5/d4/f426fa1ca42e47bcfff0c878fa9d49d9c03379d00903a7c178f95b97867a/fonttools-4.51.0-cp311-cp311-win_amd64.whl + sha256: 0f08c901d3866a8905363619e3741c33f0a83a680d92a9f0e575985c2634fcc1 requires_dist: - fs <3, >=2.2.0 ; extra == 'all' - lxml >=4.0 ; extra == 'all' @@ -1113,14 +1113,6 @@ packages: sha256: b32482794a366b5366a32c92a9a9201b107821889935a02b3e51f6b432ea84ed requires_dist: - six -- kind: pypi - name: grpcio - version: 1.62.1 - url: https://files.pythonhosted.org/packages/78/a9/eaa378e6fe421c2f61bdd4b92439b2b8bb320526f2b0e08fcf4e21c2f855/grpcio-1.62.1-cp311-cp311-win_amd64.whl - sha256: 5bd90b8c395f39bc82a5fb32a0173e220e3f401ff697840f4003e15b96d1befc - requires_dist: - - grpcio-tools >=1.62.1 ; extra == 'protobuf' - requires_python: '>=3.7' - kind: pypi name: grpcio version: 1.62.1 @@ -1138,13 +1130,13 @@ packages: - grpcio-tools >=1.62.1 ; extra == 'protobuf' requires_python: '>=3.7' - kind: pypi - name: h5py - version: 3.11.0 - url: https://files.pythonhosted.org/packages/d8/5e/b7b83cfe60504cc4d24746aed04353af7ea8ec104e597e5ae71b8d0390cb/h5py-3.11.0-cp311-cp311-win_amd64.whl - sha256: 083e0329ae534a264940d6513f47f5ada617da536d8dccbafc3026aefc33c90e + name: grpcio + version: 1.62.1 + url: https://files.pythonhosted.org/packages/78/a9/eaa378e6fe421c2f61bdd4b92439b2b8bb320526f2b0e08fcf4e21c2f855/grpcio-1.62.1-cp311-cp311-win_amd64.whl + sha256: 5bd90b8c395f39bc82a5fb32a0173e220e3f401ff697840f4003e15b96d1befc requires_dist: - - numpy >=1.17.3 - requires_python: '>=3.8' + - grpcio-tools >=1.62.1 ; extra == 'protobuf' + requires_python: '>=3.7' - kind: pypi name: h5py version: 3.11.0 @@ -1169,6 +1161,14 @@ packages: requires_dist: - numpy >=1.17.3 requires_python: '>=3.8' +- kind: pypi + name: h5py + version: 3.11.0 + url: https://files.pythonhosted.org/packages/d8/5e/b7b83cfe60504cc4d24746aed04353af7ea8ec104e597e5ae71b8d0390cb/h5py-3.11.0-cp311-cp311-win_amd64.whl + sha256: 083e0329ae534a264940d6513f47f5ada617da536d8dccbafc3026aefc33c90e + requires_dist: + - numpy >=1.17.3 + requires_python: '>=3.8' - kind: conda name: icu version: '73.2' @@ -1217,16 +1217,16 @@ packages: - kind: conda name: intel-openmp version: 2024.1.0 - build: h57928b3_964 - build_number: 964 + build: h57928b3_965 + build_number: 965 subdir: win-64 - url: https://conda.anaconda.org/conda-forge/win-64/intel-openmp-2024.1.0-h57928b3_964.conda - sha256: bea54e995cd79b0961ded5f0d6d1b8a55513283ccda74cedb3421a3764f7d679 - md5: 30ebb9fd99666d8b8675fcee541a09f3 + url: https://conda.anaconda.org/conda-forge/win-64/intel-openmp-2024.1.0-h57928b3_965.conda + sha256: 7b029e476ad6d401d645636ee3e4b40130bfcc9534f7415209dd5b666c6dd292 + md5: c66eb2fd33b999ccc258aef85689758e license: LicenseRef-ProprietaryIntel license_family: Proprietary - size: 1616281 - timestamp: 1712153179165 + size: 1617555 + timestamp: 1712943333029 - kind: pypi name: ipython version: 8.23.0 @@ -1280,10 +1280,10 @@ packages: requires_python: '>=3.10' - kind: pypi name: itsdangerous - version: 2.1.2 - url: https://files.pythonhosted.org/packages/68/5f/447e04e828f47465eeab35b5d408b7ebaaaee207f48b7136c5a7267a30ae/itsdangerous-2.1.2-py3-none-any.whl - sha256: 2c2349112351b88699d8d4b6b075022c0808887cb7ad10069318a8b0bc88db44 - requires_python: '>=3.7' + version: 2.2.0 + url: https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl + sha256: c6242fc49e35958c8b15141343aa660db5fc54d4f13a1db01a3f5891b98700ef + requires_python: '>=3.8' - kind: pypi name: jedi version: 0.19.1 @@ -1340,14 +1340,6 @@ packages: url: https://files.pythonhosted.org/packages/fe/58/34d4d8f1aa11120c2d36d7ad27d0526164b1a8ae45990a2fede31d0e59bf/keras-2.14.0-py3-none-any.whl sha256: d7429d1d2131cc7eb1f2ea2ec330227c7d9d38dab3dfdf2e78defee4ecc43fcd requires_python: '>=3.9' -- kind: pypi - name: kiwisolver - version: 1.4.5 - url: https://files.pythonhosted.org/packages/1e/37/d3c2d4ba2719059a0f12730947bbe1ad5ee8bff89e8c35319dcb2c9ddb4c/kiwisolver-1.4.5-cp311-cp311-win_amd64.whl - sha256: 6c08e1312a9cf1074d17b17728d3dfce2a5125b2d791527f33ffbe805200a355 - requires_dist: - - typing-extensions ; python_version < '3.8' - requires_python: '>=3.7' - kind: pypi name: kiwisolver version: 1.4.5 @@ -1372,6 +1364,14 @@ packages: requires_dist: - typing-extensions ; python_version < '3.8' requires_python: '>=3.7' +- kind: pypi + name: kiwisolver + version: 1.4.5 + url: https://files.pythonhosted.org/packages/1e/37/d3c2d4ba2719059a0f12730947bbe1ad5ee8bff89e8c35319dcb2c9ddb4c/kiwisolver-1.4.5-cp311-cp311-win_amd64.whl + sha256: 6c08e1312a9cf1074d17b17728d3dfce2a5125b2d791527f33ffbe805200a355 + requires_dist: + - typing-extensions ; python_version < '3.8' + requires_python: '>=3.7' - kind: conda name: ld_impl_linux-64 version: '2.40' @@ -1956,23 +1956,23 @@ packages: timestamp: 1706819107383 - kind: conda name: libhwloc - version: 2.9.3 - build: default_haede6df_1009 - build_number: 1009 + version: 2.10.0 + build: default_h2fffb23_1000 + build_number: 1000 subdir: win-64 - url: https://conda.anaconda.org/conda-forge/win-64/libhwloc-2.9.3-default_haede6df_1009.conda - sha256: 2e8c4bb7173f281a8e13f333a23c9fb7a1c86d342d7dccdd74f2eb583ddde450 - md5: 87da045f6d26ce9fe20ad76a18f6a18a + url: https://conda.anaconda.org/conda-forge/win-64/libhwloc-2.10.0-default_h2fffb23_1000.conda + sha256: e0d75da50e67a81e3cb37e2ee3b0d6ddc6543ec0f7b3828f884558552a1c4d93 + md5: ee944f0d41d9e2048f9d7492c1623ca3 depends: - - libxml2 >=2.11.5,<3.0.0a0 + - libxml2 >=2.12.6,<3.0a0 - pthreads-win32 - ucrt >=10.0.20348.0 - vc >=14.2,<15 - vc14_runtime >=14.29.30139 license: BSD-3-Clause license_family: BSD - size: 2578462 - timestamp: 1694533393675 + size: 2376728 + timestamp: 1711491473761 - kind: conda name: libiconv version: '1.17' @@ -2325,12 +2325,12 @@ packages: - kind: conda name: libxml2 version: 2.12.6 - build: h0d0cfa8_1 - build_number: 1 + build: h0d0cfa8_2 + build_number: 2 subdir: osx-arm64 - url: https://conda.anaconda.org/conda-forge/osx-arm64/libxml2-2.12.6-h0d0cfa8_1.conda - sha256: f18775ca8494ead5451d4acfc53fa7ebf7a8b5ed04c43bcc50fab847c9780cb3 - md5: c08526c957192192e1e7b4f622761144 + url: https://conda.anaconda.org/conda-forge/osx-arm64/libxml2-2.12.6-h0d0cfa8_2.conda + sha256: a5c10af641d6accf3effb3c3a3c594d931bb374f9e3e796719f3ecf769cfb0fc + md5: 27577d561de7659487b062c363d8a527 depends: - icu >=73.2,<74.0a0 - libiconv >=1.17,<2.0a0 @@ -2338,8 +2338,8 @@ packages: - xz >=5.2.6,<6.0a0 license: MIT license_family: MIT - size: 588539 - timestamp: 1711318256840 + size: 588638 + timestamp: 1713314780561 - kind: conda name: libxml2 version: 2.12.6 @@ -2362,12 +2362,12 @@ packages: - kind: conda name: libxml2 version: 2.12.6 - build: hc0ae0f7_1 - build_number: 1 + build: hc0ae0f7_2 + build_number: 2 subdir: osx-64 - url: https://conda.anaconda.org/conda-forge/osx-64/libxml2-2.12.6-hc0ae0f7_1.conda - sha256: 07a5dc7316d4c1ff3d924df6a76e6a13380d702fa5b3b1889e56d0672e5b8201 - md5: bd85e0ca9e1ffaadc3b56079fd956035 + url: https://conda.anaconda.org/conda-forge/osx-64/libxml2-2.12.6-hc0ae0f7_2.conda + sha256: 2598a525b1769338f96c3d4badad7d8b95c9ddcea86db3f9479a274803190e5c + md5: 50b997370584f2c83ca0c38e9028eab9 depends: - icu >=73.2,<74.0a0 - libiconv >=1.17,<2.0a0 @@ -2375,17 +2375,17 @@ packages: - xz >=5.2.6,<6.0a0 license: MIT license_family: MIT - size: 620164 - timestamp: 1711318305209 + size: 619622 + timestamp: 1713314870641 - kind: conda name: libxml2 version: 2.12.6 - build: hc3477c8_1 - build_number: 1 + build: hc3477c8_2 + build_number: 2 subdir: win-64 - url: https://conda.anaconda.org/conda-forge/win-64/libxml2-2.12.6-hc3477c8_1.conda - sha256: 1846c1318a5987e7315ca3648b55b38e5cfd9853370803a0f5159bc0071609c1 - md5: eb9f59dd51f50f5aa369813fa63ba569 + url: https://conda.anaconda.org/conda-forge/win-64/libxml2-2.12.6-hc3477c8_2.conda + sha256: 9a717cad6da52c84cfc490f7d52203c4cbc9e0e0389941fc6523273be5ccd17a + md5: ac7af7a949db01dae61ddc48f4a93d79 depends: - libiconv >=1.17,<2.0a0 - libzlib >=1.2.13,<1.3.0a0 @@ -2394,8 +2394,8 @@ packages: - vc14_runtime >=14.29.30139 license: MIT license_family: MIT - size: 1640801 - timestamp: 1711318467301 + size: 1589904 + timestamp: 1713315104803 - kind: conda name: libzlib version: 1.2.13 @@ -2507,12 +2507,6 @@ packages: - coverage ; extra == 'testing' - pyyaml ; extra == 'testing' requires_python: '>=3.8' -- kind: pypi - name: markupsafe - version: 2.1.5 - url: https://files.pythonhosted.org/packages/b7/a2/c78a06a9ec6d04b3445a949615c4c7ed86a0b2eb68e44e7541b9d57067cc/MarkupSafe-2.1.5-cp311-cp311-win_amd64.whl - sha256: 2b7c57a4dfc4f16f7142221afe5ba4e093e09e728ca65c51f5620c9aaeb9a617 - requires_python: '>=3.7' - kind: pypi name: markupsafe version: 2.1.5 @@ -2531,11 +2525,17 @@ packages: url: https://files.pythonhosted.org/packages/6b/cb/aed7a284c00dfa7c0682d14df85ad4955a350a21d2e3b06d8240497359bf/MarkupSafe-2.1.5-cp311-cp311-macosx_10_9_x86_64.whl sha256: 5b7b716f97b52c5a14bffdf688f971b2d5ef4029127f1ad7a513973cfd818df2 requires_python: '>=3.7' +- kind: pypi + name: markupsafe + version: 2.1.5 + url: https://files.pythonhosted.org/packages/b7/a2/c78a06a9ec6d04b3445a949615c4c7ed86a0b2eb68e44e7541b9d57067cc/MarkupSafe-2.1.5-cp311-cp311-win_amd64.whl + sha256: 2b7c57a4dfc4f16f7142221afe5ba4e093e09e728ca65c51f5620c9aaeb9a617 + requires_python: '>=3.7' - kind: pypi name: matplotlib version: 3.8.4 - url: https://files.pythonhosted.org/packages/2d/d5/6227732ecab9165586966ccb54301e3164f61b470c954c4cf6940654fbe1/matplotlib-3.8.4-cp311-cp311-win_amd64.whl - sha256: 8080d5081a86e690d7688ffa542532e87f224c38a6ed71f8fbed34dd1d9fedae + url: https://files.pythonhosted.org/packages/80/3b/e363612ac1a514abfb5505aa209dd5b724b3232a6de98710d7759559706a/matplotlib-3.8.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: cc4ccdc64e3039fc303defd119658148f2349239871db72cd74e2eeaa9b80b71 requires_dist: - contourpy >=1.0.1 - cycler >=0.10 @@ -2551,8 +2551,8 @@ packages: - kind: pypi name: matplotlib version: 3.8.4 - url: https://files.pythonhosted.org/packages/80/3b/e363612ac1a514abfb5505aa209dd5b724b3232a6de98710d7759559706a/matplotlib-3.8.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: cc4ccdc64e3039fc303defd119658148f2349239871db72cd74e2eeaa9b80b71 + url: https://files.pythonhosted.org/packages/14/60/12d4f27b859a74359306662da69c2d08826a2b05cfe7f96e66b490f41573/matplotlib-3.8.4-cp311-cp311-macosx_11_0_arm64.whl + sha256: 232ce322bfd020a434caaffbd9a95333f7c2491e59cfc014041d95e38ab90d1c requires_dist: - contourpy >=1.0.1 - cycler >=0.10 @@ -2568,8 +2568,8 @@ packages: - kind: pypi name: matplotlib version: 3.8.4 - url: https://files.pythonhosted.org/packages/14/60/12d4f27b859a74359306662da69c2d08826a2b05cfe7f96e66b490f41573/matplotlib-3.8.4-cp311-cp311-macosx_11_0_arm64.whl - sha256: 232ce322bfd020a434caaffbd9a95333f7c2491e59cfc014041d95e38ab90d1c + url: https://files.pythonhosted.org/packages/36/11/62250ea25780d4b59c2c6044ec161235c47cc05a18d0ec0a05657de75b7d/matplotlib-3.8.4-cp311-cp311-macosx_10_12_x86_64.whl + sha256: 72f9322712e4562e792b2961971891b9fbbb0e525011e09ea0d1f416c4645661 requires_dist: - contourpy >=1.0.1 - cycler >=0.10 @@ -2585,8 +2585,8 @@ packages: - kind: pypi name: matplotlib version: 3.8.4 - url: https://files.pythonhosted.org/packages/36/11/62250ea25780d4b59c2c6044ec161235c47cc05a18d0ec0a05657de75b7d/matplotlib-3.8.4-cp311-cp311-macosx_10_12_x86_64.whl - sha256: 72f9322712e4562e792b2961971891b9fbbb0e525011e09ea0d1f416c4645661 + url: https://files.pythonhosted.org/packages/2d/d5/6227732ecab9165586966ccb54301e3164f61b470c954c4cf6940654fbe1/matplotlib-3.8.4-cp311-cp311-win_amd64.whl + sha256: 8080d5081a86e690d7688ffa542532e87f224c38a6ed71f8fbed34dd1d9fedae requires_dist: - contourpy >=1.0.1 - cycler >=0.10 @@ -2601,12 +2601,12 @@ packages: requires_python: '>=3.9' - kind: pypi name: matplotlib-inline - version: 0.1.6 - url: https://files.pythonhosted.org/packages/f2/51/c34d7a1d528efaae3d8ddb18ef45a41f284eacf9e514523b191b7d0872cc/matplotlib_inline-0.1.6-py3-none-any.whl - sha256: f1f41aab5328aa5aaea9b16d083b128102f8712542f819fe7e6a420ff581b311 + version: 0.1.7 + url: https://files.pythonhosted.org/packages/8f/8e/9ad090d3553c280a8060fbf6e24dc1c0c29704ee7d1c372f0c174aa59285/matplotlib_inline-0.1.7-py3-none-any.whl + sha256: df192d39a4ff8f21b1895d72e6a13f5fcc5099f00fa84384e0ea28c2cc0653ca requires_dist: - traitlets - requires_python: '>=3.5' + requires_python: '>=3.8' - kind: conda name: mkl version: 2024.1.0 @@ -2626,8 +2626,8 @@ packages: - kind: pypi name: ml-dtypes version: 0.2.0 - url: https://files.pythonhosted.org/packages/08/89/c727fde1a3d12586e0b8c01abf53754707d76beaa9987640e70807d4545f/ml_dtypes-0.2.0-cp311-cp311-win_amd64.whl - sha256: 832a019a1b6db5c4422032ca9940a990fa104eee420f643713241b3a518977fa + url: https://files.pythonhosted.org/packages/87/91/d57c2d22e4801edeb7f3e7939214c0ea8a28c6e16f85208c2df2145e0213/ml_dtypes-0.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: e85ba8e24cf48d456e564688e981cf379d4c8e644db0a2f719b78de281bac2ca requires_dist: - numpy >1.20 - numpy >=1.23.3 ; python_version > '3.10' @@ -2641,8 +2641,8 @@ packages: - kind: pypi name: ml-dtypes version: 0.2.0 - url: https://files.pythonhosted.org/packages/87/91/d57c2d22e4801edeb7f3e7939214c0ea8a28c6e16f85208c2df2145e0213/ml_dtypes-0.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: e85ba8e24cf48d456e564688e981cf379d4c8e644db0a2f719b78de281bac2ca + url: https://files.pythonhosted.org/packages/15/da/43bee505963da0c730ee50e951c604bfdb90d4cccc9c0044c946b10e68a7/ml_dtypes-0.2.0-cp311-cp311-macosx_10_9_universal2.whl + sha256: e70047ec2c83eaee01afdfdabee2c5b0c133804d90d0f7db4dd903360fcc537c requires_dist: - numpy >1.20 - numpy >=1.23.3 ; python_version > '3.10' @@ -2656,8 +2656,8 @@ packages: - kind: pypi name: ml-dtypes version: 0.2.0 - url: https://files.pythonhosted.org/packages/15/da/43bee505963da0c730ee50e951c604bfdb90d4cccc9c0044c946b10e68a7/ml_dtypes-0.2.0-cp311-cp311-macosx_10_9_universal2.whl - sha256: e70047ec2c83eaee01afdfdabee2c5b0c133804d90d0f7db4dd903360fcc537c + url: https://files.pythonhosted.org/packages/08/89/c727fde1a3d12586e0b8c01abf53754707d76beaa9987640e70807d4545f/ml_dtypes-0.2.0-cp311-cp311-win_amd64.whl + sha256: 832a019a1b6db5c4422032ca9940a990fa104eee420f643713241b3a518977fa requires_dist: - numpy >1.20 - numpy >=1.23.3 ; python_version > '3.10' @@ -2912,8 +2912,8 @@ packages: - kind: pypi name: pandas version: 2.2.2 - url: https://files.pythonhosted.org/packages/ab/63/966db1321a0ad55df1d1fe51505d2cdae191b84c907974873817b0a6e849/pandas-2.2.2-cp311-cp311-win_amd64.whl - sha256: 873d13d177501a28b2756375d59816c365e42ed8417b41665f346289adc68d24 + url: https://files.pythonhosted.org/packages/fc/a5/4d82be566f069d7a9a702dcdf6f9106df0e0b042e738043c0cc7ddd7e3f6/pandas-2.2.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: 6d2123dc9ad6a814bcdea0f099885276b31b24f7edf40f6cdbc0912672e22eee requires_dist: - numpy >=1.22.4 ; python_version < '3.11' - numpy >=1.23.2 ; python_version == '3.11' @@ -3004,8 +3004,8 @@ packages: - kind: pypi name: pandas version: 2.2.2 - url: https://files.pythonhosted.org/packages/fc/a5/4d82be566f069d7a9a702dcdf6f9106df0e0b042e738043c0cc7ddd7e3f6/pandas-2.2.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: 6d2123dc9ad6a814bcdea0f099885276b31b24f7edf40f6cdbc0912672e22eee + url: https://files.pythonhosted.org/packages/16/c6/75231fd47afd6b3f89011e7077f1a3958441264aca7ae9ff596e3276a5d0/pandas-2.2.2-cp311-cp311-macosx_11_0_arm64.whl + sha256: 8e90497254aacacbc4ea6ae5e7a8cd75629d6ad2b30025a4a8b09aa4faf55151 requires_dist: - numpy >=1.22.4 ; python_version < '3.11' - numpy >=1.23.2 ; python_version == '3.11' @@ -3096,8 +3096,8 @@ packages: - kind: pypi name: pandas version: 2.2.2 - url: https://files.pythonhosted.org/packages/16/c6/75231fd47afd6b3f89011e7077f1a3958441264aca7ae9ff596e3276a5d0/pandas-2.2.2-cp311-cp311-macosx_11_0_arm64.whl - sha256: 8e90497254aacacbc4ea6ae5e7a8cd75629d6ad2b30025a4a8b09aa4faf55151 + url: https://files.pythonhosted.org/packages/1b/70/61704497903d43043e288017cb2b82155c0d41e15f5c17807920877b45c2/pandas-2.2.2-cp311-cp311-macosx_10_9_x86_64.whl + sha256: 696039430f7a562b74fa45f540aca068ea85fa34c244d0deee539cb6d70aa288 requires_dist: - numpy >=1.22.4 ; python_version < '3.11' - numpy >=1.23.2 ; python_version == '3.11' @@ -3188,8 +3188,8 @@ packages: - kind: pypi name: pandas version: 2.2.2 - url: https://files.pythonhosted.org/packages/1b/70/61704497903d43043e288017cb2b82155c0d41e15f5c17807920877b45c2/pandas-2.2.2-cp311-cp311-macosx_10_9_x86_64.whl - sha256: 696039430f7a562b74fa45f540aca068ea85fa34c244d0deee539cb6d70aa288 + url: https://files.pythonhosted.org/packages/ab/63/966db1321a0ad55df1d1fe51505d2cdae191b84c907974873817b0a6e849/pandas-2.2.2-cp311-cp311-win_amd64.whl + sha256: 873d13d177501a28b2756375d59816c365e42ed8417b41665f346289adc68d24 requires_dist: - numpy >=1.22.4 ; python_version < '3.11' - numpy >=1.23.2 ; python_version == '3.11' @@ -3305,8 +3305,8 @@ packages: - kind: pypi name: pillow version: 10.3.0 - url: https://files.pythonhosted.org/packages/0a/16/c83877524c47976f16703d2e05c363244bc1e60ab439e078b3cd046d07db/pillow-10.3.0-cp311-cp311-win_amd64.whl - sha256: 8eb0908e954d093b02a543dc963984d6e99ad2b5e36503d8a0aaf040505f747d + url: https://files.pythonhosted.org/packages/77/cd/5205fb43a6000d424291b0525b8201004700d9a34e034517ac4dfdc6eed5/pillow-10.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: 9797a6c8fe16f25749b371c02e2ade0efb51155e767a971c61734b1bf6293994 requires_dist: - furo ; extra == 'docs' - olefile ; extra == 'docs' @@ -3333,8 +3333,8 @@ packages: - kind: pypi name: pillow version: 10.3.0 - url: https://files.pythonhosted.org/packages/77/cd/5205fb43a6000d424291b0525b8201004700d9a34e034517ac4dfdc6eed5/pillow-10.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: 9797a6c8fe16f25749b371c02e2ade0efb51155e767a971c61734b1bf6293994 + url: https://files.pythonhosted.org/packages/00/5c/7633f291def20082bad31b844fe5ed07742aae8504e4cfe2f331ee727178/pillow-10.3.0-cp311-cp311-macosx_11_0_arm64.whl + sha256: e4b878386c4bf293578b48fc570b84ecfe477d3b77ba39a6e87150af77f40c57 requires_dist: - furo ; extra == 'docs' - olefile ; extra == 'docs' @@ -3361,8 +3361,8 @@ packages: - kind: pypi name: pillow version: 10.3.0 - url: https://files.pythonhosted.org/packages/00/5c/7633f291def20082bad31b844fe5ed07742aae8504e4cfe2f331ee727178/pillow-10.3.0-cp311-cp311-macosx_11_0_arm64.whl - sha256: e4b878386c4bf293578b48fc570b84ecfe477d3b77ba39a6e87150af77f40c57 + url: https://files.pythonhosted.org/packages/e5/51/e4b35e394b4e5ca24983e50361a1db3d7da05b1758074f9c4f5b4be4b22a/pillow-10.3.0-cp311-cp311-macosx_10_10_x86_64.whl + sha256: 5f77cf66e96ae734717d341c145c5949c63180842a545c47a0ce7ae52ca83795 requires_dist: - furo ; extra == 'docs' - olefile ; extra == 'docs' @@ -3389,8 +3389,8 @@ packages: - kind: pypi name: pillow version: 10.3.0 - url: https://files.pythonhosted.org/packages/e5/51/e4b35e394b4e5ca24983e50361a1db3d7da05b1758074f9c4f5b4be4b22a/pillow-10.3.0-cp311-cp311-macosx_10_10_x86_64.whl - sha256: 5f77cf66e96ae734717d341c145c5949c63180842a545c47a0ce7ae52ca83795 + url: https://files.pythonhosted.org/packages/0a/16/c83877524c47976f16703d2e05c363244bc1e60ab439e078b3cd046d07db/pillow-10.3.0-cp311-cp311-win_amd64.whl + sha256: 8eb0908e954d093b02a543dc963984d6e99ad2b5e36503d8a0aaf040505f747d requires_dist: - furo ; extra == 'docs' - olefile ; extra == 'docs' @@ -3460,12 +3460,6 @@ packages: requires_dist: - wcwidth requires_python: '>=3.7.0' -- kind: pypi - name: protobuf - version: 4.25.3 - url: https://files.pythonhosted.org/packages/ad/6e/1bed3b7c904cc178cb8ee8dbaf72934964452b3de95b7a63412591edb93c/protobuf-4.25.3-cp310-abi3-win_amd64.whl - sha256: 209ba4cc916bab46f64e56b85b090607a676f66b473e6b762e6f1d9d591eb2e8 - requires_python: '>=3.8' - kind: pypi name: protobuf version: 4.25.3 @@ -3478,6 +3472,12 @@ packages: url: https://files.pythonhosted.org/packages/f3/bf/26deba06a4c910a85f78245cac7698f67cedd7efe00d04f6b3e1b3506a59/protobuf-4.25.3-cp37-abi3-macosx_10_9_universal2.whl sha256: f1279ab38ecbfae7e456a108c5c0681e4956d5b1090027c1de0f934dfdb4b35c requires_python: '>=3.8' +- kind: pypi + name: protobuf + version: 4.25.3 + url: https://files.pythonhosted.org/packages/ad/6e/1bed3b7c904cc178cb8ee8dbaf72934964452b3de95b7a63412591edb93c/protobuf-4.25.3-cp310-abi3-win_amd64.whl + sha256: 209ba4cc916bab46f64e56b85b090607a676f66b473e6b762e6f1d9d591eb2e8 + requires_python: '>=3.8' - kind: conda name: pthreads-win32 version: 2.9.1 @@ -3521,8 +3521,8 @@ packages: - kind: pypi name: pyboy version: 1.6.6 - url: https://files.pythonhosted.org/packages/66/e7/1c223e5e749fe568a0c8e24def8e0004da1fbc48e3f4cabb449ee655deaa/pyboy-1.6.6-cp311-cp311-win_amd64.whl - sha256: bc10363e3b83330c1bb19fc9a16590a6308f94f37df12b0db93ff1c164c1a43c + url: https://files.pythonhosted.org/packages/b8/50/7425532d3e3ea4107a095617c16484b88f507fd77f172ce90bab366d32c6/pyboy-1.6.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl + sha256: 4e60e8faf92836c91123529dcbb1daf5d686d16d8bc23009d4d69db722bdeae6 requires_dist: - numpy - pysdl2 @@ -3535,8 +3535,8 @@ packages: - kind: pypi name: pyboy version: 1.6.6 - url: https://files.pythonhosted.org/packages/b8/50/7425532d3e3ea4107a095617c16484b88f507fd77f172ce90bab366d32c6/pyboy-1.6.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl - sha256: 4e60e8faf92836c91123529dcbb1daf5d686d16d8bc23009d4d69db722bdeae6 + url: https://files.pythonhosted.org/packages/57/0f/85fbc988095c614ebec2ea471dac5fc777bd9083e235cbcc45cea4275c06/pyboy-1.6.6-cp311-cp311-macosx_10_9_universal2.whl + sha256: 14c56a005c8272b4e9e956ab6e6f3c8855a2fab5732d2367dd84c08460367c2c requires_dist: - numpy - pysdl2 @@ -3549,8 +3549,8 @@ packages: - kind: pypi name: pyboy version: 1.6.6 - url: https://files.pythonhosted.org/packages/57/0f/85fbc988095c614ebec2ea471dac5fc777bd9083e235cbcc45cea4275c06/pyboy-1.6.6-cp311-cp311-macosx_10_9_universal2.whl - sha256: 14c56a005c8272b4e9e956ab6e6f3c8855a2fab5732d2367dd84c08460367c2c + url: https://files.pythonhosted.org/packages/66/e7/1c223e5e749fe568a0c8e24def8e0004da1fbc48e3f4cabb449ee655deaa/pyboy-1.6.6-cp311-cp311-win_amd64.whl + sha256: bc10363e3b83330c1bb19fc9a16590a6308f94f37df12b0db93ff1c164c1a43c requires_dist: - numpy - pysdl2 @@ -3593,11 +3593,6 @@ packages: version: 0.9.16 url: https://files.pythonhosted.org/packages/63/ae/f40e4c4738fb39ce140950ed7d9bc21358826416d91a5426a190c612f789/PySDL2-0.9.16.tar.gz sha256: 1027406badbecdd30fe56e800a5a76ad7d7271a3aec0b7acf780ee26a00f2d40 -- kind: pypi - name: pysdl2-dll - version: 2.30.2 - url: https://files.pythonhosted.org/packages/b0/e0/96b1d1ea651de40e84b72a515171d9a75a5b298c8059b2807de50f579b85/pysdl2_dll-2.30.2-py2.py3-none-win_amd64.whl - sha256: 1f243b9bd3f48a782f9feec26c261b0ae5ffbc3aa78756c5853e992fa5e7dfcf - kind: pypi name: pysdl2-dll version: 2.30.2 @@ -3613,6 +3608,11 @@ packages: version: 2.30.2 url: https://files.pythonhosted.org/packages/8a/28/7a07e09431bfe29d0506606ec1e5ac11abff6581139800017c8b54c0cc57/pysdl2_dll-2.30.2-py2.py3-none-macosx_10_11_x86_64.whl sha256: 890233f56f544d3f08c9a6cc1ca1d1ce9e2621983baaff74a949a93dc311ed9f +- kind: pypi + name: pysdl2-dll + version: 2.30.2 + url: https://files.pythonhosted.org/packages/b0/e0/96b1d1ea651de40e84b72a515171d9a75a5b298c8059b2807de50f579b85/pysdl2_dll-2.30.2-py2.py3-none-win_amd64.whl + sha256: 1f243b9bd3f48a782f9feec26c261b0ae5ffbc3aa78756c5853e992fa5e7dfcf - kind: conda name: python version: 3.11.8 @@ -3985,12 +3985,11 @@ packages: timestamp: 1700814198750 - kind: pypi name: setuptools - version: 69.2.0 - url: https://files.pythonhosted.org/packages/92/e1/1c8bb3420105e70bdf357d57dd5567202b4ef8d27f810e98bb962d950834/setuptools-69.2.0-py3-none-any.whl - sha256: c21c49fb1042386df081cb5d86759792ab89efca84cf114889191cd09aacc80c + version: 69.5.1 + url: https://files.pythonhosted.org/packages/f7/29/13965af254e3373bceae8fb9a0e6ea0d0e571171b80d6646932131d6439b/setuptools-69.5.1-py3-none-any.whl + sha256: c636ac361bc47580504644275c9ad802c50415c7522212252c033bd15f301f32 requires_dist: - sphinx >=3.5 ; extra == 'docs' - - sphinx <7.2.5 ; extra == 'docs' - jaraco-packaging >=9.3 ; extra == 'docs' - rst-linker >=1.9 ; extra == 'docs' - furo ; extra == 'docs' @@ -4002,8 +4001,9 @@ packages: - sphinx-reredirects ; extra == 'docs' - sphinxcontrib-towncrier ; extra == 'docs' - sphinx-notfound-page <2, >=1 ; extra == 'docs' - - pytest >=6 ; extra == 'testing' + - pytest !=8.1.1, >=6 ; extra == 'testing' - pytest-checkdocs >=2.4 ; extra == 'testing' + - pytest-mypy ; extra == 'testing' - pytest-enabler >=2.2 ; extra == 'testing' - virtualenv >=13.0.0 ; extra == 'testing' - wheel ; extra == 'testing' @@ -4033,7 +4033,6 @@ packages: - filelock >=3.4.0 ; extra == 'testing-integration' - packaging >=23.2 ; extra == 'testing-integration' - pytest-cov ; platform_python_implementation != 'PyPy' and extra == 'testing' - - pytest-mypy >=0.9.1 ; platform_python_implementation != 'PyPy' and extra == 'testing' - jaraco-develop >=7.21 ; (python_version >= '3.9' and sys_platform != 'cygwin') and extra == 'testing' - pytest-ruff >=0.2.1 ; sys_platform != 'cygwin' and extra == 'testing' - pytest-perf ; sys_platform != 'cygwin' and extra == 'testing' @@ -4060,22 +4059,21 @@ packages: - cython ; extra == 'tests' - kind: conda name: tbb - version: 2021.11.0 - build: h91493d7_1 - build_number: 1 + version: 2021.12.0 + build: h91493d7_0 subdir: win-64 - url: https://conda.anaconda.org/conda-forge/win-64/tbb-2021.11.0-h91493d7_1.conda - sha256: aa30c089fdd6f66c7808592362e29963586e094159964a5fb61fb8efa9e349bc - md5: 21069f3ed16812f9f4f2700667b6ec86 + url: https://conda.anaconda.org/conda-forge/win-64/tbb-2021.12.0-h91493d7_0.conda + sha256: 621926aae93513408bdca3dd21c97e2aa8ba7dcd2c400dab804fb0ce7da1387b + md5: 21745fdd12f01b41178596143cbecffd depends: - - libhwloc >=2.9.3,<2.9.4.0a0 + - libhwloc >=2.10.0,<2.10.1.0a0 - ucrt >=10.0.20348.0 - vc >=14.2,<15 - vc14_runtime >=14.29.30139 license: Apache-2.0 license_family: APACHE - size: 161382 - timestamp: 1706164225098 + size: 161618 + timestamp: 1712960215111 - kind: pypi name: tenacity version: 8.2.3 @@ -4117,27 +4115,6 @@ packages: url: https://files.pythonhosted.org/packages/b7/85/dabeaf902892922777492e1d253bb7e1264cadce3cea932f7ff599e53fea/tensorboard_data_server-0.7.2-py3-none-macosx_10_9_x86_64.whl sha256: 9fe5d24221b29625dbc7328b0436ca7fc1c23de4acf4d272f1180856e32f9f60 requires_python: '>=3.7' -- kind: pypi - name: tensorflow - version: 2.14.0 - url: https://files.pythonhosted.org/packages/80/6f/57d36f6507e432d7fc1956b2e9e8530c5c2d2bfcd8821bcbfae271cd6688/tensorflow-2.14.0-cp311-cp311-win_amd64.whl - sha256: 0587ece626c4f7c4fcb2132525ea6c77ad2f2f5659a9b0f4451b1000be1b5e16 - requires_dist: - - tensorflow-macos ==2.14.0 ; platform_system == 'Darwin' and platform_machine == 'arm64' - - tensorflow-cpu-aws ==2.14.0 ; platform_system == 'Linux' and (platform_machine == 'arm64' or platform_machine == 'aarch64') - - tensorflow-intel ==2.14.0 ; platform_system == 'Windows' - - nvidia-cublas-cu11 ==11.11.3.6 ; extra == 'and-cuda' - - nvidia-cuda-cupti-cu11 ==11.8.87 ; extra == 'and-cuda' - - nvidia-cuda-nvcc-cu11 ==11.8.89 ; extra == 'and-cuda' - - nvidia-cuda-runtime-cu11 ==11.8.89 ; extra == 'and-cuda' - - nvidia-cudnn-cu11 ==8.7.0.84 ; extra == 'and-cuda' - - nvidia-cufft-cu11 ==10.9.0.58 ; extra == 'and-cuda' - - nvidia-curand-cu11 ==10.3.0.86 ; extra == 'and-cuda' - - nvidia-cusolver-cu11 ==11.4.1.48 ; extra == 'and-cuda' - - nvidia-cusparse-cu11 ==11.7.5.86 ; extra == 'and-cuda' - - nvidia-nccl-cu11 ==2.16.5 ; extra == 'and-cuda' - - tensorrt ==8.5.3.1 ; extra == 'and-cuda' - requires_python: '>=3.9' - kind: pypi name: tensorflow version: 2.14.0 @@ -4241,6 +4218,27 @@ packages: - nvidia-cuda-nvcc-cu11 ==11.8.89 ; extra == 'and-cuda' - tensorrt ==8.5.3.1 ; extra == 'and-cuda' requires_python: '>=3.9' +- kind: pypi + name: tensorflow + version: 2.14.0 + url: https://files.pythonhosted.org/packages/80/6f/57d36f6507e432d7fc1956b2e9e8530c5c2d2bfcd8821bcbfae271cd6688/tensorflow-2.14.0-cp311-cp311-win_amd64.whl + sha256: 0587ece626c4f7c4fcb2132525ea6c77ad2f2f5659a9b0f4451b1000be1b5e16 + requires_dist: + - tensorflow-macos ==2.14.0 ; platform_system == 'Darwin' and platform_machine == 'arm64' + - tensorflow-cpu-aws ==2.14.0 ; platform_system == 'Linux' and (platform_machine == 'arm64' or platform_machine == 'aarch64') + - tensorflow-intel ==2.14.0 ; platform_system == 'Windows' + - nvidia-cublas-cu11 ==11.11.3.6 ; extra == 'and-cuda' + - nvidia-cuda-cupti-cu11 ==11.8.87 ; extra == 'and-cuda' + - nvidia-cuda-nvcc-cu11 ==11.8.89 ; extra == 'and-cuda' + - nvidia-cuda-runtime-cu11 ==11.8.89 ; extra == 'and-cuda' + - nvidia-cudnn-cu11 ==8.7.0.84 ; extra == 'and-cuda' + - nvidia-cufft-cu11 ==10.9.0.58 ; extra == 'and-cuda' + - nvidia-curand-cu11 ==10.3.0.86 ; extra == 'and-cuda' + - nvidia-cusolver-cu11 ==11.4.1.48 ; extra == 'and-cuda' + - nvidia-cusparse-cu11 ==11.7.5.86 ; extra == 'and-cuda' + - nvidia-nccl-cu11 ==2.16.5 ; extra == 'and-cuda' + - tensorrt ==8.5.3.1 ; extra == 'and-cuda' + requires_python: '>=3.9' - kind: pypi name: tensorflow-estimator version: 2.14.0 @@ -4587,12 +4585,6 @@ packages: - pytest >=6.0.0 ; extra == 'test' - setuptools >=65 ; extra == 'test' requires_python: '>=3.8' -- kind: pypi - name: wrapt - version: 1.14.1 - url: https://files.pythonhosted.org/packages/ba/7e/14113996bc6ee68eb987773b4139c87afd3ceff60e27e37648aa5eb2798a/wrapt-1.14.1-cp311-cp311-win_amd64.whl - sha256: 26046cd03936ae745a502abf44dac702a5e6880b2b01c29aea8ddf3353b68224 - requires_python: '!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7' - kind: pypi name: wrapt version: 1.14.1 @@ -4611,6 +4603,12 @@ packages: url: https://files.pythonhosted.org/packages/e7/f9/8c078b4973604cd968b23eb3dff52028b5c48f2a02c4f1f975f4d5e344d1/wrapt-1.14.1-cp311-cp311-macosx_10_9_x86_64.whl sha256: ecee4132c6cd2ce5308e21672015ddfed1ff975ad0ac8d27168ea82e71413f55 requires_python: '!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7' +- kind: pypi + name: wrapt + version: 1.14.1 + url: https://files.pythonhosted.org/packages/ba/7e/14113996bc6ee68eb987773b4139c87afd3ceff60e27e37648aa5eb2798a/wrapt-1.14.1-cp311-cp311-win_amd64.whl + sha256: 26046cd03936ae745a502abf44dac702a5e6880b2b01c29aea8ddf3353b68224 + requires_python: '!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7' - kind: conda name: xz version: 5.2.6 diff --git a/pixi.lock b/pixi.lock index 9e3d89a0a..a590461e8 100644 --- a/pixi.lock +++ b/pixi.lock @@ -91,8 +91,8 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.18.6-py312h98912ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml.clib-0.2.8-py312h98912ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/rust-1.76.0-h70c747d_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-unknown-linux-gnu-1.76.0-h2c6d0dc_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/rust-1.77.2-h70c747d_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-unknown-linux-gnu-1.77.2-h2c6d0dc_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/schema-0.7.5-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/setuptools-69.2.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2 @@ -167,8 +167,8 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/ruamel.yaml-0.18.6-py312h41838bb_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/ruamel.yaml.clib-0.2.8-py312h41838bb_0.conda - - conda: https://conda.anaconda.org/conda-forge/osx-64/rust-1.76.0-h7e1429e_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-apple-darwin-1.76.0-h38e4360_0.conda + - conda: https://conda.anaconda.org/conda-forge/osx-64/rust-1.77.2-h7e1429e_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-apple-darwin-1.77.2-h38e4360_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/schema-0.7.5-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/setuptools-69.2.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2 @@ -243,8 +243,8 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/ruamel.yaml-0.18.6-py312he37b823_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/ruamel.yaml.clib-0.2.8-py312he37b823_0.conda - - conda: https://conda.anaconda.org/conda-forge/osx-arm64/rust-1.76.0-h4ff7c5d_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-aarch64-apple-darwin-1.76.0-hf6ec828_0.conda + - conda: https://conda.anaconda.org/conda-forge/osx-arm64/rust-1.77.2-h4ff7c5d_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-aarch64-apple-darwin-1.77.2-hf6ec828_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/schema-0.7.5-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/setuptools-69.2.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2 @@ -306,8 +306,8 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/ruamel.yaml-0.18.6-py312he70551f_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/ruamel.yaml.clib-0.2.8-py312he70551f_0.conda - - conda: https://conda.anaconda.org/conda-forge/win-64/rust-1.76.0-hf8d6059_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-pc-windows-msvc-1.76.0-h17fc481_0.conda + - conda: https://conda.anaconda.org/conda-forge/win-64/rust-1.77.2-hf8d6059_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-pc-windows-msvc-1.77.2-h17fc481_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/schema-0.7.5-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/setuptools-69.2.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2 @@ -471,8 +471,8 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.18.6-py312h98912ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml.clib-0.2.8-py312h98912ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/rust-1.76.0-h70c747d_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-unknown-linux-gnu-1.76.0-h2c6d0dc_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/rust-1.77.2-h70c747d_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-unknown-linux-gnu-1.77.2-h2c6d0dc_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/schema-0.7.5-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/setuptools-69.2.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2 @@ -617,8 +617,8 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/ruamel.yaml-0.18.6-py312h41838bb_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/ruamel.yaml.clib-0.2.8-py312h41838bb_0.conda - - conda: https://conda.anaconda.org/conda-forge/osx-64/rust-1.76.0-h7e1429e_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-apple-darwin-1.76.0-h38e4360_0.conda + - conda: https://conda.anaconda.org/conda-forge/osx-64/rust-1.77.2-h7e1429e_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-apple-darwin-1.77.2-h38e4360_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/schema-0.7.5-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/setuptools-69.2.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2 @@ -753,8 +753,8 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/ruamel.yaml-0.18.6-py312he37b823_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/ruamel.yaml.clib-0.2.8-py312he37b823_0.conda - - conda: https://conda.anaconda.org/conda-forge/osx-arm64/rust-1.76.0-h4ff7c5d_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-aarch64-apple-darwin-1.76.0-hf6ec828_0.conda + - conda: https://conda.anaconda.org/conda-forge/osx-arm64/rust-1.77.2-h4ff7c5d_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-aarch64-apple-darwin-1.77.2-hf6ec828_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/schema-0.7.5-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/setuptools-69.2.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2 @@ -882,8 +882,8 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/ruamel.yaml-0.18.6-py312he70551f_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/ruamel.yaml.clib-0.2.8-py312he70551f_0.conda - - conda: https://conda.anaconda.org/conda-forge/win-64/rust-1.76.0-hf8d6059_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-pc-windows-msvc-1.76.0-h17fc481_0.conda + - conda: https://conda.anaconda.org/conda-forge/win-64/rust-1.77.2-hf8d6059_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-pc-windows-msvc-1.77.2-h17fc481_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/schema-0.7.5-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/setuptools-69.2.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2 @@ -1013,8 +1013,8 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.18.6-py312h98912ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml.clib-0.2.8-py312h98912ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/rust-1.76.0-h70c747d_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-unknown-linux-gnu-1.76.0-h2c6d0dc_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/rust-1.77.2-h70c747d_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-unknown-linux-gnu-1.77.2-h2c6d0dc_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/schema-0.7.5-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/setuptools-69.2.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2 @@ -1100,8 +1100,8 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/ruamel.yaml-0.18.6-py312h41838bb_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/ruamel.yaml.clib-0.2.8-py312h41838bb_0.conda - - conda: https://conda.anaconda.org/conda-forge/osx-64/rust-1.76.0-h7e1429e_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-apple-darwin-1.76.0-h38e4360_0.conda + - conda: https://conda.anaconda.org/conda-forge/osx-64/rust-1.77.2-h7e1429e_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-apple-darwin-1.77.2-h38e4360_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/schema-0.7.5-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/setuptools-69.2.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2 @@ -1187,8 +1187,8 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/ruamel.yaml-0.18.6-py312he37b823_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/ruamel.yaml.clib-0.2.8-py312he37b823_0.conda - - conda: https://conda.anaconda.org/conda-forge/osx-arm64/rust-1.76.0-h4ff7c5d_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-aarch64-apple-darwin-1.76.0-hf6ec828_0.conda + - conda: https://conda.anaconda.org/conda-forge/osx-arm64/rust-1.77.2-h4ff7c5d_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-aarch64-apple-darwin-1.77.2-hf6ec828_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/schema-0.7.5-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/setuptools-69.2.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2 @@ -1261,8 +1261,8 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/ruamel.yaml-0.18.6-py312he70551f_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/ruamel.yaml.clib-0.2.8-py312he70551f_0.conda - - conda: https://conda.anaconda.org/conda-forge/win-64/rust-1.76.0-hf8d6059_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-pc-windows-msvc-1.76.0-h17fc481_0.conda + - conda: https://conda.anaconda.org/conda-forge/win-64/rust-1.77.2-hf8d6059_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-pc-windows-msvc-1.77.2-h17fc481_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/schema-0.7.5-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/setuptools-69.2.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2 @@ -6203,131 +6203,131 @@ packages: timestamp: 1707315306489 - kind: conda name: rust - version: 1.76.0 + version: 1.77.2 build: h4ff7c5d_0 subdir: osx-arm64 - url: https://conda.anaconda.org/conda-forge/osx-arm64/rust-1.76.0-h4ff7c5d_0.conda - sha256: dc10bd033d5f7de40c39d62a3ec084117396fd7cae6c25bb20f087b119c08bd9 - md5: 015ddfe83f6971fb9d25da68032fafc7 + url: https://conda.anaconda.org/conda-forge/osx-arm64/rust-1.77.2-h4ff7c5d_0.conda + sha256: 048ffabbbbd1b5109d59ec15610cf0e489c39b4f6f380953816bcb26dad8da17 + md5: 4083c1a9d7f5c9591273f578530d6388 depends: - - rust-std-aarch64-apple-darwin 1.76.0 hf6ec828_0 + - rust-std-aarch64-apple-darwin 1.77.2 hf6ec828_0 license: MIT license_family: MIT - size: 146506818 - timestamp: 1707422528708 + size: 145759919 + timestamp: 1712743398771 - kind: conda name: rust - version: 1.76.0 + version: 1.77.2 build: h70c747d_0 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/rust-1.76.0-h70c747d_0.conda - sha256: 7d2e7821520862b3ac5829677de1c18a91a50621fae86122c709cc219e753040 - md5: 4ff9e2eff880011bcb18d3274aa44f96 + url: https://conda.anaconda.org/conda-forge/linux-64/rust-1.77.2-h70c747d_0.conda + sha256: 3b8cf09335d23c52d6e7150e4cc6d999ed4e2b3dc2307652f20e1a4669ff0846 + md5: ba764892e80fe0380bb7fa99751b186d depends: - gcc_impl_linux-64 - libgcc-ng >=12 - libzlib >=1.2.13,<1.3.0a0 - - rust-std-x86_64-unknown-linux-gnu 1.76.0 h2c6d0dc_0 + - rust-std-x86_64-unknown-linux-gnu 1.77.2 h2c6d0dc_0 license: MIT license_family: MIT - size: 189872921 - timestamp: 1707423016244 + size: 186765686 + timestamp: 1712741423714 - kind: conda name: rust - version: 1.76.0 + version: 1.77.2 build: h7e1429e_0 subdir: osx-64 - url: https://conda.anaconda.org/conda-forge/osx-64/rust-1.76.0-h7e1429e_0.conda - sha256: 27e7a673bbb0c3ca44459259943fbd4b4e4143e438c036feb8b39626ee3e5e17 - md5: 2573dcf36a823ece11260258ec4ed3a1 + url: https://conda.anaconda.org/conda-forge/osx-64/rust-1.77.2-h7e1429e_0.conda + sha256: d12cde3691eb50148b49460ac2bff0c0716204099a38d36132762ffb0c6c79fd + md5: 13c8a97dd157999cdd23adaac7919047 depends: - - rust-std-x86_64-apple-darwin 1.76.0 h38e4360_0 + - rust-std-x86_64-apple-darwin 1.77.2 h38e4360_0 license: MIT license_family: MIT - size: 191502783 - timestamp: 1707422977236 + size: 192493395 + timestamp: 1712743664947 - kind: conda name: rust - version: 1.76.0 + version: 1.77.2 build: hf8d6059_0 subdir: win-64 - url: https://conda.anaconda.org/conda-forge/win-64/rust-1.76.0-hf8d6059_0.conda - sha256: 8e0f5bcba95e618890d440c306a2a6329de85a4b271ee21a4b665b298704effb - md5: 7d4801d0134d5c42f2c83b6124b659d3 + url: https://conda.anaconda.org/conda-forge/win-64/rust-1.77.2-hf8d6059_0.conda + sha256: 978228c14a3d2af2d9d52230443f232d7a22cbbe98d359a306b1a761773d4589 + md5: ba05fee8761e5bd25ae642a4b77d2ed7 depends: - - rust-std-x86_64-pc-windows-msvc 1.76.0 h17fc481_0 + - rust-std-x86_64-pc-windows-msvc 1.77.2 h17fc481_0 license: MIT license_family: MIT - size: 187843360 - timestamp: 1707425717398 + size: 187565499 + timestamp: 1712743189902 - kind: conda name: rust-std-aarch64-apple-darwin - version: 1.76.0 + version: 1.77.2 build: hf6ec828_0 subdir: noarch noarch: generic - url: https://conda.anaconda.org/conda-forge/noarch/rust-std-aarch64-apple-darwin-1.76.0-hf6ec828_0.conda - sha256: a00af5f95dc65e9acf9b078e6fa24217995c525ca415f3b504849301337d4e36 - md5: c1a09b44dd7dac9be17ea3b9e59b47c3 + url: https://conda.anaconda.org/conda-forge/noarch/rust-std-aarch64-apple-darwin-1.77.2-hf6ec828_0.conda + sha256: 19b17ddca3896f12a640858b45a7ba5e8495ca07286b622535ca5a4bf8217906 + md5: 729f181cdeb249ff2da37f434b548633 depends: - __unix constrains: - - rust >=1.76.0,<1.76.1.0a0 + - rust >=1.77.2,<1.77.3.0a0 license: MIT license_family: MIT - size: 30595488 - timestamp: 1707422444224 + size: 30933811 + timestamp: 1712740743456 - kind: conda name: rust-std-x86_64-apple-darwin - version: 1.76.0 + version: 1.77.2 build: h38e4360_0 subdir: noarch noarch: generic - url: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-apple-darwin-1.76.0-h38e4360_0.conda - sha256: ba59cc6260747203468f344ba5e55f5227cce7b7bf684216eab3b3db1387742c - md5: 0e0d3dc80e8689f9fceaa9d57cbf9ea3 + url: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-apple-darwin-1.77.2-h38e4360_0.conda + sha256: 1d0a99136ab0a2b05d9df4d5a7a8d665595c2e72ee1d19fcad0c6f1b402f37d1 + md5: 67db6d59468a8145fb076d75d156b69c depends: - __unix constrains: - - rust >=1.76.0,<1.76.1.0a0 + - rust >=1.77.2,<1.77.3.0a0 license: MIT license_family: MIT - size: 31508989 - timestamp: 1707422739082 + size: 31857486 + timestamp: 1712740749097 - kind: conda name: rust-std-x86_64-pc-windows-msvc - version: 1.76.0 + version: 1.77.2 build: h17fc481_0 subdir: noarch noarch: generic - url: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-pc-windows-msvc-1.76.0-h17fc481_0.conda - sha256: 7592e543e3222ae2b183e062eccf16595d434882cefbb5655baaf808b80f7231 - md5: 64bd914640f496459def58497a625321 + url: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-pc-windows-msvc-1.77.2-h17fc481_0.conda + sha256: 0c290c52a3cf1ac43a316d6caf0e073614351ccae31c681d6953dec7a2ff21e3 + md5: 2149767f1c882154246a9a569991e3c3 depends: - __win constrains: - - rust >=1.76.0,<1.76.1.0a0 + - rust >=1.77.2,<1.77.3.0a0 license: MIT license_family: MIT - size: 25555117 - timestamp: 1707425386866 + size: 25276039 + timestamp: 1712742986757 - kind: conda name: rust-std-x86_64-unknown-linux-gnu - version: 1.76.0 + version: 1.77.2 build: h2c6d0dc_0 subdir: noarch noarch: generic - url: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-unknown-linux-gnu-1.76.0-h2c6d0dc_0.conda - sha256: 5438720aa554fb7ce68fd544f2e35ac0a24c4efdab9cae7dd1371bf699a74ec5 - md5: b27ecce0eb266a44186b8a5b7434d59e + url: https://conda.anaconda.org/conda-forge/noarch/rust-std-x86_64-unknown-linux-gnu-1.77.2-h2c6d0dc_0.conda + sha256: 73f7537db6bc0471135a85a261798abe77e7e83794f945a0355c4068973f31f6 + md5: db8b81b3806faafe2f6f7bd431f72e37 depends: - __unix constrains: - - rust >=1.76.0,<1.76.1.0a0 + - rust >=1.77.2,<1.77.3.0a0 license: MIT license_family: MIT - size: 33981347 - timestamp: 1707422883354 + size: 33827015 + timestamp: 1712741238767 - kind: conda name: schema version: 0.7.5 diff --git a/pixi.toml b/pixi.toml index 8f61abd78..8df6b59ca 100644 --- a/pixi.toml +++ b/pixi.toml @@ -23,7 +23,7 @@ bump = "tbump --only-patch" pre-commit = "~=3.3.0" # Needed for building rattler -rust = "~=1.76.0" +rust = "~=1.77.0" openssl = "3.*" pkg-config = "0.29.*" git = "2.42.0.*" diff --git a/rust-toolchain b/rust-toolchain index 32a6ce3c7..79e15fd49 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.76.0 +1.77.0 diff --git a/src/cli/list.rs b/src/cli/list.rs index 8dcafe7c1..77b693bca 100644 --- a/src/cli/list.rs +++ b/src/cli/list.rs @@ -148,6 +148,7 @@ pub async fn execute(args: Args) -> miette::Result<()> { &uv_context.cache, &tags, &uv_context.index_locations, + &uv_types::HashStrategy::None, )) } else { None diff --git a/src/install.rs b/src/install.rs index 97513c417..3fac3be96 100644 --- a/src/install.rs +++ b/src/install.rs @@ -29,7 +29,7 @@ pub async fn execute_transaction( top_level_progress: ProgressBar, ) -> miette::Result<()> { // Create an install driver which helps limit the number of concurrent filesystem operations - let install_driver = InstallDriver::new(100, Some(prefix_records)); + let install_driver = InstallDriver::new(100, Some(prefix_records), true); // Define default installation options. let install_options = InstallOptions { diff --git a/src/install_pypi.rs b/src/install_pypi.rs index 7b8da6f5c..8d231b66c 100644 --- a/src/install_pypi.rs +++ b/src/install_pypi.rs @@ -9,12 +9,15 @@ use miette::{miette, IntoDiagnostic, WrapErr}; use pep440_rs::Version; use pep508_rs::VerbatimUrl; use platform_tags::Tags; +use pypi_types::{HashAlgorithm, HashDigest}; use requirements_txt::EditableRequirement; use tempfile::{tempdir, TempDir}; use url::Url; use uv_cache::{ArchiveTarget, ArchiveTimestamp, Cache}; +use uv_configuration::{ConfigSettings, SetupPyStrategy}; use uv_resolver::InMemoryIndex; +use uv_types::HashStrategy; use crate::consts::PROJECT_MANIFEST; use crate::lock_file::UvResolutionContext; @@ -22,7 +25,7 @@ use crate::project::manifest::SystemRequirements; use crate::pypi_tags::{get_pypi_tags, is_python_record}; use distribution_types::{ - CachedDist, DirectGitUrl, Dist, IndexUrl, InstalledDist, LocalEditable, Name, + CachedDist, DirectGitUrl, Dist, IndexUrl, InstalledDist, LocalEditable, LocalEditables, Name, }; use install_wheel_rs::linker::LinkMode; @@ -34,14 +37,13 @@ use std::path::Path; use std::str::FromStr; use std::time::Duration; -use uv_client::{FlatIndex, FlatIndexClient}; +use uv_client::FlatIndexClient; use uv_dispatch::BuildDispatch; use uv_distribution::RegistryWheelIndex; use uv_installer::{Downloader, ResolvedEditable, SitePackages}; use uv_interpreter::{Interpreter, PythonEnvironment}; use uv_normalize::PackageName; - -use uv_traits::{ConfigSettings, SetupPyStrategy}; +use uv_resolver::FlatIndex; type CombinedPypiPackageData = (PypiPackageData, PypiPackageEnvironmentData); @@ -91,37 +93,32 @@ fn locked_data_to_file(pkg: &PypiPackageData, filename: &str) -> distribution_ty // Convert PackageHashes to uv hashes let hashes = if let Some(ref hash) = pkg.hash { match hash { - rattler_lock::PackageHashes::Md5(md5) => pypi_types::Hashes { - md5: Some(format!("{:x}", md5).into()), - sha256: None, - sha384: None, - sha512: None, - }, - rattler_lock::PackageHashes::Sha256(sha256) => pypi_types::Hashes { - md5: None, - sha256: Some(format!("{:x}", sha256).into()), - sha384: None, - sha512: None, - }, - rattler_lock::PackageHashes::Md5Sha256(md5, sha256) => pypi_types::Hashes { - md5: Some(format!("{:x}", md5).into()), - sha256: Some(format!("{:x}", sha256).into()), - sha384: None, - sha512: None, - }, + rattler_lock::PackageHashes::Md5(md5) => vec![HashDigest { + algorithm: HashAlgorithm::Md5, + digest: format!("{:x}", md5).into(), + }], + rattler_lock::PackageHashes::Sha256(sha256) => vec![HashDigest { + algorithm: HashAlgorithm::Sha256, + digest: format!("{:x}", sha256).into(), + }], + rattler_lock::PackageHashes::Md5Sha256(md5, sha256) => vec![ + HashDigest { + algorithm: HashAlgorithm::Md5, + digest: format!("{:x}", md5).into(), + }, + HashDigest { + algorithm: HashAlgorithm::Sha256, + digest: format!("{:x}", sha256).into(), + }, + ], } } else { - pypi_types::Hashes { - md5: None, - sha256: None, - sha384: None, - sha512: None, - } + vec![] }; distribution_types::File { filename: filename.to_string(), - dist_info_metadata: None, + dist_info_metadata: false, hashes, requires_python: pkg.requires_python.clone(), upload_time_utc_ms: None, @@ -655,11 +652,15 @@ async fn resolve_editables( let built_editables = Downloader::new( &uv_context.cache, tags, + &uv_types::HashStrategy::None, &uv_context.registry_client, build_dispatch, ) .with_reporter(UvReporter::new(options)) - .build_editables(to_build, temp.path()) + .build_editables( + LocalEditables::from_editables(to_build.into_iter()), + temp.path(), + ) .await .into_diagnostic()?; (built_editables, Some(temp)) @@ -724,7 +725,13 @@ pub async fn update_python_distributions( .fetch(uv_context.index_locations.flat_index()) .await .into_diagnostic()?; - FlatIndex::from_entries(entries, &tags) + FlatIndex::from_entries( + entries, + &tags, + &uv_types::HashStrategy::None, + &uv_context.no_build, + &uv_context.no_binary, + ) }; let in_memory_index = InMemoryIndex::default(); @@ -747,7 +754,8 @@ pub async fn update_python_distributions( &uv_context.in_flight, SetupPyStrategy::default(), &config_settings, - uv_traits::BuildIsolation::Isolated, + uv_types::BuildIsolation::Isolated, + LinkMode::default(), &uv_context.no_build, &uv_context.no_binary, ) @@ -776,8 +784,12 @@ pub async fn update_python_distributions( .await?; // This is used to find wheels that are available from the registry - let mut registry_index = - RegistryWheelIndex::new(&uv_context.cache, &tags, &uv_context.index_locations); + let mut registry_index = RegistryWheelIndex::new( + &uv_context.cache, + &tags, + &uv_context.index_locations, + &HashStrategy::None, + ); // Partition into those that should be linked from the cache (`local`), those that need to be // downloaded (`remote`), and those that should be removed (`extraneous`). @@ -857,6 +869,7 @@ pub async fn update_python_distributions( let downloader = Downloader::new( &uv_context.cache, &tags, + &uv_types::HashStrategy::None, &uv_context.registry_client, &build_dispatch, ) diff --git a/src/lock_file/pypi_editables.rs b/src/lock_file/pypi_editables.rs index ff5269bc1..bd7e4046d 100644 --- a/src/lock_file/pypi_editables.rs +++ b/src/lock_file/pypi_editables.rs @@ -5,12 +5,13 @@ use distribution_types::LocalEditable; use futures::StreamExt; use install_wheel_rs::metadata::read_archive_metadata; use itertools::Itertools; -use pypi_types::Metadata23; +use pypi_types::{Metadata23, MetadataError}; use requirements_txt::EditableRequirement; use uv_cache::Cache; +use uv_configuration::BuildKind; use uv_dispatch::BuildDispatch; use uv_installer::DownloadReporter; -use uv_traits::{BuildContext, BuildKind, SourceBuildTrait}; +use uv_types::{BuildContext, SourceBuildTrait}; use zip::ZipArchive; use crate::uv_reporter::{UvReporter, UvReporterOptions}; @@ -37,7 +38,7 @@ pub enum BuildEditablesError { #[error("error during parsing of editable metadata")] MetadataParse { #[from] - source: pypi_types::Error, + source: MetadataError, }, #[error("error creating temporary dir for editable wheel build")] @@ -107,7 +108,7 @@ async fn build_editable( } else { let temp_dir = tempfile::tempdir_in(cache.root())?; let wheel = source_build - .build(temp_dir.path()) + .build_wheel(temp_dir.path()) .await .map_err(|e| BuildEditablesError::Build { source: e })?; Ok(read_wheel_metadata( diff --git a/src/lock_file/resolve.rs b/src/lock_file/resolve.rs index 99d8773d1..d5c7a62e7 100644 --- a/src/lock_file/resolve.rs +++ b/src/lock_file/resolve.rs @@ -21,17 +21,18 @@ use crate::{ }; use distribution_types::{ - BuiltDist, DirectUrlSourceDist, Dist, IndexLocations, Name, PrioritizedDist, Resolution, - SourceDist, + BuiltDist, DirectUrlSourceDist, Dist, HashPolicy, IndexLocations, Name, PrioritizedDist, + Resolution, ResolvedDist, SourceDist, }; use distribution_types::{FileLocation, SourceDistCompatibility}; use futures::FutureExt; use indexmap::IndexMap; use indicatif::ProgressBar; +use install_wheel_rs::linker::LinkMode; use itertools::{Either, Itertools}; use miette::{Context, IntoDiagnostic}; use pep508_rs::{Requirement, VerbatimUrl}; -use pypi_types::Metadata23; +use pypi_types::{HashAlgorithm, HashDigest, Metadata23}; use rattler_conda_types::{GenericVirtualPackage, MatchSpec, RepoDataRecord}; use rattler_digest::{parse_digest_from_hex, Md5, Sha256}; use rattler_lock::{ @@ -41,19 +42,23 @@ use rattler_solve::{resolvo, SolverImpl}; use std::path::{Path, PathBuf}; use std::str::FromStr; use std::sync::Arc; +use uv_configuration::{ + ConfigSettings, Constraints, NoBinary, NoBuild, Overrides, SetupPyStrategy, +}; use url::Url; use uv_cache::Cache; -use uv_client::{Connectivity, FlatIndex, FlatIndexClient, RegistryClient, RegistryClientBuilder}; +use uv_client::{Connectivity, FlatIndexClient, RegistryClient, RegistryClientBuilder}; use uv_dispatch::BuildDispatch; -use uv_distribution::{DistributionDatabase, Reporter}; +use uv_distribution::{ArchiveMetadata, DistributionDatabase, Reporter}; use uv_interpreter::Interpreter; use uv_normalize::PackageName; use uv_resolver::{ - AllowedYanks, DefaultResolverProvider, DistFinder, InMemoryIndex, Manifest, Options, - PythonRequirement, Resolver, ResolverProvider, VersionMap, VersionsResponse, + AllowedYanks, DefaultResolverProvider, FlatIndex, InMemoryIndex, Manifest, MetadataResponse, + Options, PythonRequirement, Resolver, ResolverProvider, VersionMap, VersionsResponse, + WheelMetadataResult, }; -use uv_traits::{BuildContext, ConfigSettings, InFlight, NoBinary, NoBuild, SetupPyStrategy}; +use uv_types::{BuildContext, EmptyInstalledPackages, HashStrategy, InFlight}; /// Objects that are needed for resolutions which can be shared between different resolutions. #[derive(Clone)] @@ -64,6 +69,7 @@ pub struct UvResolutionContext { pub index_locations: Arc, pub no_build: NoBuild, pub no_binary: NoBinary, + pub hash_strategy: HashStrategy, } impl UvResolutionContext { @@ -90,27 +96,39 @@ impl UvResolutionContext { index_locations, no_build: NoBuild::None, no_binary: NoBinary::None, + hash_strategy: HashStrategy::None, }) } } -/// This function takes as input a set of dependencies and system requirements and returns a set of -/// locked packages. +fn parse_hashes_from_hash_vec(hashes: &Vec) -> Option { + let mut sha256 = None; + let mut md5 = None; + + for hash in hashes { + match hash.algorithm() { + HashAlgorithm::Sha256 => { + sha256 = Some(hash.digest.to_string()); + } + HashAlgorithm::Md5 => { + md5 = Some(hash.digest.to_string()); + } + HashAlgorithm::Sha384 | HashAlgorithm::Sha512 => { + // We do not support these algorithms + } + } + } -fn parse_hashes_from_hex( - sha256: &Option>, - md5: &Option>, -) -> Option { match (sha256, md5) { (Some(sha256), None) => Some(PackageHashes::Sha256( - parse_digest_from_hex::(sha256).expect("invalid sha256"), + parse_digest_from_hex::(&sha256).expect("invalid sha256"), )), (None, Some(md5)) => Some(PackageHashes::Md5( - parse_digest_from_hex::(md5).expect("invalid md5"), + parse_digest_from_hex::(&md5).expect("invalid md5"), )), (Some(sha256), Some(md5)) => Some(PackageHashes::Md5Sha256( - parse_digest_from_hex::(md5).expect("invalid md5"), - parse_digest_from_hex::(sha256).expect("invalid sha256"), + parse_digest_from_hex::(&md5).expect("invalid md5"), + parse_digest_from_hex::(&sha256).expect("invalid sha256"), )), (None, None) => None, } @@ -140,12 +158,15 @@ impl<'a, Context: BuildContext + Send + Sync> ResolverProvider url: VerbatimUrl::unknown(repodata_record.url.clone()), })); - let prioritized_dist = - PrioritizedDist::from_source(dist, None, SourceDistCompatibility::Compatible); + let prioritized_dist = PrioritizedDist::from_source( + dist, + Vec::new(), + SourceDistCompatibility::Compatible(distribution_types::Hash::Matched), + ); - return ready(Ok(VersionsResponse::Found(VersionMap::from( + return ready(Ok(VersionsResponse::Found(vec![VersionMap::from( BTreeMap::from_iter([(identifier.version.clone(), prioritized_dist)]), - )))) + )]))) .right_future(); } @@ -158,24 +179,22 @@ impl<'a, Context: BuildContext + Send + Sync> ResolverProvider fn get_or_build_wheel_metadata<'io>( &'io self, dist: &'io Dist, - ) -> impl Future + Send + 'io { - if let Dist::Source(SourceDist::DirectUrl(DirectUrlSourceDist { url, name })) = dist { + ) -> impl Future + Send + 'io { + if let Dist::Source(SourceDist::DirectUrl(DirectUrlSourceDist { name, .. })) = dist { if let Some((_, iden)) = self.conda_python_identifiers.get(name) { // If this is a Source dist and the package is actually installed by conda we // create fake metadata with no dependencies. We assume that all conda installed // packages are properly installed including its dependencies. - return ready(Ok(( - Metadata23 { - metadata_version: "1.0".to_string(), - name: name.clone(), + return ready(Ok(MetadataResponse::Found(ArchiveMetadata { + metadata: Metadata23 { + name: iden.name.as_normalized().clone(), version: iden.version.clone(), requires_dist: vec![], requires_python: None, - // TODO: This field is not actually properly used. provides_extras: iden.extras.iter().cloned().collect(), }, - Some(url.to_url()), - ))) + hashes: vec![], + }))) .left_future(); } } @@ -302,7 +321,13 @@ pub async fn resolve_pypi( .fetch(context.index_locations.flat_index()) .await .into_diagnostic()?; - FlatIndex::from_entries(entries, &tags) + FlatIndex::from_entries( + entries, + &tags, + &context.hash_strategy, + &context.no_build, + &context.no_binary, + ) }; let in_memory_index = InMemoryIndex::default(); @@ -320,7 +345,8 @@ pub async fn resolve_pypi( &context.in_flight, SetupPyStrategy::default(), &config_settings, - uv_traits::BuildIsolation::Isolated, + uv_types::BuildIsolation::Isolated, + LinkMode::default(), &context.no_build, &context.no_binary, ) @@ -337,7 +363,7 @@ pub async fn resolve_pypi( ))), marker: None, }) - .collect(); + .collect::>(); // Build any editables let built_editables = build_editables(&editables, &context.cache, &build_dispatch) @@ -348,25 +374,23 @@ pub async fn resolve_pypi( let manifest = Manifest::new( requirements, - constraints, - Vec::new(), + Constraints::from_requirements(constraints), + Overrides::default(), Vec::new(), None, built_editables.clone(), + uv_resolver::Exclusions::None, + Vec::new(), ); let fallback_provider = DefaultResolverProvider::new( &context.registry_client, - DistributionDatabase::new( - &context.cache, - &tags, - &context.registry_client, - &build_dispatch, - ), + DistributionDatabase::new(&context.registry_client, &build_dispatch), &flat_index, &tags, PythonRequirement::new(&interpreter, &marker_environment), AllowedYanks::default(), + &context.hash_strategy, options.exclude_newer, build_dispatch.no_binary(), &NoBuild::None, @@ -379,10 +403,12 @@ pub async fn resolve_pypi( let resolution = Resolver::new_custom_io( manifest, options, + &context.hash_strategy, &marker_environment, PythonRequirement::new(&interpreter, &marker_environment), &in_memory_index, provider, + &EmptyInstalledPackages, ) .into_diagnostic() .context("failed to resolve pypi dependencies")? @@ -396,25 +422,7 @@ pub async fn resolve_pypi( let resolution = Resolution::from(resolution); - let database = DistributionDatabase::new( - &context.cache, - &tags, - &context.registry_client, - &build_dispatch, - ); - - let resolution = DistFinder::new( - &tags, - &context.registry_client, - &interpreter, - &flat_index, - build_dispatch.no_binary(), - &NoBuild::None, - ) - .resolve(&resolution.requirements()) - .await - .into_diagnostic() - .context("failed to find matching pypi distributions for the resolution")?; + let database = DistributionDatabase::new(&context.registry_client, &build_dispatch); let mut locked_packages = LockedPypiPackages::with_capacity(resolution.len()); for dist in resolution.into_distributions() { @@ -424,7 +432,11 @@ pub async fn resolve_pypi( } let pypi_package_data = match dist { - Dist::Built(dist) => { + ResolvedDist::Installed(_) => { + // TODO handle installed distributions + continue; + } + ResolvedDist::Installable(Dist::Built(dist)) => { let (url_or_path, hash) = match &dist { BuiltDist::Registry(dist) => { let url = match &dist.file.url { @@ -435,9 +447,7 @@ pub async fn resolve_pypi( _ => todo!("unsupported URL"), }; - let hash = - parse_hashes_from_hex(&dist.file.hashes.sha256, &dist.file.hashes.md5); - + let hash = parse_hashes_from_hash_vec(&dist.file.hashes); (url, hash) } BuiltDist::DirectUrl(dist) => { @@ -470,30 +480,28 @@ pub async fn resolve_pypi( hash, } } - Dist::Source(source) => { + ResolvedDist::Installable(Dist::Source(source)) => { + // Handle new hash stuff let hash = source .file() - .and_then(|file| parse_hashes_from_hex(&file.hashes.sha256, &file.hashes.md5)); + .and_then(|file| parse_hashes_from_hash_vec(&file.hashes)); - let (metadata, url) = database - .get_or_build_wheel_metadata(&Dist::Source(source.clone())) + let metadata_response = database + .get_or_build_wheel_metadata(&Dist::Source(source.clone()), HashPolicy::None) .await .into_diagnostic()?; + let metadata = metadata_response.metadata; // Use the precise url if we got it back // otherwise try to construct it from the source let (url_or_path, hash, editable) = match source { SourceDist::Registry(reg) => { - let url_or_path = if let Some(url) = url { - UrlOrPath::Url(url) - } else { - match ®.file.url { - FileLocation::AbsoluteUrl(url) => UrlOrPath::Url( - Url::from_str(url).expect("invalid absolute url"), - ), - FileLocation::Path(path) => UrlOrPath::Path(path.clone()), - _ => todo!("unsupported URL"), + let url_or_path = match ®.file.url { + FileLocation::AbsoluteUrl(url) => { + UrlOrPath::Url(Url::from_str(url).expect("invalid absolute url")) } + FileLocation::Path(path) => UrlOrPath::Path(path.clone()), + _ => todo!("unsupported URL"), }; (url_or_path, hash, false) } diff --git a/src/lock_file/satisfiability.rs b/src/lock_file/satisfiability.rs index 1fed49348..1c4cddc6b 100644 --- a/src/lock_file/satisfiability.rs +++ b/src/lock_file/satisfiability.rs @@ -20,6 +20,7 @@ use std::{ }; use thiserror::Error; use url::Url; +use uv_git::GitReference; use uv_normalize::{ExtraName, PackageName}; #[derive(Debug, Error, Diagnostic)] @@ -238,12 +239,11 @@ pub fn pypi_satifisfies_editable( // If the spec does not specify a revision than any will do // E.g `git.com/user/repo` is the same as `git.com/user/repo@adbdd` - if spec_git_url.url.reference().is_none() { - base_is_same - } else { - // If the spec does specify a revision than the revision must match - base_is_same && spec_git_url.url.reference() == locked_data_url.url.reference() + if *spec_git_url.url.reference() == GitReference::DefaultBranch { + return base_is_same; } + // If the spec does specify a revision than the revision must match + base_is_same && spec_git_url.url.reference() == locked_data_url.url.reference() } else { let spec_path_or_url = spec_url .given() @@ -293,12 +293,11 @@ pub fn pypi_satifisfies_requirement(locked_data: &PypiPackageData, spec: &Requir // If the spec does not specify a revision than any will do // E.g `git.com/user/repo` is the same as `git.com/user/repo@adbdd` - if spec_git_url.url.reference().is_none() { - base_is_same - } else { - // If the spec does specify a revision than the revision must match - base_is_same && spec_git_url.url.reference() == locked_data_url.url.reference() + if *spec_git_url.url.reference() == GitReference::DefaultBranch { + return base_is_same; } + // If the spec does specify a revision than the revision must match + base_is_same && spec_git_url.url.reference() == locked_data_url.url.reference() } else { let spec_path_or_url = spec_url .given() diff --git a/src/lock_file/snapshots/pixi__lock_file__satisfiability__tests__failing_satisiability@missing-pypi-extra__pixi.toml.snap b/src/lock_file/snapshots/pixi__lock_file__satisfiability__tests__failing_satisiability@missing-pypi-extra__pixi.toml.snap index 91b3f3b84..8b541f4ea 100644 --- a/src/lock_file/snapshots/pixi__lock_file__satisfiability__tests__failing_satisiability@missing-pypi-extra__pixi.toml.snap +++ b/src/lock_file/snapshots/pixi__lock_file__satisfiability__tests__failing_satisiability@missing-pypi-extra__pixi.toml.snap @@ -5,4 +5,4 @@ input_file: tests/non-satisfiability/missing-pypi-extra/pixi.toml --- environment 'default' does not satisfy the requirements of the project for platform 'win-64 Diagnostic severity: error - Caused by: the requirement 'ipython >=7.8.0 ; extra == 'jupyter'' could not be satisfied (required by 'black') + Caused by: the requirement 'ipython>=7.8.0 ; extra == 'jupyter'' could not be satisfied (required by 'black') diff --git a/src/lock_file/snapshots/pixi__lock_file__satisfiability__tests__failing_satisiability@solve-groups-pypi__pixi.toml.snap b/src/lock_file/snapshots/pixi__lock_file__satisfiability__tests__failing_satisiability@solve-groups-pypi__pixi.toml.snap index 3307572d1..dfe2fe58a 100644 --- a/src/lock_file/snapshots/pixi__lock_file__satisfiability__tests__failing_satisiability@solve-groups-pypi__pixi.toml.snap +++ b/src/lock_file/snapshots/pixi__lock_file__satisfiability__tests__failing_satisiability@solve-groups-pypi__pixi.toml.snap @@ -5,4 +5,4 @@ input_file: tests/non-satisfiability/solve-groups-pypi/pixi.toml --- environment 'default' does not satisfy the requirements of the project for platform 'win-64 Diagnostic severity: error - Caused by: the requirement 'packaging >=20.0' could not be satisfied (required by 'matplotlib') + Caused by: the requirement 'packaging>=20.0' could not be satisfied (required by 'matplotlib') diff --git a/src/project/manifest/snapshots/pixi__project__manifest__pyproject__tests__add_pypi_dependency.snap b/src/project/manifest/snapshots/pixi__project__manifest__pyproject__tests__add_pypi_dependency.snap index b29fb447b..4007e269d 100644 --- a/src/project/manifest/snapshots/pixi__project__manifest__pyproject__tests__add_pypi_dependency.snap +++ b/src/project/manifest/snapshots/pixi__project__manifest__pyproject__tests__add_pypi_dependency.snap @@ -10,7 +10,7 @@ expression: manifest.document.to_string() homepage = "https://github.com/prefix/pixi" readme = "README.md" requires-python = ">=3.11" - dependencies = ["flask==2.*", "numpy >=3.12"] + dependencies = ["flask==2.*", "numpy>=3.12"] [tool.pixi.project] name = "flask-hello-world-pyproject" diff --git a/src/pypi_tags.rs b/src/pypi_tags.rs index da175d7f9..c0cdf6e8e 100644 --- a/src/pypi_tags.rs +++ b/src/pypi_tags.rs @@ -139,6 +139,7 @@ pub fn get_pypi_tags( implementation_name, // TODO: This might not be entirely correct.. (python_version.0 as u8, python_version.1 as u8), + false, ) .into_diagnostic() .context("failed to determine the python wheel tags for the target platform")?;