From 6d0a3de6067e9eb63acc22e9e7a3db0448581ad6f09a30be1a676a7e0cc279cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Dec 2024 12:11:28 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main python-pytest-qt revision 20ea77b12ac51dc015848f44064f27cb --- pytest-qt-4.2.0.tar.gz | 3 --- pytest-qt-4.4.0.tar.gz | 3 +++ python-pytest-qt.changes | 53 ++++++++++++++++++++++++++++++++++++++-- python-pytest-qt.spec | 25 ++++++++----------- 4 files changed, 64 insertions(+), 20 deletions(-) delete mode 100644 pytest-qt-4.2.0.tar.gz create mode 100644 pytest-qt-4.4.0.tar.gz diff --git a/pytest-qt-4.2.0.tar.gz b/pytest-qt-4.2.0.tar.gz deleted file mode 100644 index 14a0b5e..0000000 --- a/pytest-qt-4.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:00a17b586dd530b6d7a9399923a40489ca4a9a309719011175f55dc6b5dc8f41 -size 120749 diff --git a/pytest-qt-4.4.0.tar.gz b/pytest-qt-4.4.0.tar.gz new file mode 100644 index 0000000..b3c8d45 --- /dev/null +++ b/pytest-qt-4.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76896142a940a4285339008d6928a36d4be74afec7e634577e842c9cc5c56844 +size 125443 diff --git a/python-pytest-qt.changes b/python-pytest-qt.changes index cabaac4..51e7879 100644 --- a/python-pytest-qt.changes +++ b/python-pytest-qt.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Wed May 29 10:45:04 UTC 2024 - Antonio Larrosa + +- Run test_destroyed again, the problem was fixed in the + python3-pyside6 package. + +------------------------------------------------------------------- +Tue May 28 06:16:27 UTC 2024 - Daniel Garcia + +- Skip test_destroyed, this test fails with pyside6 6.7.0 + +------------------------------------------------------------------- +Sat Mar 16 09:34:01 UTC 2024 - Dirk Müller + +- update to 4.4.0: + * Fixed exception handling so they are properly cleared in + Python 3.12, due to the new sys.last_exc attribute (#532). + +------------------------------------------------------------------- +Sun Jan 28 17:40:13 UTC 2024 - Ben Greiner + +- Don't require any backend. The testing application should + specify their set explicitly. +- Test pyside on SLE15 python module + +------------------------------------------------------------------- +Thu Jan 25 15:13:50 UTC 2024 - Ben Greiner + +- %sle15_python_module_pythons must define %pythons before any + %python_module usage + +------------------------------------------------------------------- +Fri Jan 5 17:11:51 UTC 2024 - Dirk Müller + +- update to 4.3.1: + * Added official support for Python 3.12. + * Python 3.7 is no longer supported. + * qapp now sets up the QApplication instance with a command + line argument like this QApplication([prog_name]) instead of + using an empty list QApplication([]). Here prog_name is the + name of the app which defaults to pytest-qt-app, but can be + redefined in the pytest.ini file, see :ref:`qapp + fixture`. Alternatively, the arguments + that will be passed to QApplication can be defined explicitly + using the qapp_args fixture. This means that the default + behavior of the qapp_args fixture is now also changed + accordingly: it now returns the list [prog_name] instead of + an empty list. + ------------------------------------------------------------------- Fri Jun 23 19:07:24 UTC 2023 - Ben Greiner @@ -159,8 +208,8 @@ Mon Jun 14 15:02:19 UTC 2021 - Ben Greiner * Errors related to the ``qt_compat`` module (such as an invalid ``PYTEST_QT_API`` setting or missing Qt API wrappers) are now shown as a more human-readable error message rather than an internal pytest error (`#355`_). Thanks - `@The-Compiler`_ for the PR. - + `@The-Compiler`_ for the PR. + ------------------------------------------------------------------- Fri Sep 25 09:19:58 UTC 2020 - Benjamin Greiner diff --git a/python-pytest-qt.spec b/python-pytest-qt.spec index 35d9ec6..97cb5a4 100644 --- a/python-pytest-qt.spec +++ b/python-pytest-qt.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package python-pytest-qt # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,9 @@ # +%{?sle15_python_module_pythons} +# pyside is for one flavor only +%define pyside_python %{?sle15_python_module_pythons:%pythons}%{!?sle15_python_module_pythons:python3} %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "" %define psuffix %{nil} @@ -41,8 +44,7 @@ BuildConflicts: %{python_module qt5} %endif %if "%{flavor}" == "test-pyside2" %define psuffix -%{flavor} -# pyside is for the primary python3 flavor only -%define pythons python3 +%{!?sle15_python_module_pythons:%define pythons python3} %define test_qtapi pyside2 %bcond_without test BuildRequires: %{python_module pyside2} @@ -52,8 +54,7 @@ BuildConflicts: %{python_module qt5} %endif %if "%{flavor}" == "test-pyside6" %define psuffix -%{flavor} -# pyside is for the primary python3 flavor only -%define pythons python3 +%{!?sle15_python_module_pythons:%define pythons python3} %define test_qtapi pyside6 # invalid traceback gh#pytest-dev/pytest-qt#488 %define testflavorargs --ignore tests/test_exceptions.py @@ -63,17 +64,15 @@ BuildConflicts: %{python_module PyQt6} BuildConflicts: %{python_module pyside2} BuildConflicts: %{python_module qt5} %endif - -%{?sle15_python_module_pythons} Name: python-pytest-qt%{psuffix} -Version: 4.2.0 +Version: 4.4.0 Release: 0 Summary: Pytest support for PyQt and PySide applications License: MIT Group: Development/Languages/Python URL: https://github.com/pytest-dev/pytest-qt Source: https://files.pythonhosted.org/packages/source/p/pytest-qt/pytest-qt-%{version}.tar.gz -BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} @@ -89,11 +88,6 @@ Suggests: python-pyside2 Suggests: python-pyside6 Suggests: python-qt5 BuildArch: noarch -%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" -Requires: (python-qt5 or python-PyQt6 or python3-pyside2 or python3-pyside6) -%else -Requires: (python-qt5 or python-PyQt6) -%endif %if %{with test} BuildRequires: %{python_module pytest-qt = %{version}} BuildRequires: %{python_module pytest} @@ -129,6 +123,7 @@ sed -i /xfail_strict/d setup.cfg %check export QT_QPA_PLATFORM=offscreen export PYTEST_QT_API=%{test_qtapi} + %pytest %{?testflavorargs} -rsxXfE %endif