public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Nowa Ammerlaan" <nowa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/qtpy/
Date: Fri, 20 Dec 2024 16:09:47 +0000 (UTC)	[thread overview]
Message-ID: <1734710949.c854ec57b46f85f8d2606af6e1017f70a03cb9f1.nowa@gentoo> (raw)

commit:     c854ec57b46f85f8d2606af6e1017f70a03cb9f1
Author:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 20 15:59:14 2024 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Fri Dec 20 16:09:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c854ec57

dev-python/qtpy: add 2.4.2-r1, drop qt5 support

Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 dev-python/qtpy/metadata.xml         |   5 +
 dev-python/qtpy/qtpy-2.4.2-r1.ebuild | 186 +++++++++++++++++++++++++++++++++++
 2 files changed, 191 insertions(+)

diff --git a/dev-python/qtpy/metadata.xml b/dev-python/qtpy/metadata.xml
index 6d647f05cf63..7feee8ad3488 100644
--- a/dev-python/qtpy/metadata.xml
+++ b/dev-python/qtpy/metadata.xml
@@ -24,13 +24,18 @@
 		<flag name="help">Pull in bindings for the QtHelp module</flag>
 		<flag name="multimedia">Pull in QtMultimedia and QtMultimediaWidgets modules</flag>
 		<flag name="network">Pull in bindings for the QtNetwork module</flag>
+		<flag name="nfc">Pull in bindings for the QtNFC module</flag>
 		<flag name="opengl">Pull in bindings for the QtOpenGL module</flag>
+		<flag name="pdfium">Pull in bindings for the QtPDFium module</flag>
 		<flag name="positioning">Pull in bindings for the QtPositioning module</flag>
 		<flag name="printsupport">Pull in bindings for the QtPrintSupport module</flag>
 		<flag name="qml">Build bindings for the QtQml</flag>
 		<flag name="quick">Build bindings for the QtQuick</flag>
+		<flag name="quick3d">Build bindings for the QtQuick3D</flag>
+		<flag name="remoteobjects">Pull in bindings for the QtRemoteObjects module</flag>
 		<flag name="sensors">Pull in bindings for the QtSensors module</flag>
 		<flag name="serialport">Pull in bindings for the QtSerialPort module</flag>
+		<flag name="spatialaudio">Pull in bindings for the QtSpatialAudio module</flag>
 		<flag name="speech">Pull in bindings for the QtTextToSpeech module</flag>
 		<flag name="sql">Pull in bindings for the QtSql module</flag>
 		<flag name="svg">Pull in bindings for the QtSvg module</flag>

diff --git a/dev-python/qtpy/qtpy-2.4.2-r1.ebuild b/dev-python/qtpy/qtpy-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..41db84c47c11
--- /dev/null
+++ b/dev-python/qtpy/qtpy-2.4.2-r1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2024 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 sensors serialport
+	spatialaudio speech +sql svg testlib 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 )
+# 	scxml? ( pyside6 only )
+#	uitools? ( pyside6 only )
+#	location? ( pyside6 only)
+# 	network-auth? ( pyside6 only )
+#
+# 	vulkan? ( pyqt6 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[sensors?,serialport?,spatialaudio?,speech?,sql?,svg?]
+		dev-python/pyqt6[testlib?,webchannel?,websockets?,widgets?,xml?]
+		webengine? ( dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets?,quick?] )
+
+	)
+	pyside6? (
+		dev-python/pyside6[${PYTHON_USEDEP}]
+		dev-python/pyside6[bluetooth?,dbus?,designer?,gui?,help?,multimedia?]
+		dev-python/pyside6[network?,nfc?,opengl?,pdfium?,positioning?]
+		dev-python/pyside6[printsupport?,qml?,quick?,quick3d?,remoteobjects(-)?]
+		dev-python/pyside6[sensors?,serialport?,spatialaudio?,speech?,sql?,svg?]
+		dev-python/pyside6[testlib?,webchannel?,webengine?,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,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/pyside6[${PYTHON_USEDEP}]
+			dev-python/pyside6[3d,bluetooth,charts,concurrent,dbus,designer,gui]
+			dev-python/pyside6[help,location,multimedia,network,network-auth]
+			dev-python/pyside6[nfc,opengl,pdfium,positioning,printsupport,qml]
+			dev-python/pyside6[quick,quick3d,scxml,sensors,serialport]
+			dev-python/pyside6[spatialaudio,speech,sql,svg,testlib,webchannel]
+			dev-python/pyside6[webengine,websockets,widgets,xml]
+			dev-python/pyside6-tools[${PYTHON_USEDEP}]
+			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."
+}


             reply	other threads:[~2024-12-20 16:09 UTC|newest]

Thread overview: 126+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-20 16:09 Nowa Ammerlaan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-01 11:57 [gentoo-commits] repo/gentoo:master commit in: dev-python/qtpy/ Michał Górny
2025-03-01  9:29 Arthur Zamarin
2025-02-24  8:12 Nowa Ammerlaan
2025-02-13 20:28 Andreas Sturmlechner
2025-02-11 15:34 Nowa Ammerlaan
2025-02-05 19:14 Nowa Ammerlaan
2025-02-03 17:40 Nowa Ammerlaan
2025-01-22 23:52 Andreas Sturmlechner
2025-01-22 23:52 Andreas Sturmlechner
2024-12-14 17:12 Michał Górny
2024-12-14 16:38 Sam James
2024-11-22 20:00 [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/ Michał Górny
2024-11-05  5:53 Michał Górny
2024-09-13 13:01 Andrew Ammerlaan
2024-07-03 16:00 Andrew Ammerlaan
2023-12-16 15:09 Michał Górny
2023-12-16 13:47 Michał Górny
2023-12-16  7:05 Arthur Zamarin
2023-12-16  7:04 Arthur Zamarin
2023-12-15 12:39 Arthur Zamarin
2023-12-15 11:04 Michał Górny
2023-12-05  4:20 Michał Górny
2023-12-03  5:45 Arthur Zamarin
2023-11-22 15:57 Michał Górny
2023-11-22 15:57 Michał Górny
2023-10-26 15:18 Andrew Ammerlaan
2023-10-24  5:16 Michał Górny
2023-10-18 11:36 Andrew Ammerlaan
2023-10-18 11:36 Andrew Ammerlaan
2023-09-26  0:54 Sam James
2023-09-11  6:48 Jakov Smolić
2023-09-10  5:27 WANG Xuerui
2023-08-30  8:52 Andrew Ammerlaan
2023-08-30  7:43 Andrew Ammerlaan
2023-08-21 15:26 Andrew Ammerlaan
2023-04-29  7:09 Michał Górny
2023-04-29  6:59 Arthur Zamarin
2023-03-29  6:24 Michał Górny
2023-03-17 15:25 Michał Górny
2022-12-25 17:50 Michał Górny
2022-12-25 16:42 Sam James
2022-12-05 17:24 WANG Xuerui
2022-11-22 20:01 Arthur Zamarin
2022-11-08 14:01 Michał Górny
2022-10-29 21:11 Sam James
2022-10-28  3:37 Jakov Smolić
2022-10-04 12:20 Andrew Ammerlaan
2022-09-27 12:16 Andrew Ammerlaan
2022-09-08 19:39 Jakov Smolić
2022-08-13 14:18 Andrew Ammerlaan
2022-08-13 14:18 Andrew Ammerlaan
2022-07-15  7:24 Michał Górny
2022-07-15  0:45 Sam James
2022-07-01 20:09 Andrew Ammerlaan
2022-06-30 16:56 Sam James
2022-06-08 19:16 Andrew Ammerlaan
2022-06-07  2:50 Michał Górny
2022-06-06 23:32 Sam James
2022-05-03  8:27 Michał Górny
2022-04-02 15:58 Michał Górny
2022-04-02 12:04 Arthur Zamarin
2022-03-01  9:38 Michał Górny
2022-02-28 23:59 Sam James
2022-02-19 11:12 Andrew Ammerlaan
2021-12-23 11:24 Andrew Ammerlaan
2021-12-15 17:12 Andrew Ammerlaan
2021-12-14 13:33 Andrew Ammerlaan
2021-12-04  4:57 Michał Górny
2021-11-16  6:19 Sam James
2021-11-14 20:29 Sam James
2021-10-04 19:57 Andrew Ammerlaan
2021-09-14  9:33 Andrew Ammerlaan
2021-09-14  9:33 Andrew Ammerlaan
2021-09-14  9:33 Andrew Ammerlaan
2021-09-05  9:54 Andrew Ammerlaan
2021-09-03  1:53 Sam James
2021-08-19 19:44 Andrew Ammerlaan
2021-07-19 18:36 Sam James
2021-06-03  8:23 Andrew Ammerlaan
2021-06-02 20:27 Andrew Ammerlaan
2021-06-02  7:44 Andrew Ammerlaan
2021-05-22 20:55 Andrew Ammerlaan
2021-05-21 16:08 Andrew Ammerlaan
2021-05-20  9:42 Andrew Ammerlaan
2021-05-18 13:40 Michał Górny
2021-05-18 11:40 Michał Górny
2021-05-18  8:51 Michał Górny
2021-05-18  7:21 Michał Górny
2021-05-18  7:21 Michał Górny
2021-05-18  6:29 Agostino Sarubbo
2021-03-11  7:18 Joonas Niilola
2020-08-03  3:11 Sam James
2020-07-07 20:01 Michał Górny
2020-06-09 19:46 Michał Górny
2020-06-09 19:46 Mart Raudsepp
2020-05-11 16:48 Michał Górny
2020-05-11 11:38 Agostino Sarubbo
2020-05-09  7:40 Agostino Sarubbo
2020-03-01  3:30 Andrey Grozin
2020-02-28 18:02 Andreas Sturmlechner
2020-02-28 17:50 Agostino Sarubbo
2020-02-27  9:49 Agostino Sarubbo
2020-02-26 22:02 Andreas Sturmlechner
2020-02-26 22:02 Andreas Sturmlechner
2020-02-05 21:21 Michał Górny
2019-12-23  9:11 Benda XU
2019-07-18 20:58 Andreas Sturmlechner
2019-07-18 14:25 Agostino Sarubbo
2019-07-18  7:26 Agostino Sarubbo
2019-06-29 21:34 Andreas Sturmlechner
2018-05-14  1:36 Andreas Sturmlechner
2018-05-13 23:41 Aaron Bauman
2018-05-13 22:06 Thomas Deutschmann
2018-05-10 14:10 Andreas Sturmlechner
2018-05-10 14:10 Andreas Sturmlechner
2018-04-22 20:43 Andrey Grozin
2017-10-16 14:54 Andreas Sturmlechner
2017-09-28 12:22 Michael Palimaka
2017-09-25 14:10 Pacho Ramos
2017-06-27  2:49 Sebastien Fabbro
2017-05-02 14:02 Michał Górny
2017-02-28 21:28 Sebastien Fabbro
2017-02-26 18:02 Sebastien Fabbro
2017-01-04 19:24 Sebastien Fabbro
2016-12-10  2:05 Sebastien Fabbro

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1734710949.c854ec57b46f85f8d2606af6e1017f70a03cb9f1.nowa@gentoo \
    --to=nowa@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox