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 0893715ACFC for ; Sat, 29 Apr 2023 07:09:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41E2CE0894; Sat, 29 Apr 2023 07:09:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 1AF76E0894 for ; Sat, 29 Apr 2023 07:09:47 +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 370CF34103D for ; Sat, 29 Apr 2023 07:09:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C699BA58 for ; Sat, 29 Apr 2023 07:09:44 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1682752180.12a3558cb09e0e6089539fbc6e5a3bb06c1f9d08.mgorny@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/QtPy-2.3.0.ebuild X-VCS-Directories: dev-python/QtPy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 12a3558cb09e0e6089539fbc6e5a3bb06c1f9d08 X-VCS-Branch: master Date: Sat, 29 Apr 2023 07:09:44 +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: 0cc9f53b-c5d8-4455-af23-383d780c59d8 X-Archives-Hash: 1ce9fbaee6e8bcad0a73668ded32096a commit: 12a3558cb09e0e6089539fbc6e5a3bb06c1f9d08 Author: Michał Górny gentoo org> AuthorDate: Sat Apr 29 07:07:29 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Apr 29 07:09:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12a3558c dev-python/QtPy: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/QtPy/Manifest | 1 - dev-python/QtPy/QtPy-2.3.0.ebuild | 207 -------------------------------------- 2 files changed, 208 deletions(-) diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest index a05791b29c6c..32f8aebac423 100644 --- a/dev-python/QtPy/Manifest +++ b/dev-python/QtPy/Manifest @@ -1,2 +1 @@ -DIST QtPy-2.3.0.tar.gz 53980 BLAKE2B 142694c3b10dc2ed46c168a063c0019928358d079dddfef0708ec8cabd782e206734bc0f680a7ee7309b483c56ecd739b3364061eaf190a1a9c9e41d940af202 SHA512 1fa3d52367fa70ca178a128f3cc95f333b1408dd88b9f9d15ef30b4c7f848a91df1626fa046667ce6bd6ee3f7a3909f1b3fb06b902eff26e1f058139eced73c6 DIST QtPy-2.3.1.tar.gz 56260 BLAKE2B 1b8d76879cc1f07b3633e6b25887ac4621ee3a8e9ebbcaa1f1f8c4f3fbcdae37bd5d659717bf89227d4ed6b5126554b329813aaee0b6be333c0cdc931cfb8d43 SHA512 9c738ec07e18852b67c30962fbc0ca48479eccff2a9f2ee9f4817c4ead5a8068d54aced58d632977163f180a584a9b7b2b68ea25e0577b92a262fef8eb576041 diff --git a/dev-python/QtPy/QtPy-2.3.0.ebuild b/dev-python/QtPy/QtPy-2.3.0.ebuild deleted file mode 100644 index b3033047630e..000000000000 --- a/dev-python/QtPy/QtPy-2.3.0.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# 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_{9..11} ) - -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=" - designer +gui help multimedia +network opengl positioning - printsupport qml quick serialport +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 )" - -# 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 only ) -# dbus? ( pyqt5 only ) -# -# 3d? ( pyside2 only ) -# charts? ( pyside2 only ) -# concurrent? ( pyside2 only ) -# datavis? ( pyside2 only ) -# scxml? ( pyside2 only ) -# script? ( pyside2 only ) -# scripttools? ( pyside2 only ) -# -# location? ( pyside2 and pyqt5 only ) -# sensors? ( pyside2 and pyqt5 only ) -# speech? ( pyside2 and pyqt5 only ) -# x11extras? ( pyside2 and pyqt5 only ) -# xmlpatterns? ( pyside2 and pyqt5 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?,serialport?,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?,serialport?,sql?] - dev-python/PyQt6[svg?,testlib?,webchannel?,websockets?,widgets?,xml?] - webengine? ( dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets?,quick?] ) - - ) - pyside2? ( - dev-python/pyside2[${PYTHON_USEDEP}] - dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?] - dev-python/pyside2[positioning?,printsupport?,qml?,quick?,serialport(+)?] - dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?] - dev-python/pyside2[widgets?,xml?] - ) - pyside6? ( - dev-python/pyside6[${PYTHON_USEDEP}] - dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?] - dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?] - dev-python/pyside6[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}] - 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,opengl] - dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport] - dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,websockets,widgets,xml] - dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets,quick] - ) - pyside2? ( - 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] - ) - pyside6? ( - dev-python/pyside6[${PYTHON_USEDEP}] - dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia] - dev-python/pyside6[network,opengl,positioning,printsupport,qml] - dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib] - dev-python/pyside6[webchannel,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 "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die - fi - if ! use pyqt6; then - sed -i -e "s/from PyQt6.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 - 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." -}