diff options
Diffstat (limited to 'dev-python/uv')
-rw-r--r-- | dev-python/uv/Manifest | 24 | ||||
-rw-r--r-- | dev-python/uv/files/uv-0.6.13-test-ws.patch | 241 | ||||
-rw-r--r-- | dev-python/uv/uv-0.6.10.ebuild | 6 | ||||
-rw-r--r-- | dev-python/uv/uv-0.6.11.ebuild | 170 | ||||
-rw-r--r-- | dev-python/uv/uv-0.6.13.ebuild | 9 | ||||
-rw-r--r-- | dev-python/uv/uv-0.6.14.ebuild (renamed from dev-python/uv/uv-0.6.12.ebuild) | 9 | ||||
-rw-r--r-- | dev-python/uv/uv-0.6.6.ebuild | 170 | ||||
-rw-r--r-- | dev-python/uv/uv-0.6.7.ebuild | 166 | ||||
-rw-r--r-- | dev-python/uv/uv-0.6.8.ebuild | 170 | ||||
-rw-r--r-- | dev-python/uv/uv-0.6.9.ebuild | 170 |
10 files changed, 270 insertions, 865 deletions
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest index c798ba147fa9..e7c79e10ce09 100644 --- a/dev-python/uv/Manifest +++ b/dev-python/uv/Manifest @@ -1,29 +1,17 @@ +AUX uv-0.6.13-test-ws.patch 8061 BLAKE2B 7fdb2ce20beb5eb042db536ad419c1f8c75b5e5f27096b6d08c9ec17eb10509435fe8895e582034d4fc0c8db56912ecfef637a0a7152dd733f47c5db2f41e0f5 SHA512 d8351c15487deca2127d6e8d3e3242c2bb617507cfcbc6fa34a3f7d011ef86f3940a9391b02da39a80cf6c3b3ed76c986ed11fc7a100ee89ee0c2f99660b2757 DIST pubgrub-b70cf707aa43f21b32f3a61b8a0889b15032d5c4.gh.tar.gz 98983 BLAKE2B 08ad8a10a96ba7da3100f7658f38cb8d6fb0e1eca92ba0aaf1393778012db807084f047eec171f0a46836a6746367369e79ab95836d5cdf215211e321d2800ac SHA512 401ea5ca16e978d5407a1400e4e27cec9fcac11332067ee1ed8a3bc511901e08fc421ce875ebbb0990593ed549a4a5f4620914a71ae3490c7b8ae0f7b26b5937 DIST rs-async-zip-c909fda63fcafe4af496a07bfda28a5aae97e58d.gh.tar.gz 51763 BLAKE2B 59d053bc6692014d884a9247dea1b57a8789469ba2abbcc92ec21bb0022cbd74874afc463082156ab697aa6c80635019857a5d7e2dc150274e8b04d720518c36 SHA512 3a309566f4925b02496fcf19bc2865968edf6fb65082ca4079d2cee79e6b0353a1910c079f2afe656da0d0f6ddde5102052a221ea35a7dabc6d690a11218b20a DIST tl-6e25b2ee2513d75385101a8ff9f591ef51f314ec.gh.tar.gz 37106 BLAKE2B c30d1c33f6f52e2bc83823eb6319f8a3e462b7c7408fb6a08f995747857ef234f81db4135a04f9d183095fe473a4087f8f0cb89d8f87ef4400285d2ce034ec22 SHA512 4abbc4240ed129c92da8d616e27a6df0f24cdc85a0803acfdae588ca91f9e5b8d482e3ac88b2e657ff68917b1b43cef1e7ef3c887f624659b231fa5a13fcae68 DIST uv-0.6.10-crates.tar.xz 58024120 BLAKE2B 87c8f715296171539cbf291304f17e483abcfd1aea9cdd933cbaac80411a465912fa3459587983f59035c597b186f69a5a16f124720ff0fd2f1ba5accc3755b8 SHA512 09ad70459e4be2ec1cad5bdb6823cabb7cf696e74aef445770ef3878a684e6c11d57d53bd64af31f5efb4f3f4ee16b92791668825baea1a6a135e9eb2774ee30 DIST uv-0.6.10.gh.tar.gz 3816981 BLAKE2B 2f1ba71073a5714428120376fdafd3c37e40b4540fc600c7b06e07ddd4a35358a33a0ce1a217f810d448b43fd36a20db7602880ab933dd2c2b8e7ca690b07f94 SHA512 d1a034ae8781b5401a9ad77e00f7d4ae1e401359232e44a7395583e22c88f80e3741a21b52a3a4f659edbd2e643ffe3ad10b58964dc7c3c12bee60f8c0414930 -DIST uv-0.6.11.gh.tar.gz 3824564 BLAKE2B 504a910fc94dc1ddffc5ba97a131c0647148fd8b67eddaa8254a8cf272e22c463f2529c1452b1b97a67381bcac145dd1b1883473cbcb7ce4df021773e2a32997 SHA512 4cad1246de2e8767394b89448e009a0c51a2e2d95c3eaac2c2ed76a03951fd539cefb38d2e61dc9ed0cc709c1a21a9221bb0437d1862d0d2a389977e19072835 -DIST uv-0.6.12-crates.tar.xz 58030004 BLAKE2B 6449a03e575e6635908cc55b5b3e08f83d380c278d73185f48a335cbad3515bafe0a28a72716dad0853428955ce35a195ad3810399cb7c205227ef1c442cdcea SHA512 31d768c787c3572be0c7a482b2db6d5ee3213f2a4e2b33651b564c90f107cce044a3abfff0ede8db3be6d530b602f20a9d0bc820b16f2ef0fa07f5cd52ba2d76 -DIST uv-0.6.12.gh.tar.gz 3828283 BLAKE2B ccec04082014785efb43e05395caf2d8dfe783791da739a15644541ed98984dec297c9f6ccca95ffffd50102568b4b17807f7b4503749076d55eac3007c82fac SHA512 c61476e1229d7ac9d9cd00308afde31f7acad469e2f69b3131b7723495c8a5bbac5cf545c0d657048433411ad706f96aa2296bcb3c1b6ff3cb5d0f18e786a4d5 DIST uv-0.6.13-crates.tar.xz 58045788 BLAKE2B 38f925444077274bbe412258997e3c67065da8f673de1644f8f533d1941adec78672291cf5467ebc836cd19b663a82a9b62e3724e69d46dd5e67e411af7db388 SHA512 82396f59b382f82e924893047cf16db7762fdc7bca947f7c8a572bb470537b55af05c2a735caf570048853265012111666ee0368a86d09a17576e7f3f86ab5cd DIST uv-0.6.13.gh.tar.gz 3830359 BLAKE2B 1922c2f7fe2f6273a9518deb82fa909c6271aff87311a799217d08c3413dc19ac8ab8f259338ffc4f4448e3ba52b07ff40fa136e11dea85371f019b18b6a07ec SHA512 49e629a291f4aaf6ac96e994f22fe4370dee6e21d6317a4b1d28eaddb5f34b838ce19707eb22da7b9b16445d19f32a74631301a1feb53b336a8a275ee3f1e1bf +DIST uv-0.6.14-crates.tar.xz 58053476 BLAKE2B f7b1519044677905a943c2e1561ff36933a9781be38bdfd5743aa6980a2e157b96e094c595b905d4e8e717f339b601b1b213ac7fdf2a198e617d648312bde0df SHA512 e071b82d7a155d36d08a49bb8131f1cd15c49691e31861e4dbeb94caf7e38ab0ec2be6ad93b2810efff4d84b89b6f1dfea7f6cf1946e32774c88f0a4260869db +DIST uv-0.6.14.gh.tar.gz 3847653 BLAKE2B 9cfc28fa93a11567fced35955c0d4589d8aa2ec9c92f90bdae3b62dd67a80861c70fead2b489ad4667f5b2b676b4c106b5377c32df9be2210b2cd73f436476eb SHA512 fd83f66d7be2c8bb0a30457433db00a7a0aa04d7f546a5a8833299e1e92dcf502c058a5dd8deb6b890aa21c10e3b9695e5444272efed9402e9722b01a71ff1b1 DIST uv-0.6.4-crates.tar.xz 60120880 BLAKE2B 67e7cba1df7e8c18e55d7d1a5748db7995c19a8bc4d156b5cdcf8d6af3922ea52279e2351085fd2142806f6692383535dec1d8354c5197d3ed032f768c552dbc SHA512 0f13d3e6e77397ef2db40122736fe4d990003388dc2f2f782b9aea317fb30f30cbb35b1d800b252e84f239fd570208df55f281432e91e546b5edcf82b9a2b68e DIST uv-0.6.5.gh.tar.gz 3782938 BLAKE2B 82528fbd5c65cc07dd4ba647dd86d81673370afe8568690601e54faa54ad0ffa42db375b63580b0ae67f1fda67a66f54d990ce97704c614e80bf54666ed3e11e SHA512 cb1564905d56ac5873db91476b9a0a09e450c2cfaf386d9d04b1861d1e798ec43d7f28e03099d732e03cc58f79820a7f825d7d8869b40f71fab4308412e401b5 -DIST uv-0.6.6-crates.tar.xz 60230976 BLAKE2B 9b0dcb0d8246fc275f5b508c48661f0844622ee9280b9000e0131e6101d548b92f983502fa21070fd41aa20854aa0931b3a5be13fc96def5bafab6d0eebe943f SHA512 b1925417eb34135e9e9d92a8d832055cd3677142ac9e7369d9e1f64ceba02632914c6ddc669257a5d75dd27b8cea4612db2bb295d2b747a74e169a8e23fc5a6b -DIST uv-0.6.6.gh.tar.gz 3767860 BLAKE2B 09bcb296f10ecebc9bda81091ea9c7f589b9b44169981676b5013088c001301d2302bab8514d4c6fb9542ba0bc0d07377e68a46c35f667a6a408f86e499a1a89 SHA512 49ad9fdb411e719b5a2aae6d48750932c8ad65bace2b0a747a54b475bcd0a40da368712d074b4b3afdf28cc8003532aca712b3714d54323f184ee1358521d7c5 -DIST uv-0.6.7-crates.tar.xz 60339544 BLAKE2B 5bde165c809ee9a66c23a1811d461502021b2038c747deaa250b2f30e947712e6ccad23f188fc93b000edaaf53b657d90971803acff94ade6c61a29684cf5601 SHA512 d339b9cc8b4b19ba802d203f476da311d060962e07cffaeedd0aed05b21125b6a959a971d3654db3e26087c15331588dd6ebba2ab9e52fcd91b1a38a2dc8e9e7 -DIST uv-0.6.7.gh.tar.gz 3791242 BLAKE2B ca24f6945d6a442c32a574b901cf47dac3ede08603255b62feded82d36179a578aada04fca402d7738d2b3b78adfe22e4d1dbded502cafb2c5d4eb0407a5b5d4 SHA512 992f8a64f3d0c8f57be6959f91242ce7420c6ee94839f067dc142f895fb2c0b9ab4161b6a51112241e30c8836eefb7e5bc747f867c28bf09b95e0aaa52de8350 -DIST uv-0.6.8-crates.tar.xz 58007724 BLAKE2B bcf38b328d17e61cb74e9c1e51e0459fe91fd3b9124510e3f26606a3216189d2eb223cffd70dafce18cafe2340efc86f84379abf97444f79a57635dff0429590 SHA512 289cc35931ea54eb466e65cb279f842f06695ca09fae574dc5a3ba519db39c7441de9bf13c8c490cfa975f103b04988a943ea6de088090bbea0a944178064dbf -DIST uv-0.6.8.gh.tar.gz 3793571 BLAKE2B 7bdcbaee54edb8114328410590406b2bb7240c597e9b5450a56a59de477467246fa6746ba21602cbd27b828c2c9606406d1701b6149b4b7160ac7ff21fe775bb SHA512 edf3e45e773bc4db3e1ee7a76419ef62beadc882f2dbe6342ec334520e170f941b55d376469677a2b8107a6ab8e38d9c704bfae6700e4f2f4932db9fda57478c -DIST uv-0.6.9.gh.tar.gz 3805843 BLAKE2B 6ea1ba8ea68542896e6c076cc05548bbb2ce8c2adcb0f6ac4e59ce2bdaeffca248a333f9e549bd9532cd72ab2ed99a479d9b106b91120371ad59819ecf7ab6aa SHA512 0b6791b25aaa354a1c662132af97b9b5d45785867be4ee112660b823c69d532460651a333db61c96c997448761c77fde1fd4ecb47ccd5ebc73239d81a60b984d -EBUILD uv-0.6.10.ebuild 4384 BLAKE2B 3d26f9d96f38f2db84e43376d1a8251911ffe19a58d05d81cdaba8e1928cf3ca354bcd6fba45b517e422368d6ab17f13bb508f112e80c80396ca9c31bf158c17 SHA512 90b32eef65c5f93a386f444abe2804e0d7669a2b1cdb7b6c2aaef40c3625471a20a5129688df326782b2fa359dcd00c1409d96bf7eda576851346dcb770bc828 -EBUILD uv-0.6.11.ebuild 4384 BLAKE2B 3d26f9d96f38f2db84e43376d1a8251911ffe19a58d05d81cdaba8e1928cf3ca354bcd6fba45b517e422368d6ab17f13bb508f112e80c80396ca9c31bf158c17 SHA512 90b32eef65c5f93a386f444abe2804e0d7669a2b1cdb7b6c2aaef40c3625471a20a5129688df326782b2fa359dcd00c1409d96bf7eda576851346dcb770bc828 -EBUILD uv-0.6.12.ebuild 4383 BLAKE2B cf791584ad53431dc7eec7a8a7d0d18b84b03b6a5d08b6fb1c658fb8c767c3f8b82e1b39ef210a75b13f433b3ba8dddd7b0941769d096677468271acc9e54be3 SHA512 9c5e11c490c932cfc4dbd06d855a03a6b827fa834d5d65bbd179b0adba25bfab393c8d730308d5d656b9c19ba1d29ff7a517dec49cda5ff52a7bf485e5061028 -EBUILD uv-0.6.13.ebuild 4383 BLAKE2B cf791584ad53431dc7eec7a8a7d0d18b84b03b6a5d08b6fb1c658fb8c767c3f8b82e1b39ef210a75b13f433b3ba8dddd7b0941769d096677468271acc9e54be3 SHA512 9c5e11c490c932cfc4dbd06d855a03a6b827fa834d5d65bbd179b0adba25bfab393c8d730308d5d656b9c19ba1d29ff7a517dec49cda5ff52a7bf485e5061028 +EBUILD uv-0.6.10.ebuild 4558 BLAKE2B 4e80eda2d50c57f6aedc708c31a7d47e2f7880af572cd6659c2ae94d311b0fa902fcd2c6ea7afd4168fe45bc7e308235527e6013056f8b89495e48aa769c06a1 SHA512 0499a1d5aa2d915314035b63faafd011c86913a51b68dfbed68f916afeec36428549f32bb295281d916a3a1718ee297d9a940c2dcee589eb72392141e29d1f8e +EBUILD uv-0.6.13.ebuild 4664 BLAKE2B eb25b6ba4e0ae8231a2af6e7e77d59bf0cb6a58c6720e397ca72665b9db53474e9b743028d7a2eaa1e8f1384de66e228613ff4b1183df1e8c30c6138be1072c4 SHA512 7d130eb3e54c74d178b7bfd30fc1f581912ddbc7091cc4392ba230fedb5a6f55ea9f879959025b46f99c410a6873bfc69bca8880ce26fb72980c9a69fd1dfa08 +EBUILD uv-0.6.14.ebuild 4669 BLAKE2B d55250a1b112e75d2f1a0210fc487dd1c5a9458aa474fc5631a5a3d5d1cf9253a51de4ac1e498b23386f6caa0c48c2a1a3be16d8fdd33234bc4c91da20d5c43c SHA512 16f8b284198bae8be152c653d9731d4c32ef283af921aaff48fab7d38a0fe5c4a5ac6b32326114409a04f6604aa02755d5d26b6eeaa8f757aba5159334e170f0 EBUILD uv-0.6.5.ebuild 4368 BLAKE2B 0a83803cb1e9a799c62708a4b6e47b99ee5b971b3eae031f1f7f252e478a45688c3900e54fdfb2f30fee4b29105ca4b161dc852cba12812b338ee0a36257e3ee SHA512 2f1fee356b1a2faa01a90751f8d9b651196e6312ee6e157bb096b48ceccdeeaad93b78b1d94f8a43d383744c0a2448b1325cdd97b97283bb420cf1580d4f4f88 -EBUILD uv-0.6.6.ebuild 4373 BLAKE2B d3ad55fb8a18f2d6416186df692373bac1eeb19158ff86dc69dfb37c8ba2eaa98de16547a5075ba264ec515faf9fd84ac735e11a19a4c5947a96ed1e2418582a SHA512 b8afbb60bd276d35c9f6a263a74846026a9b42f62740bb04e3274eb879ff85129ea51e288aa0cabc5005d3df28fe255e9241d8b34a140430186e2543735a9a66 -EBUILD uv-0.6.7.ebuild 4315 BLAKE2B 1884edd37b7a438bb3a519c3357cb06ca95f883cfc2f2782ee4b674db454a5ce15ea4d9b3d0f482457944775add9be8af939bbf3fdd5145a57b8e5261a9539c6 SHA512 690f7c91a8608e97eb1832da35e09dddf4023b6138d445f1d03fb696fd002fa618e1cd84fb1564ebd4b37974790b0dcc5582c383176830190980f23d88c9f9a7 -EBUILD uv-0.6.8.ebuild 4383 BLAKE2B cf791584ad53431dc7eec7a8a7d0d18b84b03b6a5d08b6fb1c658fb8c767c3f8b82e1b39ef210a75b13f433b3ba8dddd7b0941769d096677468271acc9e54be3 SHA512 9c5e11c490c932cfc4dbd06d855a03a6b827fa834d5d65bbd179b0adba25bfab393c8d730308d5d656b9c19ba1d29ff7a517dec49cda5ff52a7bf485e5061028 -EBUILD uv-0.6.9.ebuild 4379 BLAKE2B 76a97efbabc3c367194aec9cca099b97b593d0e737b145ede70956cda39cc230ff5984086f00c68e58ab351a7a10053577f3ce41e6f4c5a1b78a91ed23b818ff SHA512 fefc39ece3423bc40485919b5c0d589ff923c59b970bffbf2593047bf5e2d6175b81deb17b25672e2f599cf90f67f947f739040c1310db7c946f555de2617d7a MISC metadata.xml 336 BLAKE2B 4b5933e24e3e9450dde5da099185dcdf3afb5916b55cffa7c2f3f6fac77e439197cbe4ba529a87f83442d8f87d238e8abef06dc052ce9a62659060ffea9fdb47 SHA512 9910fd10ebbc395b9c330774b74798c9ffdba3bb368347658380a22e01d6dc9d1961ea50fbfb4a904c9db84b94c713c054e418a7294425b86ff41a607fd3e310 diff --git a/dev-python/uv/files/uv-0.6.13-test-ws.patch b/dev-python/uv/files/uv-0.6.13-test-ws.patch new file mode 100644 index 000000000000..bda1b6d0c93a --- /dev/null +++ b/dev-python/uv/files/uv-0.6.13-test-ws.patch @@ -0,0 +1,241 @@ +From 5c69e6e3ed1df9b7a2c85b981129a59bf9aec357 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Sat, 12 Apr 2025 13:20:44 +0200 +Subject: [PATCH] Collapse whitespace in python_list tests + +Collapse whitespace into a single space in python_list tests, in order +to make them agnostic of padding, and therefore pass both with Python +3.12.9 and Python 3.12.10. + +Fixes #12799 +--- + crates/uv/tests/it/common/mod.rs | 7 ++++ + crates/uv/tests/it/python_list.rs | 64 ++++++++++++++++--------------- + 2 files changed, 41 insertions(+), 30 deletions(-) + +diff --git a/crates/uv/tests/it/common/mod.rs b/crates/uv/tests/it/common/mod.rs +index 0c6d491f2..09bbbb2b1 100644 +--- a/crates/uv/tests/it/common/mod.rs ++++ b/crates/uv/tests/it/common/mod.rs +@@ -319,6 +319,13 @@ impl TestContext { + self + } + ++ /// Add a filter that collapses duplicate whitespace. ++ #[must_use] ++ pub fn with_collapsed_whitespace(mut self) -> Self { ++ self.filters.push((r"[ \t]+".to_string(), " ".to_string())); ++ self ++ } ++ + /// Add extra directories and configuration for managed Python installations. + #[must_use] + pub fn with_managed_python_dirs(mut self) -> Self { +diff --git a/crates/uv/tests/it/python_list.rs b/crates/uv/tests/it/python_list.rs +index 347993934..657667861 100644 +--- a/crates/uv/tests/it/python_list.rs ++++ b/crates/uv/tests/it/python_list.rs +@@ -7,7 +7,8 @@ use crate::common::{uv_snapshot, TestContext}; + fn python_list() { + let mut context: TestContext = TestContext::new_with_versions(&["3.11", "3.12"]) + .with_filtered_python_symlinks() +- .with_filtered_python_keys(); ++ .with_filtered_python_keys() ++ .with_collapsed_whitespace(); + + uv_snapshot!(context.filters(), context.python_list().env(EnvVars::UV_TEST_PYTHON_PATH, ""), @r" + success: true +@@ -22,8 +23,8 @@ fn python_list() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] +- cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] ++ cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] ++ cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] + + ----- stderr ----- + "); +@@ -33,7 +34,7 @@ fn python_list() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] ++ cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] + + ----- stderr ----- + "); +@@ -43,7 +44,7 @@ fn python_list() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] ++ cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] + + ----- stderr ----- + "); +@@ -53,8 +54,8 @@ fn python_list() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] +- cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] ++ cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] ++ cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] + + ----- stderr ----- + "); +@@ -64,7 +65,7 @@ fn python_list() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] ++ cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] + + ----- stderr ----- + "); +@@ -74,7 +75,7 @@ fn python_list() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] ++ cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] + + ----- stderr ----- + "); +@@ -87,7 +88,7 @@ fn python_list() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] ++ cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] + + ----- stderr ----- + "); +@@ -108,8 +109,8 @@ fn python_list() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] +- cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] ++ cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] ++ cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] + + ----- stderr ----- + "); +@@ -119,7 +120,7 @@ fn python_list() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] ++ cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] + + ----- stderr ----- + "); +@@ -129,7 +130,8 @@ fn python_list() { + fn python_list_pin() { + let context: TestContext = TestContext::new_with_versions(&["3.11", "3.12"]) + .with_filtered_python_symlinks() +- .with_filtered_python_keys(); ++ .with_filtered_python_keys() ++ .with_collapsed_whitespace(); + + // Pin to a version + uv_snapshot!(context.filters(), context.python_pin().arg("3.12"), @r###" +@@ -146,8 +148,8 @@ fn python_list_pin() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] +- cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] ++ cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] ++ cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] + + ----- stderr ----- + "); +@@ -157,8 +159,8 @@ fn python_list_pin() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] +- cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] ++ cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] ++ cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] + + ----- stderr ----- + "); +@@ -171,7 +173,8 @@ fn python_list_venv() { + .with_filtered_python_keys() + .with_filtered_exe_suffix() + .with_filtered_python_names() +- .with_filtered_virtualenv_bin(); ++ .with_filtered_virtualenv_bin() ++ .with_collapsed_whitespace(); + + // Create a virtual environment + uv_snapshot!(context.filters(), context.venv().arg("--python").arg("3.12").arg("-q"), @r###" +@@ -187,8 +190,8 @@ fn python_list_venv() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] +- cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] ++ cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] ++ cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] + + ----- stderr ----- + "); +@@ -198,8 +201,8 @@ fn python_list_venv() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] +- cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] ++ cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] ++ cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] + + ----- stderr ----- + "); +@@ -285,7 +288,8 @@ fn python_list_unsupported_version() { + fn python_list_duplicate_path_entries() { + let context: TestContext = TestContext::new_with_versions(&["3.11", "3.12"]) + .with_filtered_python_symlinks() +- .with_filtered_python_keys(); ++ .with_filtered_python_keys() ++ .with_collapsed_whitespace(); + + // Construct a `PATH` with all entries duplicated + let path = std::env::join_paths( +@@ -298,8 +302,8 @@ fn python_list_duplicate_path_entries() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] +- cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] ++ cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] ++ cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] + + ----- stderr ----- + "); +@@ -320,8 +324,8 @@ fn python_list_duplicate_path_entries() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] +- cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] ++ cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12] ++ cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11] + + ----- stderr ----- + "); +@@ -341,8 +345,8 @@ fn python_list_duplicate_path_entries() { + success: true + exit_code: 0 + ----- stdout ----- +- cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12]-link/python3 +- cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11]-link/python3 ++ cpython-3.12.[X]-[PLATFORM] [PYTHON-3.12]-link/python3 ++ cpython-3.11.[X]-[PLATFORM] [PYTHON-3.11]-link/python3 + + ----- stderr ----- + "); diff --git a/dev-python/uv/uv-0.6.10.ebuild b/dev-python/uv/uv-0.6.10.ebuild index 6dc8470325ed..c53d9458f32c 100644 --- a/dev-python/uv/uv-0.6.10.ebuild +++ b/dev-python/uv/uv-0.6.10.ebuild @@ -46,7 +46,7 @@ LICENSE+=" # ring crate LICENSE+=" openssl" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86" IUSE="test" RESTRICT="test" PROPERTIES="test_network" @@ -90,6 +90,10 @@ pkg_setup() { src_prepare() { default + # force thin lto, makes build much faster and less memory hungry + # (i.e. makes it possible to actually build uv on 32-bit PPC) + sed -i -e '/lto/s:fat:thin:' Cargo.toml || die + # enable system libraries where supported export ZSTD_SYS_USE_PKG_CONFIG=1 # TODO: unbundle libz-ng-sys, tikv-jemalloc-sys? diff --git a/dev-python/uv/uv-0.6.11.ebuild b/dev-python/uv/uv-0.6.11.ebuild deleted file mode 100644 index 6dc8470325ed..000000000000 --- a/dev-python/uv/uv-0.6.11.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 2024-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" -" - -declare -A GIT_CRATES=( - [async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%' - [pubgrub]='https://github.com/astral-sh/pubgrub;b70cf707aa43f21b32f3a61b8a0889b15032d5c4;pubgrub-%commit%' - [tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%' - [version-ranges]='https://github.com/astral-sh/pubgrub;b70cf707aa43f21b32f3a61b8a0889b15032d5c4;pubgrub-%commit%/version-ranges' -) - -RUST_MIN_VER="1.83.0" - -inherit cargo check-reqs - -CRATE_PV=0.6.10 -DESCRIPTION="A Python package installer and resolver, written in Rust" -HOMEPAGE=" - https://github.com/astral-sh/uv/ - https://pypi.org/project/uv/ -" -# pypi sdist misses scripts/, needed for tests -SRC_URI=" - https://github.com/astral-sh/uv/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz - ${CARGO_CRATE_URIS} -" -if [[ ${PKGBUMPING} != ${PVR} ]]; then - SRC_URI+=" - https://github.com/gentoo-crate-dist/uv/releases/download/${CRATE_PV}/uv-${CRATE_PV}-crates.tar.xz - " -fi - -# most of the code -LICENSE="|| ( Apache-2.0 MIT )" -# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below -# Dependent crate licenses -LICENSE+=" - 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0 - ISC MIT MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB -" -# ring crate -LICENSE+=" openssl" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -IUSE="test" -RESTRICT="test" -PROPERTIES="test_network" - -DEPEND=" - app-arch/bzip2:= - app-arch/xz-utils:= - app-arch/zstd:= -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - test? ( - dev-lang/python:3.8 - dev-lang/python:3.9 - dev-lang/python:3.10 - dev-lang/python:3.11 - dev-lang/python:3.12 - !!~dev-python/uv-0.5.0 - ) -" - -QA_FLAGS_IGNORED="usr/bin/.*" - -check_space() { - local CHECKREQS_DISK_BUILD=3G - use debug && CHECKREQS_DISK_BUILD=9G - check-reqs_pkg_setup -} - -pkg_pretend() { - check_space -} - -pkg_setup() { - check_space - rust_pkg_setup -} - -src_prepare() { - default - - # enable system libraries where supported - export ZSTD_SYS_USE_PKG_CONFIG=1 - # TODO: unbundle libz-ng-sys, tikv-jemalloc-sys? - - # remove unbundled sources, just in case - find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die - - # bzip2-sys requires a pkg-config file - # https://github.com/alexcrichton/bzip2-rs/issues/104 - mkdir "${T}/pkg-config" || die - export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}} - cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die - Name: bzip2 - Version: 9999 - Description: - Libs: -lbz2 - EOF -} - -src_configure() { - local myfeatures=( - git - pypi - python - ) - - cargo_src_configure --no-default-features -} - -src_compile() { - cd crates/uv || die - cargo_src_compile -} - -src_test() { - # work around https://github.com/astral-sh/uv/issues/4376 - local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH} - local -x COLUMNS=100 - local -x PYTHONDONTWRITEBYTECODE= - # fix tests failing because of our config - local -x XDG_CONFIG_DIRS=${T} - - cd crates/uv || die - cargo_src_test --no-fail-fast -} - -src_install() { - cd crates/uv || die - cargo_src_install - - insinto /etc/xdg/uv - newins - uv.toml <<-EOF || die - # These defaults match Fedora, see: - # https://src.fedoraproject.org/rpms/uv/pull-request/18 - - # By default ("automatic"), uv downloads missing Python versions - # automatically and keeps them in the user's home directory. - # Disable that to make downloading opt-in, and especially - # to avoid unnecessarily fetching custom Python when the distro - # package would be preferable. Python builds can still be - # downloaded manually via "uv python install". - # - # https://docs.astral.sh/uv/reference/settings/#python-downloads - python-downloads = "manual" - - # By default ("managed"), uv always prefers self-installed - # Python versions over the system Python, independently - # of versions. Since we generally expect users to use that - # to install old Python versions not in ::gentoo anymore, - # this effectively means that uv would end up preferring very - # old Python versions over the newer ones that are provided - # by the system. Default to using the system versions to avoid - # this counter-intuitive behavior. - # - # https://docs.astral.sh/uv/reference/settings/#python-preference - python-preference = "system" - EOF -} diff --git a/dev-python/uv/uv-0.6.13.ebuild b/dev-python/uv/uv-0.6.13.ebuild index 44cb91d40951..e98d57c5adae 100644 --- a/dev-python/uv/uv-0.6.13.ebuild +++ b/dev-python/uv/uv-0.6.13.ebuild @@ -88,8 +88,17 @@ pkg_setup() { } src_prepare() { + local PATCHES=( + # https://github.com/astral-sh/uv/pull/12851 + "${FILESDIR}/${P}-test-ws.patch" + ) + default + # force thin lto, makes build much faster and less memory hungry + # (i.e. makes it possible to actually build uv on 32-bit PPC) + sed -i -e '/lto/s:fat:thin:' Cargo.toml || die + # enable system libraries where supported export ZSTD_SYS_USE_PKG_CONFIG=1 # TODO: unbundle libz-ng-sys, tikv-jemalloc-sys? diff --git a/dev-python/uv/uv-0.6.12.ebuild b/dev-python/uv/uv-0.6.14.ebuild index 44cb91d40951..45d0f12ff194 100644 --- a/dev-python/uv/uv-0.6.12.ebuild +++ b/dev-python/uv/uv-0.6.14.ebuild @@ -88,8 +88,17 @@ pkg_setup() { } src_prepare() { + local PATCHES=( + # https://github.com/astral-sh/uv/pull/12851 + "${FILESDIR}/uv-0.6.13-test-ws.patch" + ) + default + # force thin lto, makes build much faster and less memory hungry + # (i.e. makes it possible to actually build uv on 32-bit PPC) + sed -i -e '/lto/s:fat:thin:' Cargo.toml || die + # enable system libraries where supported export ZSTD_SYS_USE_PKG_CONFIG=1 # TODO: unbundle libz-ng-sys, tikv-jemalloc-sys? diff --git a/dev-python/uv/uv-0.6.6.ebuild b/dev-python/uv/uv-0.6.6.ebuild deleted file mode 100644 index ea31a134e1f8..000000000000 --- a/dev-python/uv/uv-0.6.6.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 2024-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" -" - -declare -A GIT_CRATES=( - [async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%' - [pubgrub]='https://github.com/astral-sh/pubgrub;b70cf707aa43f21b32f3a61b8a0889b15032d5c4;pubgrub-%commit%' - [tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%' - [version-ranges]='https://github.com/astral-sh/pubgrub;b70cf707aa43f21b32f3a61b8a0889b15032d5c4;pubgrub-%commit%/version-ranges' -) - -RUST_MIN_VER="1.83.0" - -inherit cargo check-reqs - -CRATE_PV=${PV} -DESCRIPTION="A Python package installer and resolver, written in Rust" -HOMEPAGE=" - https://github.com/astral-sh/uv/ - https://pypi.org/project/uv/ -" -# pypi sdist misses scripts/, needed for tests -SRC_URI=" - https://github.com/astral-sh/uv/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz - ${CARGO_CRATE_URIS} -" -if [[ ${PKGBUMPING} != ${PVR} ]]; then - SRC_URI+=" - https://github.com/gentoo-crate-dist/uv/releases/download/${CRATE_PV}/uv-${CRATE_PV}-crates.tar.xz - " -fi - -# most of the code -LICENSE="|| ( Apache-2.0 MIT )" -# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below -# Dependent crate licenses -LICENSE+=" - 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT - MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB -" -# ring crate -LICENSE+=" openssl" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -IUSE="test" -RESTRICT="test" -PROPERTIES="test_network" - -DEPEND=" - app-arch/bzip2:= - app-arch/xz-utils:= - app-arch/zstd:= -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - test? ( - dev-lang/python:3.8 - dev-lang/python:3.9 - dev-lang/python:3.10 - dev-lang/python:3.11 - dev-lang/python:3.12 - !!~dev-python/uv-0.5.0 - ) -" - -QA_FLAGS_IGNORED="usr/bin/.*" - -check_space() { - local CHECKREQS_DISK_BUILD=3G - use debug && CHECKREQS_DISK_BUILD=9G - check-reqs_pkg_setup -} - -pkg_pretend() { - check_space -} - -pkg_setup() { - check_space - rust_pkg_setup -} - -src_prepare() { - default - - # enable system libraries where supported - export ZSTD_SYS_USE_PKG_CONFIG=1 - # TODO: unbundle libz-ng-sys, tikv-jemalloc-sys? - - # remove unbundled sources, just in case - find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die - - # bzip2-sys requires a pkg-config file - # https://github.com/alexcrichton/bzip2-rs/issues/104 - mkdir "${T}/pkg-config" || die - export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}} - cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die - Name: bzip2 - Version: 9999 - Description: - Libs: -lbz2 - EOF -} - -src_configure() { - local myfeatures=( - git - pypi - python - ) - - cargo_src_configure --no-default-features -} - -src_compile() { - cd crates/uv || die - cargo_src_compile -} - -src_test() { - # work around https://github.com/astral-sh/uv/issues/4376 - local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH} - local -x COLUMNS=100 - local -x PYTHONDONTWRITEBYTECODE= - # fix tests failing because of our config - local -x XDG_CONFIG_DIRS=${T} - - cd crates/uv || die - cargo_src_test --no-fail-fast -} - -src_install() { - cd crates/uv || die - cargo_src_install - - insinto /etc/xdg/uv - newins - uv.toml <<-EOF || die - # These defaults match Fedora, see: - # https://src.fedoraproject.org/rpms/uv/pull-request/18 - - # By default ("automatic"), uv downloads missing Python versions - # automatically and keeps them in the user's home directory. - # Disable that to make downloading opt-in, and especially - # to avoid unnecessarily fetching custom Python when the distro - # package would be preferable. Python builds can still be - # downloaded manually via "uv python install". - # - # https://docs.astral.sh/uv/reference/settings/#python-downloads - python-downloads = "manual" - - # By default ("managed"), uv always prefers self-installed - # Python versions over the system Python, independently - # of versions. Since we generally expect users to use that - # to install old Python versions not in ::gentoo anymore, - # this effectively means that uv would end up preferring very - # old Python versions over the newer ones that are provided - # by the system. Default to using the system versions to avoid - # this counter-intuitive behavior. - # - # https://docs.astral.sh/uv/reference/settings/#python-preference - python-preference = "system" - EOF -} diff --git a/dev-python/uv/uv-0.6.7.ebuild b/dev-python/uv/uv-0.6.7.ebuild deleted file mode 100644 index 3a051e0e30a2..000000000000 --- a/dev-python/uv/uv-0.6.7.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 2024-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" -" - -declare -A GIT_CRATES=( - [async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%' - [pubgrub]='https://github.com/astral-sh/pubgrub;b70cf707aa43f21b32f3a61b8a0889b15032d5c4;pubgrub-%commit%' - [tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%' - [version-ranges]='https://github.com/astral-sh/pubgrub;b70cf707aa43f21b32f3a61b8a0889b15032d5c4;pubgrub-%commit%/version-ranges' -) - -RUST_MIN_VER="1.83.0" - -inherit cargo check-reqs - -CRATE_PV=${PV} -DESCRIPTION="A Python package installer and resolver, written in Rust" -HOMEPAGE=" - https://github.com/astral-sh/uv/ - https://pypi.org/project/uv/ -" -# pypi sdist misses scripts/, needed for tests -SRC_URI=" - https://github.com/astral-sh/uv/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz - ${CARGO_CRATE_URIS} - https://github.com/gentoo-crate-dist/uv/releases/download/${CRATE_PV}/uv-${CRATE_PV}-crates.tar.xz -" - -# most of the code -LICENSE="|| ( Apache-2.0 MIT )" -# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below -# Dependent crate licenses -LICENSE+=" - 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT - MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB -" -# ring crate -LICENSE+=" openssl" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -IUSE="test" -RESTRICT="test" -PROPERTIES="test_network" - -DEPEND=" - app-arch/bzip2:= - app-arch/xz-utils:= - app-arch/zstd:= -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - test? ( - dev-lang/python:3.8 - dev-lang/python:3.9 - dev-lang/python:3.10 - dev-lang/python:3.11 - dev-lang/python:3.12 - !!~dev-python/uv-0.5.0 - ) -" - -QA_FLAGS_IGNORED="usr/bin/.*" - -check_space() { - local CHECKREQS_DISK_BUILD=3G - use debug && CHECKREQS_DISK_BUILD=9G - check-reqs_pkg_setup -} - -pkg_pretend() { - check_space -} - -pkg_setup() { - check_space - rust_pkg_setup -} - -src_prepare() { - default - - # enable system libraries where supported - export ZSTD_SYS_USE_PKG_CONFIG=1 - # TODO: unbundle libz-ng-sys, tikv-jemalloc-sys? - - # remove unbundled sources, just in case - find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die - - # bzip2-sys requires a pkg-config file - # https://github.com/alexcrichton/bzip2-rs/issues/104 - mkdir "${T}/pkg-config" || die - export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}} - cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die - Name: bzip2 - Version: 9999 - Description: - Libs: -lbz2 - EOF -} - -src_configure() { - local myfeatures=( - git - pypi - python - ) - - cargo_src_configure --no-default-features -} - -src_compile() { - cd crates/uv || die - cargo_src_compile -} - -src_test() { - # work around https://github.com/astral-sh/uv/issues/4376 - local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH} - local -x COLUMNS=100 - local -x PYTHONDONTWRITEBYTECODE= - # fix tests failing because of our config - local -x XDG_CONFIG_DIRS=${T} - - cd crates/uv || die - cargo_src_test --no-fail-fast -} - -src_install() { - cd crates/uv || die - cargo_src_install - - insinto /etc/xdg/uv - newins - uv.toml <<-EOF || die - # These defaults match Fedora, see: - # https://src.fedoraproject.org/rpms/uv/pull-request/18 - - # By default ("automatic"), uv downloads missing Python versions - # automatically and keeps them in the user's home directory. - # Disable that to make downloading opt-in, and especially - # to avoid unnecessarily fetching custom Python when the distro - # package would be preferable. Python builds can still be - # downloaded manually via "uv python install". - # - # https://docs.astral.sh/uv/reference/settings/#python-downloads - python-downloads = "manual" - - # By default ("managed"), uv always prefers self-installed - # Python versions over the system Python, independently - # of versions. Since we generally expect users to use that - # to install old Python versions not in ::gentoo anymore, - # this effectively means that uv would end up preferring very - # old Python versions over the newer ones that are provided - # by the system. Default to using the system versions to avoid - # this counter-intuitive behavior. - # - # https://docs.astral.sh/uv/reference/settings/#python-preference - python-preference = "system" - EOF -} diff --git a/dev-python/uv/uv-0.6.8.ebuild b/dev-python/uv/uv-0.6.8.ebuild deleted file mode 100644 index 44cb91d40951..000000000000 --- a/dev-python/uv/uv-0.6.8.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 2024-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" -" - -declare -A GIT_CRATES=( - [async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%' - [pubgrub]='https://github.com/astral-sh/pubgrub;b70cf707aa43f21b32f3a61b8a0889b15032d5c4;pubgrub-%commit%' - [tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%' - [version-ranges]='https://github.com/astral-sh/pubgrub;b70cf707aa43f21b32f3a61b8a0889b15032d5c4;pubgrub-%commit%/version-ranges' -) - -RUST_MIN_VER="1.83.0" - -inherit cargo check-reqs - -CRATE_PV=${PV} -DESCRIPTION="A Python package installer and resolver, written in Rust" -HOMEPAGE=" - https://github.com/astral-sh/uv/ - https://pypi.org/project/uv/ -" -# pypi sdist misses scripts/, needed for tests -SRC_URI=" - https://github.com/astral-sh/uv/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz - ${CARGO_CRATE_URIS} -" -if [[ ${PKGBUMPING} != ${PVR} ]]; then - SRC_URI+=" - https://github.com/gentoo-crate-dist/uv/releases/download/${CRATE_PV}/uv-${CRATE_PV}-crates.tar.xz - " -fi - -# most of the code -LICENSE="|| ( Apache-2.0 MIT )" -# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below -# Dependent crate licenses -LICENSE+=" - 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0 - ISC MIT MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB -" -# ring crate -LICENSE+=" openssl" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -IUSE="test" -RESTRICT="test" -PROPERTIES="test_network" - -DEPEND=" - app-arch/bzip2:= - app-arch/xz-utils:= - app-arch/zstd:= -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - test? ( - dev-lang/python:3.8 - dev-lang/python:3.9 - dev-lang/python:3.10 - dev-lang/python:3.11 - dev-lang/python:3.12 - !!~dev-python/uv-0.5.0 - ) -" - -QA_FLAGS_IGNORED="usr/bin/.*" - -check_space() { - local CHECKREQS_DISK_BUILD=3G - use debug && CHECKREQS_DISK_BUILD=9G - check-reqs_pkg_setup -} - -pkg_pretend() { - check_space -} - -pkg_setup() { - check_space - rust_pkg_setup -} - -src_prepare() { - default - - # enable system libraries where supported - export ZSTD_SYS_USE_PKG_CONFIG=1 - # TODO: unbundle libz-ng-sys, tikv-jemalloc-sys? - - # remove unbundled sources, just in case - find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die - - # bzip2-sys requires a pkg-config file - # https://github.com/alexcrichton/bzip2-rs/issues/104 - mkdir "${T}/pkg-config" || die - export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}} - cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die - Name: bzip2 - Version: 9999 - Description: - Libs: -lbz2 - EOF -} - -src_configure() { - local myfeatures=( - git - pypi - python - ) - - cargo_src_configure --no-default-features -} - -src_compile() { - cd crates/uv || die - cargo_src_compile -} - -src_test() { - # work around https://github.com/astral-sh/uv/issues/4376 - local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH} - local -x COLUMNS=100 - local -x PYTHONDONTWRITEBYTECODE= - # fix tests failing because of our config - local -x XDG_CONFIG_DIRS=${T} - - cd crates/uv || die - cargo_src_test --no-fail-fast -} - -src_install() { - cd crates/uv || die - cargo_src_install - - insinto /etc/xdg/uv - newins - uv.toml <<-EOF || die - # These defaults match Fedora, see: - # https://src.fedoraproject.org/rpms/uv/pull-request/18 - - # By default ("automatic"), uv downloads missing Python versions - # automatically and keeps them in the user's home directory. - # Disable that to make downloading opt-in, and especially - # to avoid unnecessarily fetching custom Python when the distro - # package would be preferable. Python builds can still be - # downloaded manually via "uv python install". - # - # https://docs.astral.sh/uv/reference/settings/#python-downloads - python-downloads = "manual" - - # By default ("managed"), uv always prefers self-installed - # Python versions over the system Python, independently - # of versions. Since we generally expect users to use that - # to install old Python versions not in ::gentoo anymore, - # this effectively means that uv would end up preferring very - # old Python versions over the newer ones that are provided - # by the system. Default to using the system versions to avoid - # this counter-intuitive behavior. - # - # https://docs.astral.sh/uv/reference/settings/#python-preference - python-preference = "system" - EOF -} diff --git a/dev-python/uv/uv-0.6.9.ebuild b/dev-python/uv/uv-0.6.9.ebuild deleted file mode 100644 index 2c5cfb758f7e..000000000000 --- a/dev-python/uv/uv-0.6.9.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 2024-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" -" - -declare -A GIT_CRATES=( - [async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%' - [pubgrub]='https://github.com/astral-sh/pubgrub;b70cf707aa43f21b32f3a61b8a0889b15032d5c4;pubgrub-%commit%' - [tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%' - [version-ranges]='https://github.com/astral-sh/pubgrub;b70cf707aa43f21b32f3a61b8a0889b15032d5c4;pubgrub-%commit%/version-ranges' -) - -RUST_MIN_VER="1.83.0" - -inherit cargo check-reqs - -CRATE_PV=0.6.8 -DESCRIPTION="A Python package installer and resolver, written in Rust" -HOMEPAGE=" - https://github.com/astral-sh/uv/ - https://pypi.org/project/uv/ -" -# pypi sdist misses scripts/, needed for tests -SRC_URI=" - https://github.com/astral-sh/uv/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz - ${CARGO_CRATE_URIS} -" -if [[ ${PKGBUMPING} != ${PVR} ]]; then - SRC_URI+=" - https://github.com/gentoo-crate-dist/uv/releases/download/${CRATE_PV}/uv-${CRATE_PV}-crates.tar.xz - " -fi - -# most of the code -LICENSE="|| ( Apache-2.0 MIT )" -# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below -# Dependent crate licenses -LICENSE+=" - 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0 - ISC MIT MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB -" -# ring crate -LICENSE+=" openssl" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86" -IUSE="test" -RESTRICT="test" -PROPERTIES="test_network" - -DEPEND=" - app-arch/bzip2:= - app-arch/xz-utils:= - app-arch/zstd:= -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - test? ( - dev-lang/python:3.8 - dev-lang/python:3.9 - dev-lang/python:3.10 - dev-lang/python:3.11 - dev-lang/python:3.12 - !!~dev-python/uv-0.5.0 - ) -" - -QA_FLAGS_IGNORED="usr/bin/.*" - -check_space() { - local CHECKREQS_DISK_BUILD=3G - use debug && CHECKREQS_DISK_BUILD=9G - check-reqs_pkg_setup -} - -pkg_pretend() { - check_space -} - -pkg_setup() { - check_space - rust_pkg_setup -} - -src_prepare() { - default - - # enable system libraries where supported - export ZSTD_SYS_USE_PKG_CONFIG=1 - # TODO: unbundle libz-ng-sys, tikv-jemalloc-sys? - - # remove unbundled sources, just in case - find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die - - # bzip2-sys requires a pkg-config file - # https://github.com/alexcrichton/bzip2-rs/issues/104 - mkdir "${T}/pkg-config" || die - export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}} - cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die - Name: bzip2 - Version: 9999 - Description: - Libs: -lbz2 - EOF -} - -src_configure() { - local myfeatures=( - git - pypi - python - ) - - cargo_src_configure --no-default-features -} - -src_compile() { - cd crates/uv || die - cargo_src_compile -} - -src_test() { - # work around https://github.com/astral-sh/uv/issues/4376 - local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH} - local -x COLUMNS=100 - local -x PYTHONDONTWRITEBYTECODE= - # fix tests failing because of our config - local -x XDG_CONFIG_DIRS=${T} - - cd crates/uv || die - cargo_src_test --no-fail-fast -} - -src_install() { - cd crates/uv || die - cargo_src_install - - insinto /etc/xdg/uv - newins - uv.toml <<-EOF || die - # These defaults match Fedora, see: - # https://src.fedoraproject.org/rpms/uv/pull-request/18 - - # By default ("automatic"), uv downloads missing Python versions - # automatically and keeps them in the user's home directory. - # Disable that to make downloading opt-in, and especially - # to avoid unnecessarily fetching custom Python when the distro - # package would be preferable. Python builds can still be - # downloaded manually via "uv python install". - # - # https://docs.astral.sh/uv/reference/settings/#python-downloads - python-downloads = "manual" - - # By default ("managed"), uv always prefers self-installed - # Python versions over the system Python, independently - # of versions. Since we generally expect users to use that - # to install old Python versions not in ::gentoo anymore, - # this effectively means that uv would end up preferring very - # old Python versions over the newer ones that are provided - # by the system. Default to using the system versions to avoid - # this counter-intuitive behavior. - # - # https://docs.astral.sh/uv/reference/settings/#python-preference - python-preference = "system" - EOF -} |