diff options
author | Alex Griffin <a@ajgrf.com> | 2016-07-29 10:39:47 -0500 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2016-07-29 19:19:49 -0400 |
commit | 23319ed674ae4218c70749a206b329069dd2197c (patch) | |
tree | 6457fbb8b1d9620f15cca366893aa7a45ac8149d | |
parent | d1c9d3bb42a0278be2acc8ad32d3e49ec8cabb07 (diff) | |
download | guix-patches-23319ed674ae4218c70749a206b329069dd2197c.tar guix-patches-23319ed674ae4218c70749a206b329069dd2197c.tar.gz |
gnu: beets: Update to 1.3.19.
* gnu/packages/music.scm (beets): Update to 1.3.19.
[source]: Remove patch to skip failing tests.
* gnu/packages/patches/beets-image-test-failure.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Signed-off-by: Leo Famulari <leo@famulari.name>
-rw-r--r-- | gnu/local.mk | 1 | ||||
-rw-r--r-- | gnu/packages/music.scm | 11 | ||||
-rw-r--r-- | gnu/packages/patches/beets-image-test-failure.patch | 46 |
3 files changed, 4 insertions, 54 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 473197078d..6a74c78b69 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 5d73790e51..9bde1d7ac2 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,13 @@ 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/" - name "-" version ".tar.gz")) - (patches (search-patches "beets-image-test-failure.patch")) + (uri (pypi-uri "beets" version)) (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 360d7d3ed4..0000000000 --- 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) |