commit: 400566ad6db4ae0a3394e2cc8241384f620da793 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Jan 5 15:52:44 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Jan 5 15:53:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=400566ad
dev-python/cmd2: Require xclip or xsel for clipboard tests Closes: https://bugs.gentoo.org/710174 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/cmd2/cmd2-1.3.11.ebuild | 16 ++++++++++++++-- dev-python/cmd2/cmd2-1.4.0.ebuild | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dev-python/cmd2/cmd2-1.3.11.ebuild b/dev-python/cmd2/cmd2-1.3.11.ebuild index 088282f0f2c..641471892e4 100644 --- a/dev-python/cmd2/cmd2-1.3.11.ebuild +++ b/dev-python/cmd2/cmd2-1.3.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,9 +24,21 @@ RDEPEND=" >=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}] ' python3_{6,7}) " +# pyperclip uses clipboard backends in the following preference order: +# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4. +# klipper is known to be broken in Xvfb, and therefore causes test +# failures. to avoid them, we must ensure that one of the backends +# preferred to it is available (i.e. xclip or xsel) + which(1). BDEPEND=" dev-python/setuptools_scm[${PYTHON_USEDEP}] - test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] ) + test? ( + dev-python/pytest-mock[${PYTHON_USEDEP}] + sys-apps/which + || ( + x11-misc/xclip + x11-misc/xsel + ) + ) " distutils_enable_tests pytest diff --git a/dev-python/cmd2/cmd2-1.4.0.ebuild b/dev-python/cmd2/cmd2-1.4.0.ebuild index aa46d05c5c4..3149abdb089 100644 --- a/dev-python/cmd2/cmd2-1.4.0.ebuild +++ b/dev-python/cmd2/cmd2-1.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,9 +24,21 @@ RDEPEND=" >=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}] ' python3_{6,7}) " +# pyperclip uses clipboard backends in the following preference order: +# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4. +# klipper is known to be broken in Xvfb, and therefore causes test +# failures. to avoid them, we must ensure that one of the backends +# preferred to it is available (i.e. xclip or xsel) + which(1). BDEPEND=" dev-python/setuptools_scm[${PYTHON_USEDEP}] - test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] ) + test? ( + dev-python/pytest-mock[${PYTHON_USEDEP}] + sys-apps/which + || ( + x11-misc/xclip + x11-misc/xsel + ) + ) " distutils_enable_tests pytest
