From 3a12645726ce0bd80ffcbaacfe4614c3669e53ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 18 May 2025 14:14:47 +0200 Subject: [PATCH] dev-python/uv: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/uv/Manifest | 7 - dev-python/uv/files/uv-0.6.13-test-ws.patch | 241 -------------------- dev-python/uv/uv-0.6.10.ebuild | 174 -------------- dev-python/uv/uv-0.6.13.ebuild | 179 --------------- dev-python/uv/uv-0.6.14.ebuild | 179 --------------- 5 files changed, 780 deletions(-) delete mode 100644 dev-python/uv/files/uv-0.6.13-test-ws.patch delete mode 100644 dev-python/uv/uv-0.6.10.ebuild delete mode 100644 dev-python/uv/uv-0.6.13.ebuild delete mode 100644 dev-python/uv/uv-0.6.14.ebuild diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest index cb88220b733f..9ed79b6a133b 100644 --- a/dev-python/uv/Manifest +++ b/dev-python/uv/Manifest @@ -1,12 +1,5 @@ DIST pubgrub-a3b4db3abb1829ce889fb89fa6d157fef529ef7e.gh.tar.gz 99183 BLAKE2B 9bde0e9332fd461a67319b7b8a187e8e78f5c3c84a32c340f40800ee2499e8c4d3faf41ec66e280198550d9f638998128d1ef4a161f4d43eb6906a013993e146 SHA512 3e434326040445b836bbbb5e3af186a480198cae3d9b3bc78fa1e8c7f78b558ef15de88c6c941d25ada6be80ca7bb5cf1e1c10647b3e991aeb44cb58acccff35 -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.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.17-crates.tar.xz 58061436 BLAKE2B d86afdb51411ceabb529f7b23dfc10b85eac27b012aca1785a4f9d47c758ef9043ed84ae843c66f55a48ad24b21c2c8c89edad4b6043ac27c82c529db0ee4e28 SHA512 30a7770d2f45db03a618adada46fd1d8a000a940f5750a0c16ec7261c232ee7909d38f4725f82457580e34575342e256bbcc7378e0bec06b69bec17c9c0e69f5 DIST uv-0.6.17.gh.tar.gz 3995730 BLAKE2B 368a877294dc9e1e1f29599b5589242899f9a6cf5767b6fa10d5987d18a1cb6704aad34ad136522ac3256cc0802bad4442bebde94ff4e3dd6d7763b73fa8cca1 SHA512 aae465ef02a29a856f4de69230f77d31149c95ed5a88e489b46c34aa61020f29dcf406168abea77626e7d5297b2e004a89445f343e3ee763c297981b0d50233a 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 deleted file mode 100644 index bda1b6d0c93a..000000000000 --- a/dev-python/uv/files/uv-0.6.13-test-ws.patch +++ /dev/null @@ -1,241 +0,0 @@ -From 5c69e6e3ed1df9b7a2c85b981129a59bf9aec357 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -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 deleted file mode 100644 index 78f9a11409d3..000000000000 --- a/dev-python/uv/uv-0.6.10.ebuild +++ /dev/null @@ -1,174 +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 - - # 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? - - # 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 deleted file mode 100644 index 50c3bc680d8d..000000000000 --- a/dev-python/uv/uv-0.6.13.ebuild +++ /dev/null @@ -1,179 +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() { - 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? - - # 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.14.ebuild b/dev-python/uv/uv-0.6.14.ebuild deleted file mode 100644 index 78c772faad68..000000000000 --- a/dev-python/uv/uv-0.6.14.ebuild +++ /dev/null @@ -1,179 +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() { - 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? - - # 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 -}