From ed87e2128cc963137b8e852c74d2626c20ec6e42d5e610790ef0e0c16a9fc10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 18 May 2020 14:20:12 +0000 Subject: [PATCH] Accepting request 806986 from home:alarrosa:branches:devel:languages:python - Add _multibuild to run the test in a flavor and use xvfb-run instead of calling the Xvfb server directly and depending on the xorg-x11-server-Xvfb package which is not available in SLE/Leap. - Update to 2.8.1: * Fix rst file formats and links #229 * Add .gitattributes for generated and documentation files * Add more complete tox and Travis envs with many checks * Fix removing message format argument * Fix QGroupBox small indicator size #218 * Fix QGroupBox incorrect indicator icon when unfocused #219 * Fix QDateTimeEdit incorrect drop-down arrow icon #220 * Fix documentation OBS-URL: https://build.opensuse.org/request/show/806986 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-QDarkStyle?expand=0&rev=9 --- QDarkStyle-2.8.1.tar.gz | 3 ++ QDarkStyle-2.8.tar.gz | 3 -- _multibuild | 3 ++ python-QDarkStyle.changes | 20 ++++++++++++++ python-QDarkStyle.spec | 58 +++++++++++++++++++++++---------------- 5 files changed, 61 insertions(+), 26 deletions(-) create mode 100644 QDarkStyle-2.8.1.tar.gz delete mode 100644 QDarkStyle-2.8.tar.gz create mode 100644 _multibuild diff --git a/QDarkStyle-2.8.1.tar.gz b/QDarkStyle-2.8.1.tar.gz new file mode 100644 index 0000000..7610007 --- /dev/null +++ b/QDarkStyle-2.8.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc2f8d2b3644ed660c1267cba314df80a08ddaf28c1b7f701f6cdd6f44f70fdb +size 7883937 diff --git a/QDarkStyle-2.8.tar.gz b/QDarkStyle-2.8.tar.gz deleted file mode 100644 index 58fb28f..0000000 --- a/QDarkStyle-2.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e2f1935763072ba4e18cecbf9159082f931d582cc8b37bc6b1fb417f3519f9b -size 7874263 diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/python-QDarkStyle.changes b/python-QDarkStyle.changes index b3a2f1c..03275aa 100644 --- a/python-QDarkStyle.changes +++ b/python-QDarkStyle.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon May 18 13:43:58 UTC 2020 - Antonio Larrosa + +- Add _multibuild to run the test in a flavor and use xvfb-run + instead of calling the Xvfb server directly and depending on the + xorg-x11-server-Xvfb package which is not available in SLE/Leap. + +------------------------------------------------------------------- +Mon May 18 11:12:28 UTC 2020 - Antonio Larrosa + +- Update to 2.8.1: + * Fix rst file formats and links #229 + * Add .gitattributes for generated and documentation files + * Add more complete tox and Travis envs with many checks + * Fix removing message format argument + * Fix QGroupBox small indicator size #218 + * Fix QGroupBox incorrect indicator icon when unfocused #219 + * Fix QDateTimeEdit incorrect drop-down arrow icon #220 + * Fix documentation + ------------------------------------------------------------------- Tue Jan 28 08:31:47 UTC 2020 - Tomáš Chvátal diff --git a/python-QDarkStyle.spec b/python-QDarkStyle.spec index 9350007..4dab852 100644 --- a/python-QDarkStyle.spec +++ b/python-QDarkStyle.spec @@ -16,31 +16,42 @@ # +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 %define X_display ":98" -Name: python-QDarkStyle -Version: 2.8 +Name: python-QDarkStyle%{psuffix} +Version: 2.8.1 Release: 0 Summary: A dark stylesheet for Python and Qt applications License: MIT Group: Development/Languages/Python URL: https://github.com/ColinDuquesnoy/QDarkStyleSheet Source: https://github.com/ColinDuquesnoy/QDarkStyleSheet/archive/v%{version}.tar.gz#/QDarkStyle-%{version}.tar.gz -BuildRequires: %{python_module QtPy >= 1.7} -BuildRequires: %{python_module helpdev} +BuildRequires: %{python_module setuptools} +BuildRequires: fdupes +BuildRequires: python-rpm-macros +Requires: python-QtPy >= 1.9 +Requires: python-helpdev >= 0.6.10 +Requires: python-setuptools +BuildArch: noarch +%if %{with test} +BuildRequires: %{python_module QDarkStyle = %{version}} +BuildRequires: %{python_module QtPy >= 1.9} +BuildRequires: %{python_module helpdev >= 0.6.10} BuildRequires: %{python_module pyside2} BuildRequires: %{python_module pytest-qt} BuildRequires: %{python_module pytest} BuildRequires: %{python_module qt5-devel} -BuildRequires: %{python_module setuptools} -BuildRequires: fdupes -BuildRequires: python-rpm-macros -BuildRequires: xorg-x11-server-Xvfb -Requires: python-QtPy >= 1.7 -Requires: python-helpdev -Requires: python-setuptools -BuildArch: noarch +BuildRequires: xvfb-run +%endif %python_subpackages %description @@ -51,33 +62,34 @@ QDarkStyle is a dark stylesheet for Python and Qt applications. sed -i '1{\,^#!%{_bindir}/env python,d}' qdarkstyle/*.py qdarkstyle/utils/*.py %build +%if !%{with test} %python_build +%endif +%if %{with test} %check export LANG=C.UTF-8 -export DISPLAY=%{X_display} export PYTHONDONTWRITEBYTECODE=1 -Xvfb %{X_display} >& Xvfb.log & -trap "kill $! || true" EXIT -sleep 10 -%{python_expand export PYTHON_PATH=%{buildroot}%{$python_sitelib} -$python example/example.py --qt_from=pyqt5 --test -$python example/example.py --qt_from=pyqt5 --test --no_dark - -$python example/example.py --qt_from=pyside2 --test -$python example/example.py --qt_from=pyside2 --test --no_dark -} +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} xvfb-run $python example/example.py --qt_from=pyqt5 --test +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} xvfb-run $python example/example.py --qt_from=pyqt5 --test --no_dark +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} xvfb-run $python example/example.py --qt_from=pyside2 --test +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} xvfb-run $python example/example.py --qt_from=pyside2 --test --no_dark +%endif %install +%if !%{with test} %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif +%if !%{with test} %files %{python_files} %doc AUTHORS.rst CHANGES.rst README.rst %license LICENSE.rst %{_bindir}/qdarkstyle %{python_sitelib}/qdarkstyle %{python_sitelib}/QDarkStyle-*.egg-info +%endif %changelog