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 393B51382C5 for ; Thu, 20 May 2021 09:42:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D2F8E08F0; Thu, 20 May 2021 09:42:34 +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 63218E08F0 for ; Thu, 20 May 2021 09:42:34 +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 002EE340CC9 for ; Thu, 20 May 2021 09:42:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41784581 for ; Thu, 20 May 2021 09:42:31 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1621503747.5cf79d0718816ddef25b7ddc3353d4f4975dbb6e.andrewammerlaan@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-r4.ebuild dev-python/QtPy/metadata.xml X-VCS-Directories: dev-python/QtPy/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 5cf79d0718816ddef25b7ddc3353d4f4975dbb6e X-VCS-Branch: master Date: Thu, 20 May 2021 09:42:31 +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: 868e46fc-27e2-424d-9174-8f6cf06d32e9 X-Archives-Hash: 6336f5683754282ba75e0c2e37d7a0eb commit: 5cf79d0718816ddef25b7ddc3353d4f4975dbb6e Author: Andrew Ammerlaan gentoo org> AuthorDate: Wed May 19 13:15:23 2021 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Thu May 20 09:42:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cf79d07 dev-python/QtPy: allow use of pyside2, but better this time Closes: https://bugs.gentoo.org/790764 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Closes: https://github.com/gentoo/gentoo/pull/20871 Signed-off-by: Andrew Ammerlaan gentoo.org> dev-python/QtPy/QtPy-1.9.0-r4.ebuild | 137 +++++++++++++++++++++++++++++++++++ dev-python/QtPy/metadata.xml | 17 +++++ 2 files changed, 154 insertions(+) diff --git a/dev-python/QtPy/QtPy-1.9.0-r4.ebuild b/dev-python/QtPy/QtPy-1.9.0-r4.ebuild new file mode 100644 index 00000000000..b31189ce6bd --- /dev/null +++ b/dev-python/QtPy/QtPy-1.9.0-r4.ebuild @@ -0,0 +1,137 @@ +# 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_QT_MODULES=" + declarative designer gui help location multimedia network opengl + positioning printsupport sensors serialport sql svg testlib webchannel + webengine websockets widgets x11extras xml xmlpatterns +" +IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}" +unset _IUSE_QT_MODULES + +REQUIRED_USE="|| ( pyqt5 pyside2 )" + +# These flags are currently *not* common to both the PySide2 and PyQt5 ebuild +# Disable them for now, please check periodically if this is still up to date. +# bluetooth? ( pyqt5 ) +# dbus? ( pyqt5 ) +# networkauth? ( pyqt5 ) +# webkit? ( pyqt5 ) +# +# 3d? ( pyside2 ) +# charts? ( pyside2 ) +# concurrent? ( pyside2 ) +# datavis? ( pyside2 ) +# scxml? ( pyside2 ) +# script? ( pyside2 ) +# scripttools? ( pyside2 ) +# speech? ( pyside2 ) + +# 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). +# +# 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=" + pyqt5? ( + dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/PyQt5[declarative?,designer?,gui?,help?,location?] + dev-python/PyQt5[multimedia?,network?,opengl?,positioning?] + dev-python/PyQt5[printsupport?,sensors?,serialport?,sql?,svg?] + dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?] + dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?] + webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] ) + ) + pyside2? ( + dev-python/pyside2[${PYTHON_USEDEP}] + dev-python/pyside2[designer?,gui?,help?,location?,multimedia?] + dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?] + dev-python/pyside2[sensors?,serialport(+)?,sql?,svg?,testlib?] + dev-python/pyside2[webchannel?,webengine?,websockets?,widgets?] + dev-python/pyside2[x11extras?,xml?,xmlpatterns?] + declarative? ( dev-python/pyside2[qml,quick] ) + ) +" + +# The QtPy testsuite skips tests for bindings that are not installed, so here we +# ensure that everything is available and all tests are run. Note that not +# all flags are available in PyQt5/PySide2, so some tests are still skipped. +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location] + dev-python/PyQt5[multimedia,network,networkauth,opengl,positioning] + dev-python/PyQt5[printsupport,sensors,serialport,sql,svg,testlib] + dev-python/PyQt5[webchannel,webkit,websockets,widgets,x11extras,xml(+)] + dev-python/PyQt5[xmlpatterns] + dev-python/PyQtWebEngine[${PYTHON_USEDEP}] + dev-python/pyside2[${PYTHON_USEDEP}] + dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help] + dev-python/pyside2[location,multimedia,network,opengl(+),positioning] + dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml] + dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib] + dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras] + dev-python/pyside2[xml,xmlpatterns] +)" + +distutils_enable_tests pytest + +src_prepare() { + default + if ! use pyqt5; then + sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die + fi + if ! use pyside2; then + sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die + fi + + # Disable outdated PyQt4 and PySide + sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die + sed -i -e "s/from PyQt4.QtCore import/raise ImportError #/" qtpy/__init__.py || die + sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die +} + +src_test() { + virtx python_foreach_impl python_test +} + +python_test() { + local -x QT_API + for QT_API in pyqt5 pyside2; do + epytest + done +} + +pkg_postinst() { + if use pyqt5 && use pyside2; then + ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default" + ewarn "to PyQt5 unless the QT_API environment variable overrides this." + fi +} diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml index f0ef6662c62..605a0838da7 100644 --- a/dev-python/QtPy/metadata.xml +++ b/dev-python/QtPy/metadata.xml @@ -15,13 +15,30 @@ Basically, you can write your code as if you were using PySide2 but import Qt modules from qtpy instead of PySide2 (or PyQt5) + Use dev-python/PyQt5 as Qt for Python implementation + Use dev-python/pyside2 as Qt for Python implementation + 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 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