From 83cdaf684ee505b580cbcb7da7b7ef29fcc98674 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sat, 29 May 2021 10:36:55 +0200 Subject: dev-python/QtPy: drop netwrokauth and webkit flag, add py3.{9,10} - PySide2 is not compatible with python3.10, to add python3.10 to this package anyway we need to force disable pyside2 if we want to use python_targets_python3_10. - To accomadate this we have to rewrite the test suite to support running if one of the two implementations is disabled. Otherwise tests would fail with USE="pyqt5 -pyside2 python_targets_python3_10: due to ImportErrors that we explicitly introduced in the prepare phase with USE="-pyside2" Closes: https://bugs.gentoo.org/780330 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- dev-python/QtPy/QtPy-1.9.0-r2.ebuild | 50 ------- dev-python/QtPy/QtPy-1.9.0-r3.ebuild | 55 ++++++++ dev-python/QtPy/QtPy-1.9.0-r4.ebuild | 140 -------------------- dev-python/QtPy/QtPy-1.9.0-r5.ebuild | 159 +++++++++++++++++++++++ dev-python/QtPy/files/QtPy-1.9.0-python3_9.patch | 13 ++ 5 files changed, 227 insertions(+), 190 deletions(-) delete mode 100644 dev-python/QtPy/QtPy-1.9.0-r2.ebuild create mode 100644 dev-python/QtPy/QtPy-1.9.0-r3.ebuild delete mode 100644 dev-python/QtPy/QtPy-1.9.0-r4.ebuild create mode 100644 dev-python/QtPy/QtPy-1.9.0-r5.ebuild create mode 100644 dev-python/QtPy/files/QtPy-1.9.0-python3_9.patch (limited to 'dev-python/QtPy') diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild deleted file mode 100644 index 8e1f50a8e472..000000000000 --- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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 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="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/mock[${PYTHON_USEDEP}] - 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}] - )" - -distutils_enable_tests pytest - -src_prepare() { - default - - sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die - 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 -} diff --git a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild new file mode 100644 index 000000000000..7ee5dea86d8e --- /dev/null +++ b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild @@ -0,0 +1,55 @@ +# 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 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="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/mock[${PYTHON_USEDEP}] + dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location] + dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport] + dev-python/PyQt5[sensors,serialport,sql,svg,testlib,webchannel] + dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns] + dev-python/PyQtWebEngine[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +src_prepare() { + default + + 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 + sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die +} + +python_test() { + local -x QT_API="pyqt5" + virtx pytest -vv +} diff --git a/dev-python/QtPy/QtPy-1.9.0-r4.ebuild b/dev-python/QtPy/QtPy-1.9.0-r4.ebuild deleted file mode 100644 index 0aa58b9aaab0..000000000000 --- a/dev-python/QtPy/QtPy-1.9.0-r4.ebuild +++ /dev/null @@ -1,140 +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_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 ) - test? ( 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,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/QtPy-1.9.0-r5.ebuild b/dev-python/QtPy/QtPy-1.9.0-r5.ebuild new file mode 100644 index 000000000000..b2d2c09acca2 --- /dev/null +++ b/dev-python/QtPy/QtPy-1.9.0-r5.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} ) + +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 + +# PySide2 does not support python3_10, nor is it likely that it will in the +# future since upstream appears to be focussing on PySide6 for Qt6 instead +# (which is compatible with python3_10). So if we want to use python3_10 +# we have to force disable pyside2. +REQUIRED_USE=" + || ( pyqt5 pyside2 ) + python_targets_python3_10? ( 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 ) +# +# 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? ( + $(python_gen_cond_dep ' + 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] ) + ' python3_{7..9} ) + ) +" + +# 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,opengl,positioning,printsupport] + dev-python/PyQt5[sensors,serialport,sql,svg,testlib,webchannel] + dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns] + dev-python/PyQtWebEngine[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + 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] + ' python3_{7..9} ) + ) +" + +distutils_enable_tests pytest + +# https://github.com/spyder-ide/qtpy/issues/238 +PATCHES=( + "${FILESDIR}/${P}-python3_9.patch" +) + +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 + sed -i -e "s/from PySide2.QtCore 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 + sed -i -e "s/from PySide.QtCore import/raise ImportError #/" qtpy/__init__.py || die +} + +src_test() { + virtx python_foreach_impl python_test +} + +python_test() { + if use pyqt5; then + QT_API="pyqt5" epytest + fi + if use pyside2; then + if [[ "${EPYTHON}" == "python3.10" ]]; then + return + else + QT_API="pyside2" epytest + fi + fi +} + +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/files/QtPy-1.9.0-python3_9.patch b/dev-python/QtPy/files/QtPy-1.9.0-python3_9.patch new file mode 100644 index 000000000000..7a3d812f1771 --- /dev/null +++ b/dev-python/QtPy/files/QtPy-1.9.0-python3_9.patch @@ -0,0 +1,13 @@ +diff --git a/qtpy/uic.py b/qtpy/uic.py +index 07d7a78..84525ab 100644 +--- a/qtpy/uic.py ++++ b/qtpy/uic.py +@@ -181,7 +181,7 @@ else: + + custom_widget_classes = {} + +- for custom_widget in custom_widgets.getchildren(): ++ for custom_widget in list(custom_widgets): + + cw_class = custom_widget.find('class').text + cw_header = custom_widget.find('header').text -- cgit v1.2.3-65-gdbad