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 091F615802C for ; Thu, 19 Dec 2024 07:54:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C863E07A9; Thu, 19 Dec 2024 07:54:22 +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 76D28E07A9 for ; Thu, 19 Dec 2024 07:54:20 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 56CBB3409C8 for ; Thu, 19 Dec 2024 07:54:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A76121048 for ; Thu, 19 Dec 2024 07:54:17 +0000 (UTC) From: "Arsen Arsenović" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arsen Arsenović" Message-ID: <1734594569.b85f73d7d068ec2275ad8324883edd0ea25c6535.arsen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/beets/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/beets/Manifest media-sound/beets/beets-9999.ebuild X-VCS-Directories: media-sound/beets/ X-VCS-Committer: arsen X-VCS-Committer-Name: Arsen Arsenović X-VCS-Revision: b85f73d7d068ec2275ad8324883edd0ea25c6535 X-VCS-Branch: master Date: Thu, 19 Dec 2024 07:54:17 +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: e92f282d-0fd9-43a3-a5c4-acff53c1dba8 X-Archives-Hash: fd996f0bea3bd8a8c56e7a685f7c98ea commit: b85f73d7d068ec2275ad8324883edd0ea25c6535 Author: Arsen Arsenović gentoo org> AuthorDate: Sun Dec 15 23:32:46 2024 +0000 Commit: Arsen Arsenović gentoo org> CommitDate: Thu Dec 19 07:49:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b85f73d7 media-sound/beets: update live Most of the work done by Kangie. Co-authored-by: Matt Jolly gentoo.org> Signed-off-by: Arsen Arsenović gentoo.org> media-sound/beets/Manifest | 1 + media-sound/beets/beets-9999.ebuild | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest index 7e408c416fcb..e0b9bcf57b14 100644 --- a/media-sound/beets/Manifest +++ b/media-sound/beets/Manifest @@ -1 +1,2 @@ DIST beets-1.7.0_pre20240501.gh.tar.gz 2247319 BLAKE2B e215c8a2a30a44d298746351be4fa2de1cebb7d6aec2bc7dfc679b133ea5eddefec20d038aa1aa1d734b176c09163b93f917c6c29ea5115c4c2349e090c8c5df SHA512 f397c72b481d7d8822db598ab37c99d0b9063ae45455c0d34116fab7b5a4cc683a3357bdfe436181b1dea46ee05192cc37faf355b5e093d63c2e440e523b92bc +DIST beets-2.2.0.gh.tar.gz 2414560 BLAKE2B 24c68b27c0d35afb26a39505810ba8ae224173c6f0e36ca551f32cb78250a6b0e777a603c47fd18b6d7e6cdecc5fcaa6b64fe4fd33379de8d6b545dbd49f369f SHA512 ff3a2ea7820129f4b793766ac7dbe3bcfb353563ed3b64ada47db3ba64930caa5841f6cbd20e97e58a4a9eb340bc9e8cd90c7fc188f11420a3cb680ea7a25e48 diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild index ed8336d62a74..d369086b7ef3 100644 --- a/media-sound/beets/beets-9999.ebuild +++ b/media-sound/beets/beets-9999.ebuild @@ -5,7 +5,8 @@ EAPI=8 DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{10..12} ) +# Passes tests with python3_13 but dev-python/audioread is problematic +PYTHON_COMPAT=( python3_{11..12} ) PYTHON_REQ_USE="sqlite" # These envvars are used to treat github tarball builds differently @@ -17,6 +18,8 @@ inherit distutils-r1 bash-completion-r1 multiprocessing optfeature if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/beetbox/beets.git" + IS_VCS_SOURCE="yes" + UPDATE_VERSION="yes" inherit git-r3 else inherit pypi @@ -62,12 +65,14 @@ BDEPEND=" dev-db/sqlite[icu] dev-python/beautifulsoup4[${PYTHON_USEDEP}] dev-python/bluelet[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] dev-python/python3-discogs-client[${PYTHON_USEDEP}] dev-python/flask[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] dev-python/pyacoustid[${PYTHON_USEDEP}] dev-python/pylast[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pytest-flask[${PYTHON_USEDEP}] dev-python/python-mpd2[${PYTHON_USEDEP}] dev-python/pyxdg[${PYTHON_USEDEP}] dev-python/reflink[${PYTHON_USEDEP}] @@ -105,13 +110,10 @@ EPYTEST_XDIST=1 distutils_enable_tests pytest src_prepare() { - # https://github.com/beetbox/beets/commit/8b4983fe7cae9397acd3e23602e419d8dc1041d4 - # merged code coverage into standard test runs; since we disable coverage globally - # we need to sed out some 'addopts' for coverage in setup.cfg that cause tests to choke. - #sed -i -e "/--cov=beets/,+9d" setup.cfg || die "Failed to disable code coverage options in setup.cfg" - # Update the version if we're not building from pypy; it's probably a _pre or live ebuild. if [[ ${PV} == "9999" ]] || [[ ${UPDATE_VERSION} == "yes" ]]; then - sed -i -e "s/^version = \".*\"$/version = \"${PV}\"/" pyproject.toml || die "Failed to update version in VCS sources" + sed -i -e "s/^version = \".*\"$/version = \"${PV}\"/" \ + pyproject.toml \ + || die "Failed to update version in VCS sources" sed -i -e "s/__version__ = \".*\"/__version__ = \"${PV}\"/" beets/__init__.py fi default @@ -137,11 +139,8 @@ python_compile_all() { } python_test() { - # https://github.com/beetbox/beets/issues/5243 testing bash completions is broken. - local EPYTEST_DESELECT=( - test/test_ui.py::CompletionTest::test_completion - ) - epytest -n$(makeopts_jobs) -v --no-cov + # test/test_art_resize.py can be flaky, parallelisation? + epytest -n$(makeopts_jobs) -v } python_install_all() { @@ -169,4 +168,5 @@ python_install_all() { optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick" optfeature "webserver support" dev-python/flask optfeature "webserver cors support" dev-python/flask-cors + optfeature "Amarok metadata synchronisation" dev-python/dbus-python }