From c459eaf325baeeee9010aaaa6823b76acab6e3d7405f11c74796e012b3e334d1 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 14 Jan 2021 16:47:25 +0000 Subject: [PATCH] Accepting request 863063 from home:alarrosa:branches:devel:languages:python - Add also BuildRequires for qt3d-qt5 and qtdatavis3d-qt5 so those tests are not skipped. - qtcharts-qt5 is not added because the python-qt5 package is always pulled in automatically and QtPy uses it by default while QtCharts is only available with PySide2. - Replace the Requires with Recommends since not even PyQt is really required (PySide2 can also be used with QtPy, and is now added as a Suggested package). - Rename QtDatavisualization.py to QtDataVisualization.py (uppercase v) to fix the test which was skipped because the imported module didn't exist and to keep the name consistent with both PyQt and PySide2 (gh#spyder-ide/qtpy#228) OBS-URL: https://build.opensuse.org/request/show/863063 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-QtPy?expand=0&rev=26 --- python-QtPy.changes | 16 ++++++++++++++++ python-QtPy.spec | 11 +++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/python-QtPy.changes b/python-QtPy.changes index f7be6e5..468f50e 100644 --- a/python-QtPy.changes +++ b/python-QtPy.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Jan 14 09:12:53 UTC 2021 - Antonio Larrosa + +- Add also BuildRequires for qt3d-qt5 and qtdatavis3d-qt5 so + those tests are not skipped. +- qtcharts-qt5 is not added because the python-qt5 package is + always pulled in automatically and QtPy uses it by default + while QtCharts is only available with PySide2. +- Replace the Requires with Recommends since not even PyQt is + really required (PySide2 can also be used with QtPy, and is now + added as a Suggested package). +- Rename QtDatavisualization.py to QtDataVisualization.py + (uppercase v) to fix the test which was skipped because the + imported module didn't exist and to keep the name consistent + with both PyQt and PySide2 (gh#spyder-ide/qtpy#228) + ------------------------------------------------------------------- Wed Jan 13 15:55:35 UTC 2021 - Antonio Larrosa diff --git a/python-QtPy.spec b/python-QtPy.spec index 4a460f7..14d7f14 100644 --- a/python-QtPy.spec +++ b/python-QtPy.spec @@ -25,13 +25,18 @@ License: MIT Group: Development/Languages/Python URL: https://github.com/spyder-ide/qtpy Source: https://files.pythonhosted.org/packages/source/Q/QtPy/QtPy-%{version}.tar.gz +BuildRequires: %{python_module qt3d-qt5} BuildRequires: %{python_module qt5} +BuildRequires: %{python_module qtdatavis3d-qt5} BuildRequires: %{python_module qtwebengine-qt5} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-qt5 -Requires: python-qtwebengine-qt5 +Recommends: python-qt3d-qt5 +Recommends: python-qt5 +Recommends: python-qtdatavis3d-qt5 +Recommends: python-qtwebengine-qt5 +Suggests: python-pyside2 BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module mock} @@ -54,6 +59,8 @@ Basically, you write your code as if you were using PyQt5 but import qt from %setup -q -n QtPy-%{version} sed -i 's/\r$//' LICENSE.txt rm qtpy/tests/runtests.py +# Submitted to upstream at gh#spyder-ide/qtpy#228 +mv qtpy/QtDatavisualization.py qtpy/QtDataVisualization.py %build %python_build