all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [PATCH] gnu: beets: Update to 1.3.19.
@ 2016-07-29 22:39 Alex Griffin
  2016-07-29 23:24 ` Leo Famulari
  0 siblings, 1 reply; 6+ messages in thread
From: Alex Griffin @ 2016-07-29 22:39 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

This patch just updates beets to 1.3.19.

With the new pypi URLs, are we updating the long hash portion? I did in
this patch, but it seemed to work either way.

(I'm also working on a few more patches to enable more beets plugins.
They'll probably be ready sometime this weekend.)
-- 
Alex Griffin

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-beets-Update-to-1.3.19.patch --]
[-- Type: text/x-patch; name="0001-gnu-beets-Update-to-1.3.19.patch", Size: 4735 bytes --]

From 3e6c158530d3c024402db51dac459f11733f6f30 Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Fri, 29 Jul 2016 10:39:47 -0500
Subject: [PATCH] gnu: beets: Update to 1.3.19.

* gnu/packages/music.scm (beets): Update to 1.3.19.
[source]: Remove patch to skip failing tests. It's handled upstream now.

* gnu/packages/patches/beets-image-test-failure.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/music.scm                             |  8 ++--
 .../patches/beets-image-test-failure.patch         | 46 ----------------------
 3 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100644 gnu/packages/patches/beets-image-test-failure.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index a0d9b8f..9c115fa 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -445,7 +445,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/avidemux-install-to-lib.patch		\
   %D%/packages/patches/awesome-reproducible-png.patch		\
   %D%/packages/patches/bash-completion-directories.patch	\
-  %D%/packages/patches/beets-image-test-failure.patch		\
   %D%/packages/patches/bigloo-gc-shebangs.patch			\
   %D%/packages/patches/binutils-ld-new-dtags.patch		\
   %D%/packages/patches/binutils-loongson-workaround.patch	\
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 5d73790..74c3e2a 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
 ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
+;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1518,17 +1519,16 @@ websites such as Libre.fm.")
 (define-public beets
   (package
     (name "beets")
-    (version "1.3.18")
+    (version "1.3.19")
     (source (origin
               (method url-fetch)
               (uri (string-append
                      "https://pypi.python.org/packages/"
-                     "14/6f/c9c79c5339ab3ecced265ca18adbf5bae3d4058bae737b6164d738fb4d2c/"
+                     "46/a0/b72a980dc56990d51cee1dcaa9fb76b472ef6430978997e58bff48a23b78/"
                      name "-" version ".tar.gz"))
-              (patches (search-patches "beets-image-test-failure.patch"))
               (sha256
                (base32
-                "09pgyywa5llbc36y0lrr21ywgsp8m2zx6p8ncf8hxik28knd5kld"))))
+                "1vi1dh3fr554bnm8y9pjy09hblw18v6cl2jppzwlp72afri1w93b"))))
     (build-system python-build-system)
     (arguments
      `(#:python ,python-2 ; only Python 2 is supported
diff --git a/gnu/packages/patches/beets-image-test-failure.patch b/gnu/packages/patches/beets-image-test-failure.patch
deleted file mode 100644
index 360d7d3..0000000
--- a/gnu/packages/patches/beets-image-test-failure.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Fix test failure due to missing image library backend.
-
-Cherry-picked from upstream:
-https://github.com/beetbox/beets/commit/07c95a1bf16bf86c640436208dda828cc7df0181
-
-From 07c95a1bf16bf86c640436208dda828cc7df0181 Mon Sep 17 00:00:00 2001
-From: Adrian Sampson <adrian@radbox.org>
-Date: Thu, 2 Jun 2016 11:39:05 -0700
-Subject: [PATCH] Require an imaging backend for fuzzy ratio tests
-
-These fail outright if we don't have a way to get image sizes (e.g.,
-ImageMagick).
----
- test/test_art.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/test/test_art.py b/test/test_art.py
-index 02d26f4..1b12b76 100644
---- a/test/test_art.py
-+++ b/test/test_art.py
-@@ -561,21 +561,25 @@ def test_respect_enforce_ratio_no(self):
-         self._assertImageIsValidArt(self.IMG_500x490, True)
- 
-     def test_respect_enforce_ratio_px_above(self):
-+        self._require_backend()
-         self.plugin.enforce_ratio = True
-         self.plugin.margin_px = 5
-         self._assertImageIsValidArt(self.IMG_500x490, False)
- 
-     def test_respect_enforce_ratio_px_below(self):
-+        self._require_backend()
-         self.plugin.enforce_ratio = True
-         self.plugin.margin_px = 15
-         self._assertImageIsValidArt(self.IMG_500x490, True)
- 
-     def test_respect_enforce_ratio_percent_above(self):
-+        self._require_backend()
-         self.plugin.enforce_ratio = True
-         self.plugin.margin_percent = (500 - 490) / 500 * 0.5
-         self._assertImageIsValidArt(self.IMG_500x490, False)
- 
-     def test_respect_enforce_ratio_percent_below(self):
-+        self._require_backend()
-         self.plugin.enforce_ratio = True
-         self.plugin.margin_percent = (500 - 490) / 500 * 1.5
-         self._assertImageIsValidArt(self.IMG_500x490, True)
-- 
2.9.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-08-09  2:49 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-29 22:39 [PATCH] gnu: beets: Update to 1.3.19 Alex Griffin
2016-07-29 23:24 ` Leo Famulari
2016-08-03 22:38   ` Alex Griffin
2016-08-07  2:39     ` Leo Famulari
2016-08-08 19:55       ` Alex Griffin
2016-08-09  2:48         ` Leo Famulari

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.