From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 finch.gentoo.org (Postfix) with ESMTPS id CD9041582EF for ; Tue, 11 Feb 2025 15:34:23 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id B3FF4343164 for ; Tue, 11 Feb 2025 15:34:23 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id B277411042D; Tue, 11 Feb 2025 15:34:22 +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 bobolink.gentoo.org (Postfix) with ESMTPS id A7DA711042D for ; Tue, 11 Feb 2025 15:34:22 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5ACC9343132 for ; Tue, 11 Feb 2025 15:34:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BCCA62725 for ; Tue, 11 Feb 2025 15:34:20 +0000 (UTC) From: "Nowa 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, "Nowa Ammerlaan" Message-ID: <1739287456.141d4c736676662d93bfc7624932fbe231be1c9f.nowa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/qtpy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/qtpy/Manifest dev-python/qtpy/metadata.xml dev-python/qtpy/qtpy-2.4.3.ebuild X-VCS-Directories: dev-python/qtpy/ X-VCS-Committer: nowa X-VCS-Committer-Name: Nowa Ammerlaan X-VCS-Revision: 141d4c736676662d93bfc7624932fbe231be1c9f X-VCS-Branch: master Date: Tue, 11 Feb 2025 15:34:20 +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: 578dec1f-2813-4d73-a39a-7706eed7808d X-Archives-Hash: 61302f16c97b8167384a3bccfd61f6c0 commit: 141d4c736676662d93bfc7624932fbe231be1c9f Author: Nowa Ammerlaan gentoo org> AuthorDate: Tue Feb 11 15:24:16 2025 +0000 Commit: Nowa Ammerlaan gentoo org> CommitDate: Tue Feb 11 15:24:16 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=141d4c73 dev-python/qtpy: add 2.4.3 Signed-off-by: Nowa Ammerlaan gentoo.org> dev-python/qtpy/Manifest | 1 + dev-python/qtpy/metadata.xml | 1 + dev-python/qtpy/qtpy-2.4.3.ebuild | 184 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+) diff --git a/dev-python/qtpy/Manifest b/dev-python/qtpy/Manifest index ae92a947f4fb..81110b5fb0d6 100644 --- a/dev-python/qtpy/Manifest +++ b/dev-python/qtpy/Manifest @@ -1 +1,2 @@ DIST qtpy-2.4.2.tar.gz 66849 BLAKE2B 1eb362e797950d6c1406fb02bb3047ca7f8fdecd2b75371ab34f39601c9bdebce33336e3809c0d35dca31673c88d1734721a6dfdfb65f2ce20729445c4a4ca27 SHA512 2f9a0e1a4839c8dca23b4364900a12c2bd00f518353785a41eb6bd62fdc469670457f18224e1150a5a216ff5d0c4e799c3a1711ff7703ea07fadd655538fa37a +DIST qtpy-2.4.3.tar.gz 66982 BLAKE2B 92596eaac7be55feaecbfe2fad388ac3a7a5e55763dc794be2a70c081b311843f5dadb03dba06df6711c32ba9c68f18f54c35921b3ba6e2f02f20922ed89455a SHA512 9a12d9e7a8651309807d578e07075d1bd44a7e72b84b7761e80e80b115a492c9369d842a3cca32a438070d9fde2564d9a69d7a2470e9331d81b11469e2c9808a diff --git a/dev-python/qtpy/metadata.xml b/dev-python/qtpy/metadata.xml index efd532e34547..fe0e7db3605b 100644 --- a/dev-python/qtpy/metadata.xml +++ b/dev-python/qtpy/metadata.xml @@ -32,6 +32,7 @@ Build bindings for the QtQuick Build bindings for the QtQuick3D Pull in bindings for the QtRemoteObjects module + Pull in bindings for the QtScXml module Pull in bindings for the QtSensors module Pull in bindings for the QtSerialPort module Pull in bindings for the QtSpatialAudio module diff --git a/dev-python/qtpy/qtpy-2.4.3.ebuild b/dev-python/qtpy/qtpy-2.4.3.ebuild new file mode 100644 index 000000000000..3870257452f8 --- /dev/null +++ b/dev-python/qtpy/qtpy-2.4.3.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYPI_PN=QtPy +PYTHON_COMPAT=( python3_{10..13} ) + +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 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + +_IUSE_QT_MODULES=" + bluetooth dbus designer +gui help multimedia +network nfc opengl pdfium + positioning printsupport qml quick quick3d remoteobjects scxml sensors + serialport spatialaudio speech +sql svg testlib vulkan webchannel + webengine websockets +widgets +xml +" +IUSE="+pyqt6 pyside6 ${_IUSE_QT_MODULES}" +unset _IUSE_QT_MODULES + +REQUIRED_USE="|| ( pyqt6 pyside6 )" + +# 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. +# 3d? ( pyside6 only ) +# charts? ( pyside6 only ) +# concurrent? ( pyside6 only ) +# httpserver? ( pyside6 only ) +# uitools? ( pyside6 only ) +# location? ( pyside6 only) +# network-auth? ( 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 PyQt6 provides this in a separate package +# while PySide6 ships it in the same package. +RDEPEND=" + dev-python/packaging[${PYTHON_USEDEP}] + pyqt6? ( + dev-python/pyqt6[${PYTHON_USEDEP}] + dev-python/pyqt6[bluetooth?,dbus?,designer?,gui?,help?,multimedia?] + dev-python/pyqt6[network?,nfc?,opengl?,pdfium?,positioning?] + dev-python/pyqt6[printsupport?,qml?,quick?,quick3d?,remoteobjects?] + dev-python/pyqt6[scxml(-)?,sensors?,serialport?,spatialaudio?,speech?] + dev-python/pyqt6[sql?,svg?,testlib?,vulkan?,webchannel?,websockets?] + dev-python/pyqt6[widgets?,xml?] + webengine? ( dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets?,quick?] ) + + ) + pyside6? ( + dev-python/pyside:6[${PYTHON_USEDEP},core(+)] + dev-python/pyside:6[bluetooth?,dbus?,designer?,gui?,help?,multimedia?] + dev-python/pyside:6[network?,nfc?,opengl?,pdfium?,positioning?] + dev-python/pyside:6[printsupport?,qml?,quick?,quick3d?,remoteobjects(-)?] + dev-python/pyside:6[scxml?,sensors?,serialport?,spatialaudio?,speech?] + dev-python/pyside:6[sql?,svg?,testlib?,vulkan(+)?,webchannel?,webengine?] + dev-python/pyside:6[websockets?,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/pytest-qt[${PYTHON_USEDEP}] + pyqt6? ( + dev-python/pyqt6[${PYTHON_USEDEP}] + dev-python/pyqt6[bluetooth,dbus,designer,gui,help,multimedia] + dev-python/pyqt6[network,nfc,opengl,pdfium,positioning,printsupport] + dev-python/pyqt6[qml,quick,quick3d,scxml(-),sensors,serialport] + dev-python/pyqt6[spatialaudio,speech,sql,svg,testlib,webchannel] + dev-python/pyqt6[vulkan(-),websockets,widgets,xml] + dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets,quick] + dev-qt/qtbase:6[sqlite] + ) + pyside6? ( + dev-python/pyside:6[${PYTHON_USEDEP},core(+)] + dev-python/pyside:6[3d,bluetooth,charts,concurrent,dbus,designer,gui] + dev-python/pyside:6[help,location,multimedia,network,network-auth] + dev-python/pyside:6[nfc,opengl,pdfium,positioning,printsupport,qml] + dev-python/pyside:6[quick,quick3d,scxml,sensors,serialport] + dev-python/pyside:6[spatialaudio,speech,sql,svg,testlib,vulkan(+)] + dev-python/pyside:6[webchannel,webengine,websockets,widgets,xml] + dev-qt/qtbase:6[sqlite] + ) + ) +" + +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 + + # Always disable PyQt5 + sed \ + -e '/from PyQt5.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' \ + -e '/if "PyQt5" in sys.modules:/,/"pyqt5"/c\' \ + -i qtpy/__init__.py || die + + # We need to ensure the first option is an 'if' not 'elif' + sed -e 's/elif "PySide2" in sys.modules:/if "PySide2" in sys.modules:/g' \ + -i qtpy/__init__.py || die + + # Always disable PySide2 + sed \ + -e "s/from PySide2 import/raise ImportError #/" \ + -e "s/from PySide2.QtCore import/raise ImportError #/" \ + -e '/if "PySide2" in sys.modules:/,/"pyside2"/c\' \ + -i qtpy/__init__.py || die + + sed \ + -e 's/elif "PyQt6" in sys.modules:/if "PyQt6" in sys.modules:/g' \ + -i qtpy/__init__.py || die + + if ! use pyqt6; then + sed \ + -e '/from PyQt6.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' \ + -e '/if "PyQt6" in sys.modules:/,/"pyqt6"/c\' \ + -i qtpy/__init__.py || die + + sed \ + -e 's/elif "PySide6" in sys.modules:/if "PySide6" in sys.modules:/g' \ + -i qtpy/__init__.py || die + fi + if ! use pyside6; then + sed \ + -e "s/from PySide6 import/raise ImportError #/" \ + -e "s/from PySide6.QtCore import/raise ImportError #/" \ + -e '/if "PySide6" in sys.modules:/,/"pyside6"/c\' \ + -i qtpy/__init__.py || die + fi +} + +python_test() { + local -x QT_API + local -a EPYTEST_DESELECT + local other + + # 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 + for QT_API in PyQt6 PySide6; do + if use "${QT_API,,}"; then + EPYTEST_DESELECT=() + for other in PyQt{5,6} PySide{2,6}; do + if [[ ${QT_API} != ${other} ]]; then + EPYTEST_DESELECT+=( + "qtpy/tests/test_main.py::test_qt_api_environ[${other}]" + ) + fi + done + + einfo "Testing with ${EPYTHON} and QT_API=${QT_API}" + nonfatal epytest -o addopts= || + die -n "Tests failed with ${EPYTHON} and QT_API=${QT_API}" || + return 1 + fi + done +} + +src_test() { + virtx distutils-r1_src_test +} + +pkg_postinst() { + elog "When multiple Qt4Python targets are enabled QtPy will default to" + elog "the first enabled target in this order: PyQt6 PySide6." + elog "This can be overridden with the QT_API environment variable." +}