From patchwork Sat Apr 26 05:57:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Wong X-Patchwork-Id: 42021 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 21E1527BC4B; Sat, 26 Apr 2025 07:00:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6522E27BC49 for ; Sat, 26 Apr 2025 07:00:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8Ya5-00006H-51; Sat, 26 Apr 2025 02:00:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u8Ya3-00005Q-Bt for guix-patches@gnu.org; Sat, 26 Apr 2025 02:00:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8Ya2-0003eN-Sq for guix-patches@gnu.org; Sat, 26 Apr 2025 02:00:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=CZGf/9MCZ++UXq85+Id2PI8vl4LUEXF/Fsl1lbQ4JP0=; b=hKnYE/KUSL1p47faJZtfXwCyNtO6MuZi0+9yPwp6D/x1348FqS0ozUzzWzlnMjqIzltw9V4UtFHRdmhFGnhd7Vrdy/COcUMA4qN/CHFcIIT4yn0G5086P8www0f11vSrWH56Za0lPEoK4L5eBTSpeDbKTXipSpjFoOFB9zcOAYfEL9O6AMgEen/x9EI28Jg3CiVV3qmsS84ksGQefAUgmBH9JaSpmKMNNRvbuin2f/1IrCW+Qkn8+DHX9q/PD7CKFe8yYrKfCRKXM71WDPnoM4iEK31kdbflxU7bobu5CuQ4G6sD6VIOJF0Lib+go+76HjCYA2Ha3zr7kx65erpsTw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u8Ya2-0005MD-MS for guix-patches@gnu.org; Sat, 26 Apr 2025 02:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77788] [PATCH v2 2/2] gnu: beets: Update to 2.2.0. Resent-From: Andrew Wong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Apr 2025 06:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77788 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77788@debbugs.gnu.org Cc: Andrew Wong Received: via spool by 77788-submit@debbugs.gnu.org id=B77788.174564714920401 (code B ref 77788); Sat, 26 Apr 2025 06:00:02 +0000 Received: (at 77788) by debbugs.gnu.org; 26 Apr 2025 05:59:09 +0000 Received: from localhost ([127.0.0.1]:56974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u8YZB-0005Iz-7d for submit@debbugs.gnu.org; Sat, 26 Apr 2025 01:59:09 -0400 Received: from p-east3-cluster3-host5-snip4-10.eps.apple.com ([57.103.86.53]:64844 helo=outbound.qs.icloud.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u8YZ5-0005Ha-3I for 77788@debbugs.gnu.org; Sat, 26 Apr 2025 01:59:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=CZGf/9MCZ++UXq85+Id2PI8vl4LUEXF/Fsl1lbQ4JP0=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=EVGEX9Am7/8OpgTEMM0S9GFUyd7NY50IdxvZBQkbZGI4VhDlUpfb2umOfkc8vb4wL Mn+Vd7a6qaB8jIV0+bXEgn68Y0d5uVGmyvc4eJ5fQ1A9i8bWP1QZSNivGyv4I4Pfux nccpg8xZTQ+SANDPvJdhwHurfReMtrquvZG2wJOnBALHsmlJbOxvka6HyJzHQIhbBa xTHKln8WBswBZvNW6SWRkXsEdHDdkFwP12wuSjySD2v1MZiTiPagsgwJTx7L8Hlts5 5uqGgaxXZCWzJclI3lQ37MxO/SAeMNm5XoUzGnOIPlmywPeAUiyZRrGVSiG+WIG6CB fgOehcUxSkzSQ== Received: from wongworks.lan (unknown [17.57.155.37]) by outbound.qs.icloud.com (Postfix) with ESMTPSA id 28A06180011E; Sat, 26 Apr 2025 05:58:55 +0000 (UTC) Date: Sat, 26 Apr 2025 01:57:06 -0400 Message-ID: <38b8acabae256df8903a07bcdb4aaeb5ba954aae.1745647026.git.wongandj@icloud.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-GUID: LuyWPuYxsQx3d1GvvGuvnWyJZoY5_Q7d X-Proofpoint-ORIG-GUID: LuyWPuYxsQx3d1GvvGuvnWyJZoY5_Q7d X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-26_02,2025-04-24_02,2025-02-21_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 mlxlogscore=999 adultscore=0 phishscore=0 suspectscore=0 clxscore=1015 bulkscore=0 malwarescore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2411120000 definitions=main-2504260034 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Andrew Wong X-ACL-Warn: , Andrew Wong via Guix-patches X-Patchwork-Original-From: Andrew Wong via Guix-patches via From: Andrew Wong Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/music.scm (beets): Update to 2.2.0. [source]: Add `beets-future-proof-bucket-test.patch` patch. [native-inputs]: Add `python-poetry-core`, `python-pytest-flask`. [inputs]: Add `python-platformdirs`. * gnu/packages/patches/beets-future-proof-bucket-test.patch: New file. Change-Id: I417af8761d801e76fa85ca53b6def556d50440d8 --- gnu/packages/music.scm | 9 ++++- .../beets-future-proof-bucket-test.patch | 39 +++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/beets-future-proof-bucket-test.patch diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 0991755cd4..db62e6d73f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4290,13 +4290,15 @@ (define-public instantmusic (define-public beets (package (name "beets") - (version "2.0.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (pypi-uri "beets" version)) (sha256 (base32 - "1kzqn6f3iw30lav9cwf653w2ns1n09yrys54dqxf6a9ppjsp449v")))) + "05f7sjl6hwarn4d3r5hlsn7gfsx1dlqiy0kl6dg5fi08adzjf2nc")) + ;; Fix myopic test. See + (patches (search-patches "beets-future-proof-bucket-test.patch")))) (build-system pyproject-build-system) (arguments (list @@ -4319,9 +4321,11 @@ (define-public beets (list gobject-introspection python-flask python-mock + python-poetry-core python-py7zr python-pytest python-pytest-cov + python-pytest-flask python-setuptools python-responses python-wheel)) @@ -4335,6 +4339,7 @@ (define-public beets python-mediafile python-munkres python-musicbrainzngs + python-platformdirs python-pyyaml python-typing-extensions python-unidecode diff --git a/gnu/packages/patches/beets-future-proof-bucket-test.patch b/gnu/packages/patches/beets-future-proof-bucket-test.patch new file mode 100644 index 0000000000..48a640d802 --- /dev/null +++ b/gnu/packages/patches/beets-future-proof-bucket-test.patch @@ -0,0 +1,39 @@ +From bcc79a5b09225050ce7c88f63dfa56f49f8782a8 Mon Sep 17 00:00:00 2001 +From: Stefano Rivera +Date: Fri, 27 Dec 2024 16:27:30 -0400 +Subject: [PATCH] Future proof + BucketPluginTest.test_year_single_year_last_folder + +2025 won't be in the future, forever. + +Fixes: https://bugs.debian.org/1091495 +--- + test/plugins/test_bucket.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/test/plugins/test_bucket.py b/test/plugins/test_bucket.py +index b075bc4f2..e3611912a 100644 +--- a/test/plugins/test_bucket.py ++++ b/test/plugins/test_bucket.py +@@ -14,6 +14,8 @@ + + """Tests for the 'bucket' plugin.""" + ++from datetime import datetime ++ + import pytest + + from beets import config, ui +@@ -51,7 +53,8 @@ class BucketPluginTest(BeetsTestCase): + year.""" + self._setup_config(bucket_year=["1950", "1970"]) + assert self.plugin._tmpl_bucket("2014") == "1970" +- assert self.plugin._tmpl_bucket("2025") == "2025" ++ next_year = datetime.now().year + 1 ++ assert self.plugin._tmpl_bucket(str(next_year)) == str(next_year) + + def test_year_two_years(self): + """Buckets can be named with the 'from-to' syntax.""" +-- +2.49.0 +