* [gentoo-commits] repo/gentoo:master commit in: media-sound/beets/files/, media-sound/beets/
@ 2019-05-19 17:54 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-05-19 17:54 UTC (permalink / raw
To: gentoo-commits
commit: 81d59ed7eb5a822322ed388560552aacc1b62ae9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 15:26:57 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 19 16:55:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d59ed7
media-sound/beets: 1.4.8 version bump
Closes: https://bugs.gentoo.org/683814
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/beets/Manifest | 1 +
media-sound/beets/beets-1.4.8.ebuild | 141 +++++++++++++++++++++
.../files/beets-1.4.8-imagemagick-detection.patch | 23 ++++
3 files changed, 165 insertions(+)
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index e6047ad865d..0d2b246872b 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1 +1,2 @@
DIST beets-1.4.7.tar.gz 1458621 BLAKE2B f7dd19a7dd92415c29e9b1a7932ba33cb5d43000d35a58b2f42c1487db68c6374dd159960f67e1ac68722693d91d364b24297fb2c0c86a39b82fe5b40a1e739d SHA512 6663a2ffece208a510fce9f5d3dd9c8e617cab60cdb994f7bdb13fd759cfea8882290c75c3cdf4f6de9c7d9b78845b6ed29f98b41c787c89ff8782e4ac3ec152
+DIST beets-1.4.8.tar.gz 1493539 BLAKE2B 63c44f05bbf139cd43b5f5ada972fd30beeea2303c6b479b1be35ea21fabb0039b3c8eb6e90f8f1b2a61fed36d97ce09a32c6346cbd3b84c7c978e796505f4b4 SHA512 449bed88185a5ecb4781719e092c2428ddc52fb8084033db64a4c0eca8899154192e7cea82517993d60326c7fe39b26429584ba368ffc35800f722d8d6a03217
diff --git a/media-sound/beets/beets-1.4.8.ebuild b/media-sound/beets/beets-1.4.8.ebuild
new file mode 100644
index 00000000000..432eaabd985
--- /dev/null
+++ b/media-sound/beets/beets-1.4.8.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="MIT"
+IUSE="badfiles chromaprint doc discogs ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+
+RDEPEND="
+ dev-python/jellyfish[${PYTHON_USEDEP}]
+ dev-python/munkres[${PYTHON_USEDEP}]
+ >=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9[${PYTHON_USEDEP}]
+ dev-python/unidecode[${PYTHON_USEDEP}]
+ >=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+ virtual/python-enum34[${PYTHON_USEDEP}]
+ badfiles? (
+ media-libs/flac
+ media-sound/mp3val
+ )
+ chromaprint? (
+ dev-python/pyacoustid[${PYTHON_USEDEP}]
+ media-libs/chromaprint[tools]
+ )
+ discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ ffmpeg? ( media-video/ffmpeg:0[encode] )
+ icu? ( dev-db/sqlite[icu] )
+ lastfm? ( dev-python/pylast[${PYTHON_USEDEP}] )
+ mpd? (
+ dev-python/bluelet[${PYTHON_USEDEP}]
+ dev-python/python-mpd[${PYTHON_USEDEP}]
+ gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
+ )
+ replaygain? (
+ gstreamer? (
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ media-libs/gst-plugins-good:1.0
+ media-plugins/gst-plugins-meta:1.0[ffmpeg]
+ )
+ !gstreamer? ( media-sound/mp3gain )
+ )
+ thumbnail? (
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ virtual/python-pathlib[${PYTHON_USEDEP}]
+ || (
+ dev-python/pillow[${PYTHON_USEDEP}]
+ media-gfx/imagemagick
+ )
+ )
+ webserver? (
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/flask-cors[${PYTHON_USEDEP}]
+ )
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+RESTRICT="test" # tests broken in 1.4.3 already
+
+PATCHES=( "${FILESDIR}/${P}-imagemagick-detection.patch" )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ rm_use_plugins() {
+ [[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
+ local use=${1}
+ local plugins=${use}
+ use ${use} && return
+ einfo "no ${use}:"
+ [[ $# -gt 1 ]] && plugins="${@:2}"
+ for arg in ${plugins[@]}; do
+ einfo " removing ${arg}"
+ if [[ -e "beetsplug/${arg}.py" ]]; then
+ rm beetsplug/${arg}.py || die "Unable to remove ${arg} plugin"
+ fi
+ if [[ -d "beetsplug/${arg}" ]]; then
+ rm -r beetsplug/${arg} || die "Unable to remove ${arg} plugin"
+ fi
+ sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
+ die "Unable to disable ${arg} plugin "
+ done
+ }
+
+ default
+
+ rm_use_plugins chromaprint chroma
+ rm_use_plugins ffmpeg convert
+ rm_use_plugins icu loadext
+ rm_use_plugins lastfm lastgenre lastimport
+ rm_use_plugins mpd bpd mpdstats
+ rm_use_plugins webserver web
+ rm_use_plugins thumbnail thumbnails
+
+ # remove plugins that do not have appropriate dependencies installed
+ for flag in badfiles discogs replaygain; do
+ rm_use_plugins ${flag}
+ done
+
+ if ! use mpd; then
+ rm -f test/test_player.py || die
+ fi
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ cd test || die
+ if ! use webserver; then
+ rm test_web.py || die "Failed to remove test_web.py"
+ fi
+ "${PYTHON}" testall.py || die "Testsuite failed"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ doman man/beet.1 man/beetsconfig.5
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ einstalldocs
+}
diff --git a/media-sound/beets/files/beets-1.4.8-imagemagick-detection.patch b/media-sound/beets/files/beets-1.4.8-imagemagick-detection.patch
new file mode 100644
index 00000000000..1564cd80b1f
--- /dev/null
+++ b/media-sound/beets/files/beets-1.4.8-imagemagick-detection.patch
@@ -0,0 +1,23 @@
+From 299cb53e44efdbccd2ad623434edcdbd4073547a Mon Sep 17 00:00:00 2001
+From: Filipe Fortes <fortes@users.noreply.github.com>
+Date: Fri, 17 May 2019 15:02:18 -0400
+Subject: [PATCH] Fix ImageMagick Detection
+
+The `return` statement was at the wrong indent level, so we never checked for the legacy `convert` executable
+---
+ beets/util/artresizer.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/beets/util/artresizer.py b/beets/util/artresizer.py
+index 3590dcf22..1ee3e560d 100644
+--- a/beets/util/artresizer.py
++++ b/beets/util/artresizer.py
+@@ -278,7 +278,7 @@ def get_im_version():
+ int(match.group(3)))
+ return version, legacy
+
+- return None
++ return None
+
+
+ def get_pil_version():
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/beets/files/, media-sound/beets/
@ 2019-12-08 8:53 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-12-08 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 4508997e9ffd762f35f6cff6cc5ba93ace9123e9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 8 08:52:27 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 8 08:52:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4508997e
media-sound/beets: Drop patch for now.
Closes: https://bugs.gentoo.org/702272
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/beets/beets-1.4.9-r1.ebuild | 6 ++--
media-sound/beets/files/beets-1.4.9-py37.patch | 38 --------------------------
2 files changed, 2 insertions(+), 42 deletions(-)
diff --git a/media-sound/beets/beets-1.4.9-r1.ebuild b/media-sound/beets/beets-1.4.9-r1.ebuild
index a340e1c3ed4..f7001b9fd20 100644
--- a/media-sound/beets/beets-1.4.9-r1.ebuild
+++ b/media-sound/beets/beets-1.4.9-r1.ebuild
@@ -78,11 +78,11 @@ RDEPEND="${DEPEND}"
RESTRICT="test" # tests broken in 1.4.3 already
-PATCHES=( "${FILESDIR}/${P}-py37.patch" )
-
S="${WORKDIR}/${MY_P}"
python_prepare_all() {
+ distutils-r1_python_prepare_all
+
rm_use_plugins() {
[[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
local use=${1}
@@ -103,8 +103,6 @@ python_prepare_all() {
done
}
- distutils-r1_python_prepare_all
-
rm_use_plugins chromaprint chroma
rm_use_plugins ffmpeg convert
rm_use_plugins icu loadext
diff --git a/media-sound/beets/files/beets-1.4.9-py37.patch b/media-sound/beets/files/beets-1.4.9-py37.patch
deleted file mode 100644
index 564357bc378..00000000000
--- a/media-sound/beets/files/beets-1.4.9-py37.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 15d44f02a391764da1ce1f239caef819f08beed8 Mon Sep 17 00:00:00 2001
-From: Adrian Sampson <adrian@radbox.org>
-Date: Sun, 22 Jul 2018 12:34:19 -0400
-Subject: [PATCH] Fix Python 3.7 compatibility (#2978)
-
----
- beets/autotag/hooks.py | 8 +++++++-
- docs/changelog.rst | 2 ++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/beets/autotag/hooks.py b/beets/autotag/hooks.py
-index 3615a93337b8..1c62a54c5c35 100644
---- a/beets/autotag/hooks.py
-+++ b/beets/autotag/hooks.py
-@@ -31,6 +31,12 @@ import six
-
- log = logging.getLogger('beets')
-
-+# The name of the type for patterns in re changed in Python 3.7.
-+try:
-+ Pattern = re._pattern_type
-+except AttributeError:
-+ Pattern = re.Pattern
-+
-
- # Classes used to represent candidate options.
-
-@@ -433,7 +439,7 @@ class Distance(object):
- be a compiled regular expression, in which case it will be
- matched against `value2`.
- """
-- if isinstance(value1, re._pattern_type):
-+ if isinstance(value1, Pattern):
- return bool(value1.match(value2))
- return value1 == value2
-
---
-2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/beets/files/, media-sound/beets/
@ 2021-01-18 12:27 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2021-01-18 12:27 UTC (permalink / raw
To: gentoo-commits
commit: 76a4fe776209a5c8282ac1e354b8d9bb1d81831e
Author: Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Mon Jun 1 23:37:42 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 12:27:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76a4fe77
media-sound/beets: Fix tests + cors/audioread support
Closes: https://bugs.gentoo.org/693164
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-sound/beets/beets-1.4.9-r3.ebuild | 161 +++++++++++++++++++++
...ty-with-breaking-changes-to-the-ast-modul.patch | 53 +++++++
.../files/1.4.9-0002-Disable-test_completion.patch | 74 ++++++++++
media-sound/beets/metadata.xml | 5 +-
4 files changed, 292 insertions(+), 1 deletion(-)
diff --git a/media-sound/beets/beets-1.4.9-r3.ebuild b/media-sound/beets/beets-1.4.9-r3.ebuild
new file mode 100644
index 00000000000..fe7c12adf3a
--- /dev/null
+++ b/media-sound/beets/beets-1.4.9-r3.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/beetbox/beets.git"
+ inherit git-r3
+else
+ MY_PV=${PV/_beta/-beta.}
+ MY_P=${PN}-${MY_PV}
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
+HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="badfiles chromaprint cors discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ >=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
+ dev-python/munkres[${PYTHON_MULTI_USEDEP}]
+ >=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
+ dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
+ badfiles? (
+ media-libs/flac
+ media-sound/mp3val
+ )
+ chromaprint? (
+ dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
+ media-libs/chromaprint[tools]
+ )
+ discogs? (
+ dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
+ )
+ ffmpeg? (
+ media-video/ffmpeg:0[encode]
+ )
+ gstreamer? (
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-good:1.0
+ )
+ icu? (
+ dev-db/sqlite[icu]
+ )
+ lastfm? (
+ dev-python/pylast[${PYTHON_MULTI_USEDEP}]
+ )
+ mpd? (
+ dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
+ dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
+ )
+ replaygain? (
+ gstreamer? (
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ media-plugins/gst-plugins-libav:1.0
+ )
+ !gstreamer? ( media-sound/mp3gain )
+ )
+ thumbnail? (
+ dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+ || (
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ media-gfx/imagemagick
+ )
+ )
+ webserver? (
+ dev-python/flask[${PYTHON_MULTI_USEDEP}]
+ cors? (
+ dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
+ )
+ )
+ ')"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ dev-python/sphinx
+ $(python_gen_cond_dep '
+ test? (
+ dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+ dev-python/flask[${PYTHON_MULTI_USEDEP}]
+ dev-python/mock[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+ dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
+ dev-python/responses[${PYTHON_MULTI_USEDEP}]
+ dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+ )
+ ')"
+
+PATCHES=(
+ "${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
+ "${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
+)
+
+DOCS=( README.rst docs/changelog.rst )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ rm test/test_art.py || die "Failed to remove test_art.py"
+ rm test/test_discogs.py || die "Failed to remove test_discogs.py"
+ rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
+ rm test/test_lastgenre.py || die "Failed to remove test_lastgenre.py"
+ rm test/test_spotify.py || die "Failed to remove test_spotify.py"
+ # Not working and dropped in master
+ rm test/test_mediafile.py || die "Failed to remove test_mediafile.py"
+ if ! use ffmpeg; then
+ rm test/test_convert.py || die "Failed to remove test_convert.py"
+ fi
+ if ! use mpd; then
+ rm test/test_player.py || die "Failed to remove test_player.py"
+ rm test/test_mpdstats.py || die "Failed to remove test_mpdstats.py"
+ fi
+ if ! use replaygain; then
+ rm test/test_replaygain.py || die "Failed to remove test_replaygain.py"
+ fi
+ if ! use thumbnail; then
+ rm test/test_thumbnails.py || die "Failed to remove test_thumbnails.py"
+ fi
+ if ! use webserver; then
+ rm test/test_web.py || die "Failed to remove test_web.py"
+ fi
+}
+
+python_compile_all() {
+ esetup.py build_sphinx -b man --build-dir=docs/build
+ use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ doman docs/build/man/*
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ einstalldocs
+
+ ${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
+ newbashcomp "${T}/beet.bash" beet
+ insinto /usr/share/zsh/site-functions
+ newins "${WORKDIR}/${P}/extra/_beet" _beet
+}
diff --git a/media-sound/beets/files/1.4.9-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch b/media-sound/beets/files/1.4.9-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch
new file mode 100644
index 00000000000..f9268b17ca6
--- /dev/null
+++ b/media-sound/beets/files/1.4.9-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch
@@ -0,0 +1,53 @@
+From 86af366abab51b45ad1b06d330d384bc810e45c9 Mon Sep 17 00:00:00 2001
+From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
+Date: Tue, 9 Jun 2020 19:34:31 +0200
+Subject: [PATCH] compatibility with breaking changes to the ast module
+
+new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649
+In fact, our generation of some Literals has been invalid since Python
+3.4, fix that too.
+---
+ beets/util/functemplate.py | 29 ++--
+ docs/changelog.rst | 275 ++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 294 insertions(+), 10 deletions(-)
+
+diff --git a/beets/util/functemplate.py b/beets/util/functemplate.py
+index af22b790..266534a9 100644
+--- a/beets/util/functemplate.py
++++ b/beets/util/functemplate.py
+@@ -73,15 +73,26 @@ def ex_literal(val):
+ """An int, float, long, bool, string, or None literal with the given
+ value.
+ """
+- if val is None:
+- return ast.Name('None', ast.Load())
+- elif isinstance(val, six.integer_types):
+- return ast.Num(val)
+- elif isinstance(val, bool):
+- return ast.Name(bytes(val), ast.Load())
+- elif isinstance(val, six.string_types):
+- return ast.Str(val)
+- raise TypeError(u'no literal for {0}'.format(type(val)))
++ if sys.version_info[:2] < (3, 4):
++ if val is None:
++ return ast.Name('None', ast.Load())
++ elif isinstance(val, six.integer_types):
++ return ast.Num(val)
++ elif isinstance(val, bool):
++ return ast.Name(bytes(val), ast.Load())
++ elif isinstance(val, six.string_types):
++ return ast.Str(val)
++ raise TypeError(u'no literal for {0}'.format(type(val)))
++ elif sys.version_info[:2] < (3, 6):
++ if val in [None, True, False]:
++ return ast.NameConstant(val)
++ elif isinstance(val, six.integer_types):
++ return ast.Num(val)
++ elif isinstance(val, six.string_types):
++ return ast.Str(val)
++ raise TypeError(u'no literal for {0}'.format(type(val)))
++ else:
++ return ast.Constant(val)
+
+
+ def ex_varassign(name, expr):
diff --git a/media-sound/beets/files/1.4.9-0002-Disable-test_completion.patch b/media-sound/beets/files/1.4.9-0002-Disable-test_completion.patch
new file mode 100644
index 00000000000..c60e24d6589
--- /dev/null
+++ b/media-sound/beets/files/1.4.9-0002-Disable-test_completion.patch
@@ -0,0 +1,74 @@
+From f6258c2ff3f3f979d72c149e44f4eecb02cb10a2 Mon Sep 17 00:00:00 2001
+From: Guillaume Seren <guillaumeseren@gmail.com>
+Date: Tue, 29 Sep 2020 16:46:06 +0200
+Subject: [PATCH] Disable test_completion
+
+Know issue by upstream https://github.com/beetbox/beets/issues/1876
+---
+ test/test_ui.py | 50 -------------------------------------------------
+ 1 file changed, 50 deletions(-)
+
+diff --git a/test/test_ui.py b/test/test_ui.py
+index 8267c9be..bcb6c3bf 100644
+--- a/test/test_ui.py
++++ b/test/test_ui.py
+@@ -1167,56 +1167,6 @@ class PluginTest(_common.TestCase, TestHelper):
+ self.run_command('test', lib=None)
+
+
+-@_common.slow_test()
+-class CompletionTest(_common.TestCase, TestHelper):
+- def test_completion(self):
+- # Load plugin commands
+- config['pluginpath'] = [_common.PLUGINPATH]
+- config['plugins'] = ['test']
+-
+- # Do not load any other bash completion scripts on the system.
+- env = dict(os.environ)
+- env['BASH_COMPLETION_DIR'] = os.devnull
+- env['BASH_COMPLETION_COMPAT_DIR'] = os.devnull
+-
+- # Open a `bash` process to run the tests in. We'll pipe in bash
+- # commands via stdin.
+- cmd = os.environ.get('BEETS_TEST_SHELL', '/bin/bash --norc').split()
+- if not has_program(cmd[0]):
+- self.skipTest(u'bash not available')
+- tester = subprocess.Popen(cmd, stdin=subprocess.PIPE,
+- stdout=subprocess.PIPE, env=env)
+-
+- # Load bash_completion library.
+- for path in commands.BASH_COMPLETION_PATHS:
+- if os.path.exists(util.syspath(path)):
+- bash_completion = path
+- break
+- else:
+- self.skipTest(u'bash-completion script not found')
+- try:
+- with open(util.syspath(bash_completion), 'rb') as f:
+- tester.stdin.writelines(f)
+- except IOError:
+- self.skipTest(u'could not read bash-completion script')
+-
+- # Load completion script.
+- self.io.install()
+- self.run_command('completion', lib=None)
+- completion_script = self.io.getoutput().encode('utf-8')
+- self.io.restore()
+- tester.stdin.writelines(completion_script.splitlines(True))
+-
+- # Load test suite.
+- test_script_name = os.path.join(_common.RSRC, b'test_completion.sh')
+- with open(test_script_name, 'rb') as test_script_file:
+- tester.stdin.writelines(test_script_file)
+- out, err = tester.communicate()
+- if tester.returncode != 0 or out != b'completion tests passed\n':
+- print(out.decode('utf-8'))
+- self.fail(u'test/test_completion.sh did not execute properly')
+-
+-
+ class CommonOptionsParserCliTest(unittest.TestCase, TestHelper):
+ """Test CommonOptionsParser and formatting LibModel formatting on 'list'
+ command.
+--
+2.26.2
+
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 54468263575..421001fc2f4 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -34,8 +34,11 @@
<use>
<flag name="badfiles">Validate MP3 & FLAC files</flag>
<flag name="chromaprint">Enable support for acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
- <flag name="ffmpeg">Enable support for the convert plugin to transcode files via <pkg>media-video/ffmpeg</pkg></flag>
+ <flag name="cors">Enable cors support for the webserver <pkg>dev-python/flask-cors</pkg></flag>
<flag name="discogs">Enable support for the discogs API plugin</flag>
+ <flag name="ffmpeg">Enable support for the convert plugin to transcode files via <pkg>media-video/ffmpeg</pkg></flag>
+ <flag name="gstreamer">Enable support for the gstreamer backend</flag>
+ <flag name="icu">Enable support for the icu plugin to support non-ASCII characters in <pkg>dev-db/sqlite</pkg></flag>
<flag name="lastfm">Enable support for importing personal last.fm playcounts and music genres from last.fm tags</flag>
<flag name="mpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation and statistic gathered from <pkg>media-sound/mpd</pkg></flag>
<flag name="replaygain">Enable support for Replay Gain metadata calculation during import</flag>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/beets/files/, media-sound/beets/
@ 2021-01-24 8:09 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2021-01-24 8:09 UTC (permalink / raw
To: gentoo-commits
commit: 09268b5562c191524cf9fa14f43817b3ba2bf706
Author: Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Tue Jan 19 13:53:09 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 08:09:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09268b55
media-sound/beets: cleanup sphinx & optfeature
Closes: https://bugs.gentoo.org/766132
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-sound/beets/beets-1.4.9-r4.ebuild | 137 +++++++++++++++++++++
...0003-Try-to-work-around-a-Werkzeug-change.patch | 25 ++++
media-sound/beets/metadata.xml | 14 ---
3 files changed, 162 insertions(+), 14 deletions(-)
diff --git a/media-sound/beets/beets-1.4.9-r4.ebuild b/media-sound/beets/beets-1.4.9-r4.ebuild
new file mode 100644
index 00000000000..9f25baf0397
--- /dev/null
+++ b/media-sound/beets/beets-1.4.9-r4.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 bash-completion-r1 optfeature
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/beetbox/beets.git"
+ inherit git-r3
+else
+ MY_PV=${PV/_beta/-beta.}
+ MY_P=${PN}-${MY_PV}
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
+HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ >=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
+ dev-python/munkres[${PYTHON_MULTI_USEDEP}]
+ >=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
+ dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
+ ')"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ doc? (
+ dev-python/sphinx
+ )
+ $(python_gen_cond_dep '
+ test? (
+ dev-db/sqlite[icu]
+ dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+ dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
+ dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
+ dev-python/flask[${PYTHON_MULTI_USEDEP}]
+ dev-python/mock[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
+ dev-python/pylast[${PYTHON_MULTI_USEDEP}]
+ dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+ || (
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ media-gfx/imagemagick
+ )
+ dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
+ dev-python/responses[${PYTHON_MULTI_USEDEP}]
+ dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+ media-libs/chromaprint[tools]
+ media-libs/flac
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-good:1.0
+ media-sound/mp3val
+ media-sound/mp3gain
+ || (
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ media-plugins/gst-plugins-libav:1.0
+ )
+ media-video/ffmpeg:0[encode]
+ )
+ ')"
+
+PATCHES=(
+ "${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
+ "${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
+ "${FILESDIR}/${PV}-0003-Try-to-work-around-a-Werkzeug-change.patch"
+)
+
+DOCS=( README.rst docs/changelog.rst )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ # Tests that need network
+ rm test/test_art.py || die "Failed to remove test_art.py"
+ rm test/test_discogs.py || die "Failed to remove test_discogs.py"
+ rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
+ rm test/test_lastgenre.py || die "Failed to remove test_lastgenre.py"
+ rm test/test_spotify.py || die "Failed to remove test_spotify.py"
+ # Not working and dropped in master
+ rm test/test_mediafile.py || die "Failed to remove test_mediafile.py"
+}
+
+python_compile_all() {
+ use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ doman man/*
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ einstalldocs
+
+ ${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
+ newbashcomp "${T}/beet.bash" beet
+ insinto /usr/share/zsh/site-functions
+ newins "${WORKDIR}/${P}/extra/_beet" _beet
+
+ elog "Optional dependencies:"
+ optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
+ optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
+ optfeature "discogs support" dev-python/discogs-client
+ optfeature "ffmpeg support" media-video/ffmpeg[encode]
+ optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
+ optfeature "icu support" dev-db/sqlite[icu]
+ optfeature "lastfm support" dev-python/pylast
+ optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd"
+ optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
+ optfeature "replaygain without gstreamer support" media-sound/mp3gain
+ optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
+ optfeature "webserver support" dev-python/flask
+ optfeature "webserver cors support" dev-python/flask-cors
+}
diff --git a/media-sound/beets/files/1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch b/media-sound/beets/files/1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch
new file mode 100644
index 00000000000..9833d3f3f00
--- /dev/null
+++ b/media-sound/beets/files/1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch
@@ -0,0 +1,25 @@
+From d43d54e21cde97f57f19486925ab56b419254cc8 Mon Sep 17 00:00:00 2001
+From: Adrian Sampson <adrian@radbox.org>
+Date: Thu, 6 Feb 2020 22:22:54 -0500
+Subject: [PATCH] Try to work around a Werkzeug change?
+
+---
+ beetsplug/web/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/beetsplug/web/__init__.py b/beetsplug/web/__init__.py
+index f53fb3a9..21ff5d94 100644
+--- a/beetsplug/web/__init__.py
++++ b/beetsplug/web/__init__.py
+@@ -169,7 +169,7 @@ class IdListConverter(BaseConverter):
+ return ids
+
+ def to_url(self, value):
+- return ','.join(value)
++ return ','.join(str(v) for v in value)
+
+
+ class QueryConverter(PathConverter):
+--
+2.26.2
+
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 421001fc2f4..713634ce64a 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -31,20 +31,6 @@
If beets doesn’t do what you want yet, writing your own plugin is
shockingly simple if you know a little Python.
</longdescription>
- <use>
- <flag name="badfiles">Validate MP3 & FLAC files</flag>
- <flag name="chromaprint">Enable support for acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
- <flag name="cors">Enable cors support for the webserver <pkg>dev-python/flask-cors</pkg></flag>
- <flag name="discogs">Enable support for the discogs API plugin</flag>
- <flag name="ffmpeg">Enable support for the convert plugin to transcode files via <pkg>media-video/ffmpeg</pkg></flag>
- <flag name="gstreamer">Enable support for the gstreamer backend</flag>
- <flag name="icu">Enable support for the icu plugin to support non-ASCII characters in <pkg>dev-db/sqlite</pkg></flag>
- <flag name="lastfm">Enable support for importing personal last.fm playcounts and music genres from last.fm tags</flag>
- <flag name="mpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation and statistic gathered from <pkg>media-sound/mpd</pkg></flag>
- <flag name="replaygain">Enable support for Replay Gain metadata calculation during import</flag>
- <flag name="thumbnail">Enable album thumbnails generation</flag>
- <flag name="webserver">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
- </use>
<upstream>
<remote-id type="pypi">beets</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/beets/files/, media-sound/beets/
@ 2021-10-31 2:58 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-10-31 2:58 UTC (permalink / raw
To: gentoo-commits
commit: 45b05de8cffb4e5b1398b572db832a0285be3428
Author: Arsen Arsenović <arsen <AT> aarsen <DOT> me>
AuthorDate: Thu Oct 21 21:48:12 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 02:57:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45b05de8
media-sound/beets: bump to version 1.5.0
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Arsen Arsenović <arsen <AT> aarsen.me>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/beets/Manifest | 1 +
media-sound/beets/beets-1.5.0.ebuild | 126 +++++++++++++++++++++
.../files/1.5.0-0001-Remove-test_completion.patch | 74 ++++++++++++
3 files changed, 201 insertions(+)
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 2385fe9f1b1..2ef455a86dc 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1 +1,2 @@
DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
+DIST beets-1.5.0.tar.gz 1694845 BLAKE2B e4a4ad880edcc396170bca9e7d04548f22a55eac22481d2babca0d2ca71237ed0509bf9be9af12343b0d1b555e9726446e5d61e637312a4808eece5ce0302f33 SHA512 447b01dc750a69d0a33d271774f3bd3b997a203d80c220c1a961f9a8e30420d263b1e2a4682d25ff7b02e1e85155f42186cb0d3bf27ebc8c2777f68e197d4018
diff --git a/media-sound/beets/beets-1.5.0.ebuild b/media-sound/beets/beets-1.5.0.ebuild
new file mode 100644
index 00000000000..aa73a47719c
--- /dev/null
+++ b/media-sound/beets/beets-1.5.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 bash-completion-r1 optfeature
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/beetbox/beets.git"
+ inherit git-r3
+else
+ MY_PV=${PV/_beta/-beta.}
+ MY_P=${PN}-${MY_PV}
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
+HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ >=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
+ dev-python/munkres[${PYTHON_USEDEP}]
+ >=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+ >=dev-python/python-musicbrainzngs-0.4[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9[${PYTHON_USEDEP}]
+ dev-python/unidecode[${PYTHON_USEDEP}]
+ ')"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ doc? (
+ dev-python/sphinx
+ )
+ $(python_gen_cond_dep '
+ test? (
+ dev-db/sqlite[icu]
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/bluelet[${PYTHON_USEDEP}]
+ dev-python/discogs-client[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pyacoustid[${PYTHON_USEDEP}]
+ dev-python/pylast[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/python-mpd[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ || (
+ dev-python/pillow[${PYTHON_USEDEP}]
+ media-gfx/imagemagick
+ )
+ dev-python/rarfile[${PYTHON_USEDEP}]
+ dev-python/responses[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ media-libs/chromaprint[tools]
+ media-libs/flac
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-good:1.0
+ media-sound/mp3val
+ media-sound/mp3gain
+ media-plugins/gst-plugins-libav:1.0
+ media-video/ffmpeg:0[encode]
+ app-shells/bash-completion
+ dev-python/reflink
+ dev-python/confuse
+ dev-python/mediafile
+ )
+ ')"
+
+PATCHES=(
+ "${FILESDIR}/${PV}-0001-Remove-test_completion.patch"
+)
+
+DOCS=( README.rst docs/changelog.rst )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ doman man/*
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ einstalldocs
+
+ ${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
+ newbashcomp "${T}/beet.bash" beet
+ insinto /usr/share/zsh/site-functions
+ newins "${WORKDIR}/${P}/extra/_beet" _beet
+
+ optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
+ optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
+ optfeature "discogs support" dev-python/discogs-client
+ optfeature "ffmpeg support" media-video/ffmpeg[encode]
+ optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
+ optfeature "icu support" dev-db/sqlite[icu]
+ optfeature "lastfm support" dev-python/pylast
+ optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd"
+ optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
+ optfeature "replaygain without gstreamer support" media-sound/mp3gain
+ optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
+ optfeature "webserver support" dev-python/flask
+ optfeature "webserver cors support" dev-python/flask-cors
+}
diff --git a/media-sound/beets/files/1.5.0-0001-Remove-test_completion.patch b/media-sound/beets/files/1.5.0-0001-Remove-test_completion.patch
new file mode 100644
index 00000000000..16c1a6fe5fa
--- /dev/null
+++ b/media-sound/beets/files/1.5.0-0001-Remove-test_completion.patch
@@ -0,0 +1,74 @@
+From a992bf194803d3598a8edc054a767858b0355a78 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Thu, 21 Oct 2021 23:16:45 +0200
+Subject: [PATCH] Remove test_completion
+
+Known issue: https://github.com/beetbox/beets/issues/1876
+---
+ test/test_ui.py | 50 -------------------------------------------------
+ 1 file changed, 50 deletions(-)
+
+diff --git a/test/test_ui.py b/test/test_ui.py
+index 5cfed1fd..48e7cc85 100644
+--- a/test/test_ui.py
++++ b/test/test_ui.py
+@@ -1209,56 +1209,6 @@ class PluginTest(_common.TestCase, TestHelper):
+ self.run_command('test', lib=None)
+
+
+-@_common.slow_test()
+-class CompletionTest(_common.TestCase, TestHelper):
+- def test_completion(self):
+- # Load plugin commands
+- config['pluginpath'] = [_common.PLUGINPATH]
+- config['plugins'] = ['test']
+-
+- # Do not load any other bash completion scripts on the system.
+- env = dict(os.environ)
+- env['BASH_COMPLETION_DIR'] = os.devnull
+- env['BASH_COMPLETION_COMPAT_DIR'] = os.devnull
+-
+- # Open a `bash` process to run the tests in. We'll pipe in bash
+- # commands via stdin.
+- cmd = os.environ.get('BEETS_TEST_SHELL', '/bin/bash --norc').split()
+- if not has_program(cmd[0]):
+- self.skipTest(u'bash not available')
+- tester = subprocess.Popen(cmd, stdin=subprocess.PIPE,
+- stdout=subprocess.PIPE, env=env)
+-
+- # Load bash_completion library.
+- for path in commands.BASH_COMPLETION_PATHS:
+- if os.path.exists(util.syspath(path)):
+- bash_completion = path
+- break
+- else:
+- self.skipTest(u'bash-completion script not found')
+- try:
+- with open(util.syspath(bash_completion), 'rb') as f:
+- tester.stdin.writelines(f)
+- except IOError:
+- self.skipTest(u'could not read bash-completion script')
+-
+- # Load completion script.
+- self.io.install()
+- self.run_command('completion', lib=None)
+- completion_script = self.io.getoutput().encode('utf-8')
+- self.io.restore()
+- tester.stdin.writelines(completion_script.splitlines(True))
+-
+- # Load test suite.
+- test_script_name = os.path.join(_common.RSRC, b'test_completion.sh')
+- with open(test_script_name, 'rb') as test_script_file:
+- tester.stdin.writelines(test_script_file)
+- out, err = tester.communicate()
+- if tester.returncode != 0 or out != b'completion tests passed\n':
+- print(out.decode('utf-8'))
+- self.fail(u'test/test_completion.sh did not execute properly')
+-
+-
+ class CommonOptionsParserCliTest(unittest.TestCase, TestHelper):
+ """Test CommonOptionsParser and formatting LibModel formatting on 'list'
+ command.
+--
+2.32.0
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/beets/files/, media-sound/beets/
@ 2023-01-13 10:17 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-01-13 10:17 UTC (permalink / raw
To: gentoo-commits
commit: a3634bca07cf0209ddaed3c88f9ddc06af60046b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 10:13:48 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 10:17:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3634bca
media-sound/beets: fix build w/ sphinx 6
Closes: https://bugs.gentoo.org/889460
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/beets/beets-1.6.0.ebuild | 3 ++-
media-sound/beets/files/1.6.0-sphinx-6.patch | 28 ++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/media-sound/beets/beets-1.6.0.ebuild b/media-sound/beets/beets-1.6.0.ebuild
index 4550e6da0e11..e4ae0a196374 100644
--- a/media-sound/beets/beets-1.6.0.ebuild
+++ b/media-sound/beets/beets-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -84,6 +84,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PV}-0001-Remove-test_completion.patch"
+ "${FILESDIR}/${PV}-sphinx-6.patch"
)
DOCS=( README.rst docs/changelog.rst )
diff --git a/media-sound/beets/files/1.6.0-sphinx-6.patch b/media-sound/beets/files/1.6.0-sphinx-6.patch
new file mode 100644
index 000000000000..d946e93b76b8
--- /dev/null
+++ b/media-sound/beets/files/1.6.0-sphinx-6.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/889460
+https://github.com/beetbox/beets/commit/2106f471affd1dab35b4b26187b9c74d034528c5
+
+From 2106f471affd1dab35b4b26187b9c74d034528c5 Mon Sep 17 00:00:00 2001
+From: Jack Wilsdon <jack.wilsdon@gmail.com>
+Date: Sat, 31 Dec 2022 14:23:34 +0000
+Subject: [PATCH] Add missing placeholders to extlinks captions
+
+Sphinx 6.0.0 changed extlinks to always require placeholders in link
+captions. See https://github.com/sphinx-doc/sphinx/commit/93cf1a57d916a1ff96c8e8a0356d0256e40489ac
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -18,10 +18,10 @@
+
+ # External links to the bug tracker and other sites.
+ extlinks = {
+- 'bug': ('https://github.com/beetbox/beets/issues/%s', '#'),
+- 'user': ('https://github.com/%s', ''),
+- 'pypi': ('https://pypi.org/project/%s/', ''),
+- 'stdlib': ('https://docs.python.org/3/library/%s.html', ''),
++ 'bug': ('https://github.com/beetbox/beets/issues/%s', '#%s'),
++ 'user': ('https://github.com/%s', '%s'),
++ 'pypi': ('https://pypi.org/project/%s/', '%s'),
++ 'stdlib': ('https://docs.python.org/3/library/%s.html', '%s'),
+ }
+
+ linkcheck_ignore = [
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-01-13 10:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-08 8:53 [gentoo-commits] repo/gentoo:master commit in: media-sound/beets/files/, media-sound/beets/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-01-13 10:17 Sam James
2021-10-31 2:58 Sam James
2021-01-24 8:09 Joonas Niilola
2021-01-18 12:27 Joonas Niilola
2019-05-19 17:54 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox