From patchwork Tue Apr 22 04:26:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Wong X-Patchwork-Id: 41914 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 BF20127BC4A; Tue, 22 Apr 2025 05:27:23 +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=unavailable 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 CA2D027BC49 for ; Tue, 22 Apr 2025 05:27:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u75Du-0001gz-GN; Tue, 22 Apr 2025 00:27:07 -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 1u75Dr-0001gi-9M for guix-patches@gnu.org; Tue, 22 Apr 2025 00:27: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 1u75Dr-0001Tn-09 for guix-patches@gnu.org; Tue, 22 Apr 2025 00:27:03 -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:Date:From:To:Subject; bh=qOhF7nwIuoDogSj1Y7kiRCO0asWuZ9Or08P1VM6iroc=; b=cEv2q9CXtWK0EDYmuw0zHZBQmvg+Q1Ikxg4CRS10UcZm2DkBzKWNuDwVlqhyApt3uMjGdXHUn+uAolZNTnyqtwZfFAwpWqqq3+OYhfWj4olI6lWSvtyuibIchi839seoxxO2QdSLtL1R08hDACGS248+/H9Pua3yEfR95JvjpPX4vX/lxFLMsBFCMMLLVEB28zPeG4TqbZLsRLIw19nVRFzU1Ma9nFoLGHa0Xb+MeyVmQ6b2sQ+qWzZGqZ431kmbGuyuHRNvQ3HbxO+76LvxkDdjPrIY/2HAYFD5qYyQCnGGjopTrvf5zG9lLb9d+CblY46qgFyoUUxz81RKB6mGzA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u75Dp-0000Gj-SU for guix-patches@gnu.org; Tue, 22 Apr 2025 00:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77979] [PATCH] gnu: beets: Update to 2.2.0. Resent-From: Andrew Wong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Apr 2025 04:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77979 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77979@debbugs.gnu.org Cc: Andrew Wong X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17452960141007 (code B ref -1); Tue, 22 Apr 2025 04:27:01 +0000 Received: (at submit) by debbugs.gnu.org; 22 Apr 2025 04:26:54 +0000 Received: from localhost ([127.0.0.1]:42841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u75Dh-0000G9-Og for submit@debbugs.gnu.org; Tue, 22 Apr 2025 00:26:54 -0400 Received: from lists.gnu.org ([2001:470:142::17]:49162) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u75Db-0000Fa-OE for submit@debbugs.gnu.org; Tue, 22 Apr 2025 00:26:51 -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 1u75DR-0001bc-0J for guix-patches@gnu.org; Tue, 22 Apr 2025 00:26:38 -0400 Received: from p-east3-cluster2-host3-snip6-1.eps.apple.com ([2a01:b747:3006:207::18] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u75DP-0001Sa-0U for guix-patches@gnu.org; Tue, 22 Apr 2025 00:26:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=qOhF7nwIuoDogSj1Y7kiRCO0asWuZ9Or08P1VM6iroc=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=sBfuPjXGwqPTpEBAsHQrRGMjOqPbOTt0bvZGu3t4z86aD3rZ2f0xkBK0AKA/BafFe sx/vupOTeeYB3fWbocA/nmBExLYIKU2z5JO2LUHzZq2ItIP6ycBvSm9AXdmYoyJTc0 Gv3chvhASe9yuHE1+E+NDJqfZtYB6oGb/FVTkkI+hG599KAW7f5ZEKd3kI0wAPgC5p 6z24jJnAw1fsX/FCc16eyr3wmntAqwcpX5bDK5kheUTnh8Nybix9WIJU4JQUNHKRak Z4gew/kHIVC9zT6fb4XZAZYewquMkDA9YC1jJ1hg9XWf9mm7qTZVXQwgYhXwWdJlU/ 9UBa9D3Jifglg== Received: from wongworks.lan (qs-asmtp-me-k8s.p00.prod.me.com [17.57.155.37]) by outbound.qs.icloud.com (Postfix) with ESMTPSA id 1909918000B1; Tue, 22 Apr 2025 04:26:28 +0000 (UTC) Date: Tue, 22 Apr 2025 00:26:01 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: X9MG4TAUKumWmFCxkpEBrQBdDt8u2G9W X-Proofpoint-GUID: X9MG4TAUKumWmFCxkpEBrQBdDt8u2G9W X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-22_02,2025-04-21_02,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 suspectscore=0 mlxlogscore=999 adultscore=0 spamscore=0 clxscore=1015 bulkscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2411120000 definitions=main-2504220032 Received-SPF: pass client-ip=2a01:b747:3006:207::18; envelope-from=wongandj@icloud.com; helo=outbound.qs.icloud.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: I57e58d8fd7117a93f2b17e1a155871e963d2a881 --- gnu/packages/music.scm | 15 ++++--- .../beets-future-proof-bucket-test.patch | 39 +++++++++++++++++++ 2 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/beets-future-proof-bucket-test.patch base-commit: f7c41ab31f5023023385500f6eb9083d23dd1ccb diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 0759c3d3c1..c80b457657 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4280,13 +4280,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 @@ -4309,9 +4311,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)) @@ -4325,6 +4329,7 @@ (define-public beets python-mediafile python-munkres python-musicbrainzngs + python-platformdirs python-pyyaml python-typing-extensions python-unidecode @@ -5116,13 +5121,13 @@ (define-public seq24 (define-public python-discogs-client (package (name "python-discogs-client") - (version "2.3.12") + (version "2.8") (source (origin (method url-fetch) - (uri (pypi-uri "python3-discogs-client" version)) + (uri (pypi-uri "python3_discogs_client" version)) (sha256 (base32 - "1zmib0i9jicv9fyphgkcrk418qmpv3l4p38ibl31sh237ki5xqw9")))) + "0fxk8q8z5v5l961d9z2ywq49i2fz50h074p81zv6w6j9zzs7fb0g")))) (build-system python-build-system) (propagated-inputs (list python-dateutil python-oauthlib python-requests)) 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 +