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 266491382C5 for ; Tue, 18 May 2021 07:21:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73746E0801; Tue, 18 May 2021 07:21:32 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 20DAAE0801 for ; Tue, 18 May 2021 07:21:32 +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 3BCC1335D41 for ; Tue, 18 May 2021 07:21:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8EF0D78F for ; Tue, 18 May 2021 07:21:28 +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: <1621322481.7a9268be4bcba43f3206b51da598312a105dd0dd.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-r3.ebuild dev-python/QtPy/metadata.xml X-VCS-Directories: dev-python/QtPy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7a9268be4bcba43f3206b51da598312a105dd0dd X-VCS-Branch: master Date: Tue, 18 May 2021 07:21:28 +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: d49ccdf0-1b19-44a5-9f35-711996065473 X-Archives-Hash: 4b90a12d94928bdf891ca8d8a9d7034a commit: 7a9268be4bcba43f3206b51da598312a105dd0dd Author: Michał Górny gentoo org> AuthorDate: Tue May 18 07:05:53 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue May 18 07:21:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a9268be dev-python/QtPy: Revert "allow dependency to be satisfied by pyside2" The lot of USE dependencies break pkgcheck, plus the any-of logic is wrong and does not match what the package does. If PyQt5 is installed at all, the package will default to using it even if the dependencies are satisfied by pyside2. Reverts: 8bdd53a2d42010f0ec8f83273938a62195bfbcd5 Bug: https://bugs.gentoo.org/790764 Signed-off-by: Michał Górny gentoo.org> dev-python/QtPy/QtPy-1.9.0-r3.ebuild | 107 ----------------------------------- dev-python/QtPy/metadata.xml | 17 ------ 2 files changed, 124 deletions(-) diff --git a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild deleted file mode 100644 index e707c30eebb..00000000000 --- a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..8} ) - -inherit distutils-r1 virtualx - -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" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -IUSE=" - declarative designer gui help location multimedia network - opengl positioning printsupport qml quick sensors serialport - sql svg test testlib webchannel webengine websockets - widgets x11extras xml xmlpatterns -" - -# Webengine is a special case, because PyQt5 provides this in a -# separate package , while PySide2 ships it in the same package -# -# declarative/qml/quick is a special case, because PyQt5 bundles -# the bindings for qml and quick in one flag: declarative, -# PySide2 does not. -# -# The PyQt5 ebuild currently enables xml support unconditionally, -# the flag is added anyway with a (+) to make it future proof -# if the ebuild were to change this behaviour in the future. -# -# The PySide2 ebuild currently enables opengl and serialport -# support unconditionally, the flag is added anyway with a (+) -# to make it future proof if the ebuild were to change this -# behaviour in the future. -# -RDEPEND=" - app-eselect/eselect-QtPy - || ( - dev-python/PyQt5[${PYTHON_USEDEP},designer?,gui?,help?,location?,multimedia?,network?,opengl?,positioning?,printsupport?,sensors?,serialport?,sql?,svg?,testlib?,webchannel?,websockets?,widgets?,x11extras?,xml(+)?,xmlpatterns?] - dev-python/pyside2[${PYTHON_USEDEP},designer?,gui?,help?,location?,multimedia?,network?,opengl(+)?,positioning?,printsupport?,sensors?,serialport(+)?,sql?,svg?,testlib?,webchannel?,websockets?,widgets?,x11extras?,xml?,xmlpatterns?] - ) - - webengine? ( || ( - dev-python/PyQtWebEngine[${PYTHON_USEDEP}] - dev-python/pyside2[${PYTHON_USEDEP},webengine] - ) ) - - qml? ( || ( - dev-python/PyQt5[${PYTHON_USEDEP},declarative] - dev-python/pyside2[${PYTHON_USEDEP},qml] - ) ) - - quick? ( || ( - dev-python/PyQt5[${PYTHON_USEDEP},declarative] - dev-python/pyside2[${PYTHON_USEDEP},quick] - ) ) - - declarative? ( || ( - dev-python/PyQt5[${PYTHON_USEDEP},declarative] - dev-python/pyside2[${PYTHON_USEDEP},qml,quick] - ) ) -" - -# These bindings are currently only provided by PyQt5 or PySide2 -# but not by both. Just DEPEND on these directly if they are -# required. -# Please check periodically if this list is still up to date -# -# bluetooth? ( dev-python/PyQt5[${PYTHON_USEDEP},bluetooth] ) -# dbus? ( dev-python/PyQt5[${PYTHON_USEDEP},dbus] ) -# examples? ( dev-python/PyQt5[${PYTHON_USEDEP},examples] ) -# networkauth? ( dev-python/PyQt5[${PYTHON_USEDEP},networkauth] ) -# ssl? ( dev-python/PyQt5[${PYTHON_USEDEP},ssl] ) -# webkit? ( dev-python/PyQt5[${PYTHON_USEDEP},webkit] ) -# -# 3d? ( dev-python/pyside2[${PYTHON_USEDEP},3d] ) -# charts? ( dev-python/pyside2[${PYTHON_USEDEP},charts] ) -# concurrent? ( dev-python/pyside2[${PYTHON_USEDEP},concurrent] ) -# datavis? ( dev-python/pyside2[${PYTHON_USEDEP},datavis] ) -# scxml? ( dev-python/pyside2[${PYTHON_USEDEP},scxml] ) -# script? ( dev-python/pyside2[${PYTHON_USEDEP},script] ) -# scripttools? ( dev-python/pyside2[${PYTHON_USEDEP},scripttools] ) -# speech? ( dev-python/pyside2[${PYTHON_USEDEP},speech] ) - -# 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}] - dev-python/pyside2[${PYTHON_USEDEP},3d,charts,concurrent,datavis,designer,gui,help,location,multimedia,network,opengl(+),positioning,printsupport,qml,quick,script,scripttools,scxml,sensors,serialport(+),speech,sql,svg,testlib,webchannel,webengine,websockets,widgets,x11extras,xml,xmlpatterns] -)" - -distutils_enable_tests pytest - -python_test() { - export QT_API="pyqt5" - virtx pytest -vv - export QT_API="pyside2" - virtx pytest -vv - unset QT_API -} diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml index 582ff9f96b8..1ad412dcb92 100644 --- a/dev-python/QtPy/metadata.xml +++ b/dev-python/QtPy/metadata.xml @@ -19,30 +19,13 @@ Basically, you can write your code as if you were using PySide2 but import Qt modules from qtpy instead of PySide2 (or PyQt5) - Pull in bindings for the QtQml/QtQuick modules and enable the qmlscene plugin Pull in bindings for the QtDesigner module and enable the designer plugin Pull in bindings for the QtGui module - Pull in bindings for the QtHelp module - Pull in bindings for the QtLocation module - Pull in QtMultimedia and QtMultimediaWidgets modules - Pull in bindings for the QtNetwork module Pull in bindings for the QtOpenGL module - Pull in bindings for the QtPositioning module Pull in bindings for the QtPrintSupport module - Pull in QtQml module - Pull in QtQuick and QtQuickWidgets modules - Pull in bindings for the QtSensors module - Pull in bindings for the QtSerialPort module - Pull in bindings for the QtSql module Pull in bindings for the QtSvg module Pull in bindings for the QtTest module - Pull in bindings for the QtWebChannel module Pull in QtWebEngine and QtWebEngineWidgets modules - Pull in bindings for the QtWebSockets module - Pull in bindings for the QtWidgets module - Pull in bindings for the QtX11Extras module - Pull in bindings for the QtXmlPatterns module - Pull in QtXml module spyder-ide/qtpy