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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4904C15814C for ; Wed, 18 Oct 2023 11:36:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8EA7A2BC063; Wed, 18 Oct 2023 11:36:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 767DA2BC063 for ; Wed, 18 Oct 2023 11:36:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C267D335D44 for ; Wed, 18 Oct 2023 11:36:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1044B1292 for ; Wed, 18 Oct 2023 11:36:36 +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: <1697628967.ed3cc96f11f8f1fc2bc12444122691ab6ec6b01c.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-2.4.0-r1.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: ed3cc96f11f8f1fc2bc12444122691ab6ec6b01c X-VCS-Branch: master Date: Wed, 18 Oct 2023 11:36:36 +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: 62d4bcae-344d-49d0-b0db-c66ed1fd1919 X-Archives-Hash: 20c7198bf5b125e9e2a38d948d829e1d commit: ed3cc96f11f8f1fc2bc12444122691ab6ec6b01c Author: Andrew Ammerlaan gentoo org> AuthorDate: Wed Oct 18 11:35:10 2023 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Wed Oct 18 11:36:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed3cc96f dev-python/QtPy: add USE=sensors and USE=speech Signed-off-by: Andrew Ammerlaan gentoo.org> dev-python/QtPy/QtPy-2.4.0-r1.ebuild | 217 +++++++++++++++++++++++++++++++++++ dev-python/QtPy/metadata.xml | 2 + 2 files changed, 219 insertions(+) diff --git a/dev-python/QtPy/QtPy-2.4.0-r1.ebuild b/dev-python/QtPy/QtPy-2.4.0-r1.ebuild new file mode 100644 index 000000000000..b36bfa5ce6fc --- /dev/null +++ b/dev-python/QtPy/QtPy-2.4.0-r1.ebuild @@ -0,0 +1,217 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 virtualx pypi + +DESCRIPTION="Abstraction layer on top of PyQt and PySide with additional custom QWidgets" +HOMEPAGE=" + https://github.com/spyder-ide/qtpy/ + https://pypi.org/project/QtPy/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" + +_IUSE_QT_MODULES=" + designer +gui help multimedia +network opengl positioning + printsupport qml quick sensors serialport speech +sql svg testlib + webchannel webengine websockets +widgets +xml +" +IUSE="+pyqt5 pyqt6 pyside2 pyside6 ${_IUSE_QT_MODULES}" +unset _IUSE_QT_MODULES + +REQUIRED_USE=" + || ( pyqt5 pyqt6 pyside2 pyside6 ) + python_targets_python3_12? ( !pyside2 ) +" + +# These flags are currently *not* common to the PySide2/6 and PyQt5/6 ebuilds +# Disable them for now, please check periodically if this is still up to date. +# bluetooth? ( pyqt5/6 and pyside6 only ) +# dbus? ( pyqt5/6 and pyside6 only ) +# +# 3d? ( pyside2/6 only ) +# charts? ( pyside2 only ) +# concurrent? ( pyside2 only ) +# datavis? ( pyside2 only ) +# scxml? ( pyside2/6 only ) +# +# x11extras? ( pyside2 and pyqt5 only ) +# xmlpatterns? ( pyside2 and pyqt5 only ) +# +# location? ( pyside2/6 and pyqt5 only) +# nfc? ( pyqt6 and pyside6 only) +# spatialaudio? ( pyqt6 and pyside6 only) +# pdfium? ( pyqt6 and pyside6 only) + +# 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=" + dev-python/packaging[${PYTHON_USEDEP}] + pyqt5? ( + dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/PyQt5[designer?,gui?,help?,multimedia?,network?,opengl?] + dev-python/PyQt5[positioning?,printsupport?,sensors?,serialport?,speech?,sql?,svg?] + dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?,xml(+)?] + qml? ( dev-python/PyQt5[declarative] ) + quick? ( dev-python/PyQt5[declarative] ) + webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] ) + ) + pyqt6? ( + dev-python/PyQt6[${PYTHON_USEDEP}] + dev-python/PyQt6[designer?,gui?,help?,multimedia?,network?,opengl?] + dev-python/PyQt6[positioning?,printsupport?,qml?,quick?,sensors?,serialport?,sql?] + dev-python/PyQt6[speech?,svg?,testlib?,webchannel?,websockets?,widgets?,xml?] + webengine? ( dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets?,quick?] ) + + ) + pyside2? ( + $(python_gen_cond_dep ' + dev-python/pyside2[${PYTHON_USEDEP}] + dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?] + dev-python/pyside2[positioning?,printsupport?,qml?,quick?,sensors?,serialport(+)?] + dev-python/pyside2[speech?,sql?,svg?,testlib?,webchannel?,webengine?,websockets?] + dev-python/pyside2[widgets?,xml?] + ' python3_{10..11}) + ) + pyside6? ( + dev-python/pyside6[${PYTHON_USEDEP}] + dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?] + dev-python/pyside6[positioning?,printsupport?,qml?,quick?,sensors(-)?,serialport?] + dev-python/pyside6[speech(-)?,sql?,svg?,testlib?,webchannel?,webengine?,websockets?] + dev-python/pyside6[widgets?,xml?] + ) +" + +# 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/pytest-qt[${PYTHON_USEDEP}] + pyqt5? ( + 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,speech(-),sql,svg,testlib,webchannel] + dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns] + dev-python/PyQtWebEngine[${PYTHON_USEDEP}] + ) + pyqt6? ( + dev-python/PyQt6[${PYTHON_USEDEP}] + dev-python/PyQt6[dbus,designer,gui,help,multimedia,network,nfc,opengl] + dev-python/PyQt6[pdfium(-),positioning,printsupport,qml,quick,quick3d,serialport] + dev-python/PyQt6[sensors(-),spatialaudio(-),speech(-),sql,ssl,svg,testlib,webchannel] + dev-python/PyQt6[websockets,widgets,xml] + dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets,quick] + ) + pyside2? ( + $(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(+)] + dev-python/pyside2[positioning,printsupport,qml,quick,scxml] + dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib] + dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras] + dev-python/pyside2[xml,xmlpatterns] + ' python3_{10..11}) + ) + pyside6? ( + dev-python/pyside6[${PYTHON_USEDEP}] + dev-python/pyside6[3d(-),bluetooth(-),concurrent,dbus,designer,gui,help] + dev-python/pyside6[location(-),multimedia,network,nfc(-),opengl,positioning,pdfium(-)] + dev-python/pyside6[printsupport,qml,quick,quick3d,scxml(-),sensors(-)] + dev-python/pyside6[serialport,spatialaudio(-),speech(-),sql,svg,testlib,webchannel] + dev-python/pyside6[webengine,websockets,widgets,xml] + ) + ) +" + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare + sed -i -e 's:--cov=qtpy --cov-report=term-missing::' pytest.ini || die + # Disable Qt for Python implementations that are not selected + if ! use pyqt5; then + sed -i -e '/from PyQt5.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' qtpy/__init__.py || die + fi + if ! use pyqt6; then + sed -i -e '/from PyQt6.QtCore import/,/)/c\ \ \ \ \ \ \ \ 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 + if ! use pyside6; then + sed -i -e "s/from PySide6 import/raise ImportError #/" qtpy/__init__.py || die + sed -i -e "s/from PySide6.QtCore import/raise ImportError #/" qtpy/__init__.py || die + fi +} + +python_test() { + # Test for each enabled Qt4Python target. + # Deselect the other targets, their test fails if we specify QT_API + # or if we have disabled their corresponding inherit in __init__.py above + if use pyqt5; then + einfo "Testing with ${EPYTHON} and QT_API=PyQt5" + QT_API="pyqt5" virtx epytest \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6] + fi + if use pyqt6; then + einfo "Testing with ${EPYTHON} and QT_API=PyQt6" + QT_API="pyqt6" virtx epytest \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6] \ + --deselect qtpy/tests/test_qtsensors.py::test_qtsensors + # Qt6Sensors not yet packaged and enabled in PyQt6 ebuild + fi + if use pyside2; then + einfo "Testing with ${EPYTHON} and QT_API=PySide2" + QT_API="pyside2" virtx epytest \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6] + fi + if use pyside6; then + einfo "Testing with ${EPYTHON} and QT_API=PySide6" + QT_API="pyside6" virtx epytest \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \ + --deselect qtpy/tests/test_qtsensors.py::test_qtsensors + # Qt6Sensors not yet packaged and enabled in PySide6 ebuild + fi +} + +pkg_postinst() { + elog "When multiple Qt4Python targets are enabled QtPy will default to" + elog "the first enabled target in this order: PyQt5 PySide2 PyQt6 PySide6." + elog "This can be overridden with the QT_API environment variable." +} diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml index e748334bb8e6..e50590762519 100644 --- a/dev-python/QtPy/metadata.xml +++ b/dev-python/QtPy/metadata.xml @@ -29,7 +29,9 @@ Pull in bindings for the QtPrintSupport module Build bindings for the QtQml Build bindings for the QtQuick + Pull in bindings for the QtSensors module Pull in bindings for the QtSerialPort module + Pull in bindings for the QtTextToSpeech module Pull in bindings for the QtSql module Pull in bindings for the QtSvg module Pull in bindings for the QtTest module