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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 13B79158099 for ; Wed, 22 Nov 2023 16:06:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 493EF2BC014; Wed, 22 Nov 2023 16:05:59 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C30382BC014 for ; Wed, 22 Nov 2023 16:05:58 +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 DCB69335DC3 for ; Wed, 22 Nov 2023 16:05:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C69C13B3 for ; Wed, 22 Nov 2023 16:05:56 +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: <1700669134.f46ad64b2ab8bf2a1cb006b8a368d2d18827d26f.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-qt/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pytest-qt/pytest-qt-4.2.0.ebuild X-VCS-Directories: dev-python/pytest-qt/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f46ad64b2ab8bf2a1cb006b8a368d2d18827d26f X-VCS-Branch: master Date: Wed, 22 Nov 2023 16:05:56 +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: 8b10063e-2cf0-4863-94f5-c321b41ebbe7 X-Archives-Hash: d6229e01f72edb63d0c93c48bacc1cde commit: f46ad64b2ab8bf2a1cb006b8a368d2d18827d26f Author: Michał Górny gentoo org> AuthorDate: Wed Nov 22 16:05:34 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Nov 22 16:05:34 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f46ad64b dev-python/pytest-qt: Run tests for available impls only Signed-off-by: Michał Górny gentoo.org> dev-python/pytest-qt/pytest-qt-4.2.0.ebuild | 38 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild b/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild index 6c843c8a73e3..69e99e252e64 100644 --- a/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild +++ b/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild @@ -25,13 +25,13 @@ RDEPEND=" " BDEPEND=" test? ( - dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}] - ' "${PYSIDE2_COMPAT[@]}") - amd64? ( + || ( dev-python/PyQt6[gui,testlib,widgets,${PYTHON_USEDEP}] + dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}] dev-python/pyside6[gui,testlib,widgets,${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}] + ' "${PYSIDE2_COMPAT[@]}") ) ) " @@ -53,25 +53,23 @@ python_test() { # to be possible inside Xvfb "tests/test_basics.py::test_wait_window[waitActive-True]" + # TODO + tests/test_exceptions.py::test_exceptions_dont_leak + # we are forcing a specific module via envvar, effectively # overriding the config tests/test_basics.py::test_qt_api_ini_config tests/test_basics.py::test_qt_api_ini_config_with_envvar ) - einfo "Testing with PyQt5" - PYTEST_QT_API="pyqt5" epytest || die - if use amd64; then - einfo "Testing with PyQt6" - PYTEST_QT_API="pyqt6" epytest || die - fi - # Pyside{2,6} is not compatible with python3.12 - if has "${EPYTHON}" "${PYSIDE2_COMPAT[@]/_/.}"; then - einfo "Testing with PySide2" - PYTEST_QT_API="pyside2" epytest || die - fi - if use amd64 && has "${EPYTHON}" "${PYSIDE6_COMPAT[@]/_/.}"; then - einfo "Testing with PySide6" - PYTEST_QT_API="pyside6" epytest || die - fi + local -x PYTEST_QT_API + for PYTEST_QT_API in PyQt{5,6} pyside{2,6}; do + if has_version "dev-python/${PYTEST_QT_API}[gui,testlib,widgets,${PYTHON_USEDEP}]" + then + einfo "Testing with ${EPYTHON} and ${PYTEST_QT_API}" + nonfatal epytest || + die -n "Tests failed with ${EPYTHON} and ${PYTEST_QT_API}" || + return 1 + fi + done }