From patchwork Sun Aug 29 18:51:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Streit X-Patchwork-Id: 32450 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 23A9127BBE4; Tue, 31 Aug 2021 22:41:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C4D6927BBE3 for ; Tue, 31 Aug 2021 22:41:09 +0100 (BST) Received: from localhost ([::1]:46476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLBVE-000338-RA for patchwork@mira.cbaines.net; Tue, 31 Aug 2021 17:41:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLBV8-00030y-0T for guix-patches@gnu.org; Tue, 31 Aug 2021 17:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52279) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mLBV7-0005fv-PI for guix-patches@gnu.org; Tue, 31 Aug 2021 17:41:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mLBV7-0004oJ-Kf for guix-patches@gnu.org; Tue, 31 Aug 2021 17:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50309] [PATCH 1/5] gnu: python-confuse: Update to 1.5.0. References: In-Reply-To: Resent-From: Simon Streit Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Aug 2021 21:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50309@debbugs.gnu.org Received: via spool by 50309-submit@debbugs.gnu.org id=B50309.163044601018394 (code B ref 50309); Tue, 31 Aug 2021 21:41:01 +0000 Received: (at 50309) by debbugs.gnu.org; 31 Aug 2021 21:40:10 +0000 Received: from localhost ([127.0.0.1]:35589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBUI-0004ma-E9 for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:40:10 -0400 Received: from smtprelay06.ispgateway.de ([80.67.31.95]:32658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBUF-0004mJ-7w for 50309@debbugs.gnu.org; Tue, 31 Aug 2021 17:40:09 -0400 Received: from [79.252.144.124] (helo=motorball) by smtprelay06.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mLBRt-0006CC-1f; Tue, 31 Aug 2021 23:37:41 +0200 From: Simon Streit Date: Sun, 29 Aug 2021 20:51:43 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-confuse): Update to 1.5.0. --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.33.0 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 59eb473857..b61b585713 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -106,6 +106,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Hugo Lecomte ;;; Copyright © 2021 Franck Pérignon +;;; Copyright © 2021 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -25669,20 +25670,20 @@ Qt applications.") (define-public python-confuse (package (name "python-confuse") - (version "1.4.0") + (version "1.5.0") (source (origin (method url-fetch) (uri (pypi-uri "confuse" version)) (sha256 (base32 - "0r74djc8r6lfx6ldsqnhpvfsn256gsfzbl33qcm77hp2qr8h9z4j")))) + "0bh2kyj8wd7h9gg4nsvrbykl5ly0f70f0wi3fbm204b1f0fcmywj")))) (build-system python-build-system) (propagated-inputs `(("python-pathlib" ,python-pathlib) ("python-pyyaml" ,python-pyyaml))) (home-page "https://github.com/beetbox/confuse") - (synopsis "Painless YAML configuration.") + (synopsis "Painless YAML configuration") (description "Confuse is a configuration library for Python that uses YAML. It takes care of defaults, overrides, type checking, command-line integration, human-readable errors, and standard OS-specific locations.") From patchwork Sun Aug 29 18:57:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Streit X-Patchwork-Id: 32451 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 B647427BBE4; Tue, 31 Aug 2021 22:41:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6F2F927BBE3 for ; Tue, 31 Aug 2021 22:41:10 +0100 (BST) Received: from localhost ([::1]:46490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLBVF-00034E-Ht for patchwork@mira.cbaines.net; Tue, 31 Aug 2021 17:41:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLBV8-00031J-A9 for guix-patches@gnu.org; Tue, 31 Aug 2021 17:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52280) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mLBV8-0005g3-2B for guix-patches@gnu.org; Tue, 31 Aug 2021 17:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mLBV8-0004oR-0P for guix-patches@gnu.org; Tue, 31 Aug 2021 17:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50309] [PATCH 2/5] gnu: python-pyacoustid: Update to 1.2.1. References: In-Reply-To: Resent-From: Simon Streit Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Aug 2021 21:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50309@debbugs.gnu.org Received: via spool by 50309-submit@debbugs.gnu.org id=B50309.163044603718451 (code B ref 50309); Tue, 31 Aug 2021 21:41:01 +0000 Received: (at 50309) by debbugs.gnu.org; 31 Aug 2021 21:40:37 +0000 Received: from localhost ([127.0.0.1]:35592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBUi-0004nX-Qk for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:40:37 -0400 Received: from smtprelay08.ispgateway.de ([134.119.228.111]:31960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBUg-0004nN-3b for 50309@debbugs.gnu.org; Tue, 31 Aug 2021 17:40:35 -0400 Received: from [79.252.144.124] (helo=motorball) by smtprelay08.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mLBTY-0003dW-Jd; Tue, 31 Aug 2021 23:39:24 +0200 From: Simon Streit Date: Sun, 29 Aug 2021 20:57:06 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mp3.scm (python-pyacoustid): Update to 1.2.1. --- gnu/packages/mp3.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 9de9055e51..2ad19e9e10 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2021 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -645,19 +646,19 @@ FFmpeg, etc.") (define-public python-pyacoustid (package (name "python-pyacoustid") - (version "1.1.7") + (version "1.2.1") (source (origin (method url-fetch) (uri (pypi-uri "pyacoustid" version)) (sha256 (base32 - "1zan6c22ca6sjy0g9ajwjp6mkzw7jv8r3n7jzska09a6x254lf87")))) + "115svv5mkz6lq4rzwpjgs61psprmbl7p0bwdfl4dbsn5zcljjaz6")))) (build-system python-build-system) (propagated-inputs `(("python-audioread" ,python-audioread) ("python-requests" ,python-requests))) - (home-page "https://github.com/sampsyo/pyacoustid") + (home-page "https://github.com/beetbox/pyacoustid") (synopsis "Bindings for Chromaprint acoustic fingerprinting") (description "This package provides bindings for the Chromaprint acoustic From patchwork Sun Aug 29 19:05:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Streit X-Patchwork-Id: 32452 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 259A227BBE5; Tue, 31 Aug 2021 22:42:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C637927BBE3 for ; Tue, 31 Aug 2021 22:42:18 +0100 (BST) Received: from localhost ([::1]:46958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLBWL-0003U1-UI for patchwork@mira.cbaines.net; Tue, 31 Aug 2021 17:42:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLBW7-0003TX-6S for guix-patches@gnu.org; Tue, 31 Aug 2021 17:42:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52287) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mLBW6-0006R1-EE for guix-patches@gnu.org; Tue, 31 Aug 2021 17:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mLBW6-0004qF-CU for guix-patches@gnu.org; Tue, 31 Aug 2021 17:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50309] [PATCH 3/5] gnu: python-mediafile: Update to 0.7.0. References: In-Reply-To: Resent-From: Simon Streit Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Aug 2021 21:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50309@debbugs.gnu.org Received: via spool by 50309-submit@debbugs.gnu.org id=B50309.163044608818557 (code B ref 50309); Tue, 31 Aug 2021 21:42:02 +0000 Received: (at 50309) by debbugs.gnu.org; 31 Aug 2021 21:41:28 +0000 Received: from localhost ([127.0.0.1]:35597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBVT-0004p8-4h for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:41:28 -0400 Received: from smtprelay01.ispgateway.de ([80.67.31.24]:14323) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBVR-0004oz-Bt for 50309@debbugs.gnu.org; Tue, 31 Aug 2021 17:41:22 -0400 Received: from [79.252.144.124] (helo=motorball) by smtprelay01.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mLBVv-0003rI-W7; Tue, 31 Aug 2021 23:41:52 +0200 From: Simon Streit Date: Sun, 29 Aug 2021 21:05:01 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Remove patch. It is now included in upstream release. * gnu/packages/music.scm (python-mediafile): Update to 0.7.0. * gnu/packages/patches/python-mediafile-wavpack.patch: Delete patch. --- gnu/packages/music.scm | 7 ++- .../patches/python-mediafile-wavpack.patch | 57 ------------------- 2 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 gnu/packages/patches/python-mediafile-wavpack.patch diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b95be813dc..c417e22804 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2021 Rovanion Luckey ;;; Copyright © 2021 Justin Veilleux ;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2021 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -3604,15 +3605,15 @@ streams on an individual packet/page level.") (define-public python-mediafile (package (name "python-mediafile") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (pypi-uri "mediafile" version)) - (patches (search-patches "python-mediafile-wavpack.patch")) + ;; (patches (search-patches "python-mediafile-wavpack.patch")) (sha256 (base32 - "0jmsp3f57xj35ayp8b6didk85nxgl3viw34s5px3l5dwgc055yx3")))) + "0fvxhiypf5qp1m9gzd0bik5wnfcm8sd7xivd02d6d0ml85qxwcwg")))) (build-system python-build-system) (propagated-inputs `(("python-mutagen" ,python-mutagen) diff --git a/gnu/packages/patches/python-mediafile-wavpack.patch b/gnu/packages/patches/python-mediafile-wavpack.patch deleted file mode 100644 index 9839fe87b5..0000000000 --- a/gnu/packages/patches/python-mediafile-wavpack.patch +++ /dev/null @@ -1,57 +0,0 @@ -This patch has already been applied upstream, but is not included in the -current release 0.6.0. - -From d2fc3b59f77c515b02dfe7ad936f89264375d2b4 Mon Sep 17 00:00:00 2001 -From: Adrian Sampson -Date: Wed, 29 Jul 2020 19:42:57 -0400 -Subject: [PATCH] Fix test for WavPack bitrate - -Fixes #34. ---- - docs/index.rst | 5 +++++ - mediafile.py | 2 +- - test/test_mediafile.py | 2 +- - 3 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/docs/index.rst b/docs/index.rst -index 7b622df..1465405 100644 ---- a/docs/index.rst -+++ b/docs/index.rst -@@ -100,6 +100,11 @@ Internals - Changelog - --------- - -+v0.7.0 -+'''''' -+ -+- Mutagen 1.45.0 or later is now required. -+ - v0.6.0 - '''''' - -diff --git a/mediafile.py b/mediafile.py -index 23fadaf..9e9d063 100644 ---- a/mediafile.py -+++ b/mediafile.py -@@ -56,7 +56,7 @@ - import six - - --__version__ = '0.6.0' -+__version__ = '0.7.0' - __all__ = ['UnreadableFileError', 'FileTypeError', 'MediaFile'] - - log = logging.getLogger(__name__) -diff --git a/test/test_mediafile.py b/test/test_mediafile.py -index e9e1850..7f17f44 100644 ---- a/test/test_mediafile.py -+++ b/test/test_mediafile.py -@@ -907,7 +907,7 @@ class WavpackTest(ReadWriteTestBase, unittest.TestCase): - 'bitrate': 109312, - 'format': u'WavPack', - 'samplerate': 44100, -- 'bitdepth': 0, -+ 'bitdepth': 16, - 'channels': 1, - } - From patchwork Sun Aug 29 20:44:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Streit X-Patchwork-Id: 32453 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 7534527BBE4; Tue, 31 Aug 2021 22:42:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4C10D27BBE3 for ; Tue, 31 Aug 2021 22:42:20 +0100 (BST) Received: from localhost ([::1]:47006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLBWN-0003Vx-Cp for patchwork@mira.cbaines.net; Tue, 31 Aug 2021 17:42:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLBWB-0003Ut-DB for guix-patches@gnu.org; Tue, 31 Aug 2021 17:42:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52288) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mLBW7-0006R2-6U for guix-patches@gnu.org; Tue, 31 Aug 2021 17:42:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mLBW6-0004qM-OX for guix-patches@gnu.org; Tue, 31 Aug 2021 17:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50309] [PATCH 4/5] gnu: beets-bandcamp: Update to 0.1.4. References: In-Reply-To: Resent-From: Simon Streit Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Aug 2021 21:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50309@debbugs.gnu.org Received: via spool by 50309-submit@debbugs.gnu.org id=B50309.163044610618589 (code B ref 50309); Tue, 31 Aug 2021 21:42:02 +0000 Received: (at 50309) by debbugs.gnu.org; 31 Aug 2021 21:41:46 +0000 Received: from localhost ([127.0.0.1]:35600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBVq-0004pl-Ee for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:41:46 -0400 Received: from smtprelay01.ispgateway.de ([80.67.31.24]:52761) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBVo-0004pd-W4 for 50309@debbugs.gnu.org; Tue, 31 Aug 2021 17:41:45 -0400 Received: from [79.252.144.124] (helo=motorball) by smtprelay01.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mLBWK-0005LQ-De; Tue, 31 Aug 2021 23:42:16 +0200 From: Simon Streit Date: Sun, 29 Aug 2021 22:44:25 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/music.scm (beets-bandcamp): Update to 0.1.4. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.33.0 diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c417e22804..63c6ac7d19 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3919,13 +3919,13 @@ websites such as Libre.fm.") (define-public beets-bandcamp (package (name "beets-bandcamp") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) (uri (pypi-uri "beets-bandcamp" version)) (sha256 (base32 - "04awg0zdhhg5h510fc1p3qkvr2l1qm6nf85hlr9z8im8a7xlka0i")))) + "0dwbdkrb9c0ppzm5s78h47ndpr88cw1k0z8fgfhkl706wazx2ddg")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; there are no tests (propagated-inputs From patchwork Tue Aug 31 20:11:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Streit X-Patchwork-Id: 32454 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 6F53F27BBE1; Tue, 31 Aug 2021 22:43:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 397EB27BBE3 for ; Tue, 31 Aug 2021 22:43:21 +0100 (BST) Received: from localhost ([::1]:47392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLBXM-0003oa-BT for patchwork@mira.cbaines.net; Tue, 31 Aug 2021 17:43:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLBX5-0003oG-2y for guix-patches@gnu.org; Tue, 31 Aug 2021 17:43:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52292) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mLBX4-00073n-79 for guix-patches@gnu.org; Tue, 31 Aug 2021 17:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mLBX4-0004s5-5G for guix-patches@gnu.org; Tue, 31 Aug 2021 17:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50309] [PATCH 5/5] gnu: beets: Update to 1.5.0. References: In-Reply-To: Resent-From: Simon Streit Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Aug 2021 21:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50309@debbugs.gnu.org Received: via spool by 50309-submit@debbugs.gnu.org id=B50309.163044613218661 (code B ref 50309); Tue, 31 Aug 2021 21:43:02 +0000 Received: (at 50309) by debbugs.gnu.org; 31 Aug 2021 21:42:12 +0000 Received: from localhost ([127.0.0.1]:35605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBWF-0004qu-Li for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:42:12 -0400 Received: from smtprelay04.ispgateway.de ([80.67.31.32]:54263) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBWC-0004qj-Cs for 50309@debbugs.gnu.org; Tue, 31 Aug 2021 17:42:10 -0400 Received: from [79.252.144.124] (helo=motorball) by smtprelay04.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mLBU2-0006O8-Od; Tue, 31 Aug 2021 23:39:54 +0200 From: Simon Streit Date: Tue, 31 Aug 2021 22:11:51 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/music.scm (beets): Update to 1.5.0. * gnu/packages/music.scm (beets-next): Delete variable. * gnu/packages/patches/beets-werkzeug-compat.patch: Delete patch. --- gnu/packages/music.scm | 108 +++++------------- .../patches/beets-werkzeug-compat.patch | 18 --- 2 files changed, 30 insertions(+), 96 deletions(-) delete mode 100644 gnu/packages/patches/beets-werkzeug-compat.patch diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 63c6ac7d19..8158a40e49 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3788,34 +3788,32 @@ websites such as Libre.fm.") (define-public beets (package (name "beets") - (version "1.4.9") + (version "1.5.0") (source (origin (method url-fetch) (uri (pypi-uri "beets" version)) - (patches (search-patches "beets-werkzeug-compat.patch")) (sha256 (base32 - "0m40rjimvfgy1dv04p8f8d5dvi2855v4ix99a9xr900cmcn476yj")))) + "0arl4nc3y8iwa331hf6ggai19y8ns9pl03g5d6ac857wq2x7nzw8")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - ;; Reported upstream: . - ;; Disable the faulty test as the fix is unclear. + ;; Test fails. Reported upstream: + ;; https://github.com/beetbox/beets/issues/4037. (add-after 'unpack 'disable-failing-tests (lambda _ - (substitute* "test/test_mediafile.py" - (("def test_read_audio_properties") "def _test_read_audio_properties")) + (substitute* "test/test_zero.py" + (("def test_album_art") "def _test_album_art")) #t)) (add-after 'unpack 'set-HOME (lambda _ (setenv "HOME" (string-append (getcwd) "/tmp")) #t)) (replace 'check - (lambda _ - (invoke "nosetests" "-v"))) - ;; Wrap the executable, so it can find python-gi (aka pygobject) and - ;; gstreamer plugins. + (lambda _ (invoke "nosetests" "-v"))) + ;; Wrap the executable, so it can find python-gi (aka + ;; pygobject) and gstreamer plugins. (add-after 'wrap 'wrap-typelib (lambda* (#:key outputs #:allow-other-keys) (let ((prog (string-append (assoc-ref outputs "out") @@ -3826,9 +3824,14 @@ websites such as Libre.fm.") `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,plugins)) `("GI_TYPELIB_PATH" ":" prefix (,types))) #t)))))) + (propagated-inputs + `(("chromaprint" ,chromaprint))) (native-inputs - `(("python-beautifulsoup4" ,python-beautifulsoup4) + `(("gobject-introspection" ,gobject-introspection) + ("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-confuse" ,python-confuse) ("python-flask" ,python-flask) + ("python-mediafile" ,python-mediafile) ("python-mock" ,python-mock) ("python-mpd2" ,python-mpd2) ("python-nose" ,python-nose) @@ -3839,83 +3842,32 @@ websites such as Libre.fm.") ("python-responses" ,python-responses))) ;; TODO: Install optional plugins and dependencies. (inputs - `(("python-discogs-client" ,python-discogs-client) + `(("bash-minimal" ,bash-minimal) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-good" ,gst-plugins-good) + ("gstreamer" ,gstreamer) + ("opusfile" ,opusfile) + ("python-discogs-client" ,python-discogs-client) ("python-jellyfish" ,python-jellyfish) ("python-munkres" ,python-munkres) ("python-musicbrainzngs" ,python-musicbrainzngs) ("python-mutagen" ,python-mutagen) ("python-pyacoustid" ,python-pyacoustid) - ("python-pyyaml" ,python-pyyaml) - ("python-unidecode" ,python-unidecode) ;; For plugin replaygain. ("python-pygobject" ,python-pygobject) - ("gobject-introspection" ,gobject-introspection) - ("gst-plugins-base" ,gst-plugins-base) - ("gst-plugins-good" ,gst-plugins-good) - ("gstreamer" ,gstreamer))) + ("python-pyyaml" ,python-pyyaml) + ("python-reflink" ,python-reflink) + ("python-requests-oauthlib" ,python-requests-oauthlib) + ("python-unidecode" ,python-unidecode))) (home-page "https://beets.io") (synopsis "Music organizer") - (description "The purpose of beets is to get your music collection right - once and for all. It catalogs your collection, automatically improving its - metadata as it goes using the MusicBrainz database. Then it provides a variety - of tools for manipulating and accessing your music.") + (description "The purpose of beets is to get your music collection +right once and for all. It catalogs your collection, automatically +improving its metadata as it goes using the MusicBrainz database. +Then it provides a variety of tools for manipulating and accessing +your music.") (license license:expat))) -(define-public beets-next - (let ((commit "04ea754d00e2873ae9aa2d9e07c5cefd790eaee2") - (revision "1")) - (package - (inherit beets) - (name "beets-next") - (version (git-version (package-version beets) revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/beetbox/beets") - (commit commit))) - (file-name (git-file-name "beets" version)) - (sha256 - (base32 - "092a9sss2shhcjmpgbwvscv8brpm5970i5hddkhi81xcff3bg1h4")))) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; XXX: unclear why this fails - (add-after 'unpack 'disable-failing-tests - (lambda _ - (substitute* "test/test_zero.py" - (("def test_album_art") "def _test_album_art")) - #t)) - (add-after 'unpack 'set-HOME - (lambda _ - (setenv "HOME" (string-append (getcwd) "/tmp")) - #t)) - (replace 'check - (lambda _ - ;; Resources must be writable. - (for-each make-file-writable - (find-files "test/rsrc" ".")) - (invoke "nosetests" "-v"))) - ;; Wrap the executable, so it can find python-gi (aka pygobject) and - ;; gstreamer plugins. - (add-after 'wrap 'wrap-typelib - (lambda* (#:key outputs #:allow-other-keys) - (let ((prog (string-append (assoc-ref outputs "out") - "/bin/beet")) - (plugins (getenv "GST_PLUGIN_SYSTEM_PATH")) - (types (getenv "GI_TYPELIB_PATH"))) - (wrap-program prog - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,plugins)) - `("GI_TYPELIB_PATH" ":" prefix (,types))) - #t)))))) - (inputs - `(("python-confuse" ,python-confuse) - ("python-mediafile" ,python-mediafile) - ("python-reflink" ,python-reflink) - ("python-requests-oauthlib" ,python-requests-oauthlib) - ("opusfile" ,opusfile) - ,@(package-inputs beets)))))) - (define-public beets-bandcamp (package (name "beets-bandcamp") diff --git a/gnu/packages/patches/beets-werkzeug-compat.patch b/gnu/packages/patches/beets-werkzeug-compat.patch deleted file mode 100644 index 1a91c3a3f9..0000000000 --- a/gnu/packages/patches/beets-werkzeug-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -Be compatible with python-werkzeug 1.0.0. - -Taken from upstream: -https://github.com/beetbox/beets/commit/d43d54e21cde97f57f19486925ab56b419254cc8 - -diff --git a/beetsplug/web/__init__.py b/beetsplug/web/__init__.py -index f53fb3a954..21ff5d94ed 100644 ---- a/beetsplug/web/__init__.py -+++ b/beetsplug/web/__init__.py -@@ -169,7 +169,7 @@ def to_python(self, value): - return ids - - def to_url(self, value): -- return ','.join(value) -+ return ','.join(str(v) for v in value) - - - class QueryConverter(PathConverter):