From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D8EFF13835A for ; Tue, 18 May 2021 08:51:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B266BE0824; Tue, 18 May 2021 08:51:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 969CBE0824 for ; Tue, 18 May 2021 08:51:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7EF11340FD5 for ; Tue, 18 May 2021 08:51:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ACFE1798 for ; Tue, 18 May 2021 08:51:08 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1621327843.1d14f1c12251ca25b8ed0ee53e141406b5f5e67f.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/QtPy/QtPy-1.9.0-r2.ebuild X-VCS-Directories: dev-python/QtPy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1d14f1c12251ca25b8ed0ee53e141406b5f5e67f X-VCS-Branch: master Date: Tue, 18 May 2021 08:51:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5e3146ee-7d34-4d88-9805-35f6d1e6ad00 X-Archives-Hash: 518250c59348699671ba734609bc2840 commit: 1d14f1c12251ca25b8ed0ee53e141406b5f5e67f Author: Michał Górny gentoo org> AuthorDate: Tue May 18 07:30:00 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue May 18 08:50:43 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d14f1c1 dev-python/QtPy: Backport some improvements from removed -r3 Signed-off-by: Michał Górny gentoo.org> dev-python/QtPy/QtPy-1.9.0-r2.ebuild | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild index 32222ef6ef4..33c8ccc6869 100644 --- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild +++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit distutils-r1 +inherit distutils-r1 virtualx -DESCRIPTION="Abstraction layer for PyQt5/PySide" +DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets" HOMEPAGE="https://github.com/spyder-ide/qtpy" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" @@ -16,11 +16,22 @@ SLOT="0" KEYWORDS="amd64 arm64 x86" IUSE="designer gui opengl printsupport svg testlib webengine" +# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going +# to work. The package only checks whether PyQt5/pyside2 is installed, it does +# not verify whether they have the necessary modules (i.e. satisfy the USE dep). RDEPEND=" dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,printsupport?,svg?] gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] ) testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] ) webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )" +# The QtPy testsuite skips tests for bindings that are +# not installed, so here we ensure that everything +# is available and all tests are run. +BDEPEND=" + test? ( + dev-python/PyQt5[${PYTHON_USEDEP},bluetooth,dbus,declarative,designer,gui,help,location,multimedia,network,networkauth,opengl,positioning,printsupport,sensors,serialport,sql,ssl,svg,testlib,webchannel,webkit,websockets,widgets,x11extras,xml(+),xmlpatterns] + dev-python/PyQtWebEngine[${PYTHON_USEDEP}] + )" src_prepare() { default @@ -29,3 +40,8 @@ src_prepare() { sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die } + +python_test() { + local -x QT_API="pyqt5" + virtx pytest -vv +}