From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C1D51158042 for ; Sat, 9 Nov 2024 07:03:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF561E0887; Sat, 9 Nov 2024 07:03:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A1DABE0887 for ; Sat, 9 Nov 2024 07:03:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B4B0133BF39 for ; Sat, 9 Nov 2024 07:03:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E9CE1D6E for ; Sat, 9 Nov 2024 07:03:36 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1731135792.dcf5e91b7e30c40f914361b81e33b023de1d5127.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/uv/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/uv/Manifest dev-python/uv/uv-0.5.0-r1.ebuild X-VCS-Directories: dev-python/uv/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: dcf5e91b7e30c40f914361b81e33b023de1d5127 X-VCS-Branch: master Date: Sat, 9 Nov 2024 07:03:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cf3c3407-9480-4548-961b-801eb01faaf2 X-Archives-Hash: 8bb32f74367b83018852dea58dfc9bd8 commit: dcf5e91b7e30c40f914361b81e33b023de1d5127 Author: Michał Górny gentoo org> AuthorDate: Sat Nov 9 07:03:12 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Nov 9 07:03:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf5e91b dev-python/uv: Remove 0.5.0-r1 This version breaks testing after the upgrade. Will attempt a slightly different solution later today. Signed-off-by: Michał Górny gentoo.org> dev-python/uv/Manifest | 2 - dev-python/uv/uv-0.5.0-r1.ebuild | 168 --------------------------------------- 2 files changed, 170 deletions(-) diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest index 5d15e91d0bd0..5ad75329b5be 100644 --- a/dev-python/uv/Manifest +++ b/dev-python/uv/Manifest @@ -4,5 +4,3 @@ DIST rs-async-zip-011b24604fa7bc223daaad7712c0694bac8f0a87.gh.tar.gz 51706 BLAKE DIST tl-6e25b2ee2513d75385101a8ff9f591ef51f314ec.gh.tar.gz 37106 BLAKE2B c30d1c33f6f52e2bc83823eb6319f8a3e462b7c7408fb6a08f995747857ef234f81db4135a04f9d183095fe473a4087f8f0cb89d8f87ef4400285d2ce034ec22 SHA512 4abbc4240ed129c92da8d616e27a6df0f24cdc85a0803acfdae588ca91f9e5b8d482e3ac88b2e657ff68917b1b43cef1e7ef3c887f624659b231fa5a13fcae68 DIST uv-0.4.30-crates.tar.xz 45786704 BLAKE2B 72a5828c5c504859248312e0d796a6505e4d0546218c8f7f99e37843afdf9496ea1ba4b1f094979299de417accca7f021e4f8971e467429e7d986ed9a3fb2008 SHA512 49abd05fa9e14b1bdb1b4d26f1e68a2038d57bd25c756440bca209b513de42fd8d33ce6e1333392dce65ab427285651809b44e024758359688af5fb87efc19ed DIST uv-0.4.30.gh.tar.gz 2832043 BLAKE2B 11c0d090161b9aa6d6e84d0edb15701c8eaba8281579653d6b0ba84003933f82ec5b71c3c33689e5324e51de70b7af41e4799f35fb45f57ce6d58fafa371a615 SHA512 4930c863aae71ae6e6f5b7ba20ff30ffe4c044f6980f973110d0c8c3079cb4aacbe774fe4577eb8d9c16f5d41d2cd0974c0fe63cf0d10e065c6b8d4cf553b80b -DIST uv-0.5.0-crates.tar.xz 45831504 BLAKE2B 0a95463b47729d40cdaf852ba556626ed3a1d2122f5d5a8bc6c401b95c836fa0ac0726f2aeaceb10346d65c0aa3c5250598c3219244fc3b957d26ee16968d443 SHA512 b991d9aeeec6b4e5d3f3f11a51c66f929560cc75bfc9379f090ba75b243056d4cf174326f8cb31b7aefd7e60e445e05b6799d9d7a8021b0893de436dafb384ab -DIST uv-0.5.0.gh.tar.gz 2836911 BLAKE2B 326279605229675237d239fe5395436cfaa90026011e8195feeedb84333dd96f9fe5a860073776b3c3b2e0c2604d134572322e8ab12f5b72561213b6a2705a65 SHA512 6b9527d650492ccb465167e9e3087482a083997bef5b3dd494b7122a0b176762c2526819278867f42e205a93f283a955879f2431005265db7e808018ac8e3f51 diff --git a/dev-python/uv/uv-0.5.0-r1.ebuild b/dev-python/uv/uv-0.5.0-r1.ebuild deleted file mode 100644 index 944b6b4eeafa..000000000000 --- a/dev-python/uv/uv-0.5.0-r1.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 2024 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;011b24604fa7bc223daaad7712c0694bac8f0a87;rs-async-zip-%commit%' - [pubgrub]='https://github.com/astral-sh/pubgrub;95e1390399cdddee986b658be19587eb1fdb2d79;pubgrub-%commit%' - [reqwest-middleware]='https://github.com/TrueLayer/reqwest-middleware;d95ec5a99fcc9a4339e1850d40378bbfe55ab121;reqwest-middleware-%commit%/reqwest-middleware' - [reqwest-retry]='https://github.com/TrueLayer/reqwest-middleware;d95ec5a99fcc9a4339e1850d40378bbfe55ab121;reqwest-middleware-%commit%/reqwest-retry' - [tl]='https://github.com/charliermarsh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%' - [version-ranges]='https://github.com/astral-sh/pubgrub;95e1390399cdddee986b658be19587eb1fdb2d79;pubgrub-%commit%/version-ranges' -) - -RUST_MIN_VER="1.80.1" - -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://dev.gentoo.org/~mgorny/dist/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-DFS-2016 -" -# 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 - ) -" - -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 - - # remove patch.* that breaks GIT_CRATES - local reqmw=${GIT_CRATES[reqwest-middleware]} - reqmw=${reqmw#*;} - reqmw=${reqmw%;*} - sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-${reqmw}/reqwest-middleware\" }@" 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= - - cd crates/uv || die - cargo_src_test --no-fail-fast -} - -src_install() { - cd crates/uv || die - cargo_src_install - - insinto /etc/uv - newins - uv.toml <<-EOF || die - # By default ("automatic"), uv downloads missing Python versions - # automatically and keeps them in the user's home directory. - # Once installed, they are preferred over system Python install. - # Disable that because 1) autodownloading software is bad, - # 2) we do not want automatically downloaded Pythons to override - # system Pythons installed later. - # - # The user can still manually have uv download and install - # Python via "uv python install". We are not switching - # "python-preference" to allow the user to override the system - # Python with these explicit installs. - # - # Relevant docs: - # https://docs.astral.sh/uv/reference/settings/#python-downloads - # https://docs.astral.sh/uv/reference/settings/#python-preference - - python-downloads = "manual" - EOF -}