Hello community,
here is the log from the commit of package python-QtPy for openSUSE:Factory
checked in at 2019-03-19 09:58:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-QtPy (Old)
and /work/SRC/openSUSE:Factory/.python-QtPy.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-QtPy"
Tue Mar 19 09:58:07 2019 rev:7 rq:682089 version:1.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-QtPy/python-QtPy.changes 2018-12-19
13:52:04.471063869 +0100
+++ /work/SRC/openSUSE:Factory/.python-QtPy.new.28833/python-QtPy.changes
2019-03-19 09:58:09.736108508 +0100
@@ -1,0 +2,7 @@
+Wed Mar 6 10:25:51 UTC 2019 - Tomáš Chvátal <tchva...@suse.com>
+
+- Update to 1.6.0:
+ * Add support for QtQuickWidgets
+ * Issue 178 - Error when import QtCore.version in PySide2
+
+-------------------------------------------------------------------
Old:
----
QtPy-1.5.2.tar.gz
New:
----
QtPy-1.6.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-QtPy.spec ++++++
--- /var/tmp/diff_new_pack.eeq9cR/_old 2019-03-19 09:58:10.824108071 +0100
+++ /var/tmp/diff_new_pack.eeq9cR/_new 2019-03-19 09:58:10.864108055 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-QtPy
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,12 +18,12 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-QtPy
-Version: 1.5.2
+Version: 1.6.0
Release: 0
Summary: Abstraction layer on top of Qt bindings
License: MIT
Group: Development/Languages/Python
-Url: https://github.com/spyder-ide/qtpy
+URL: https://github.com/spyder-ide/qtpy
Source:
https://files.pythonhosted.org/packages/source/Q/QtPy/QtPy-%{version}.tar.gz
BuildRequires: %{python_module qt5}
BuildRequires: %{python_module setuptools}
@@ -31,14 +31,13 @@
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: xvfb-run
+Requires: python-qt5
+Requires: python-sip
+BuildArch: noarch
# SECTION test requirements
BuildRequires: %{python_module mock}
BuildRequires: %{python_module pytest}
# /SECTION
-Requires: python-qt5
-Requires: python-sip
-BuildArch: noarch
-
%python_subpackages
%description
@@ -61,7 +60,7 @@
%install
%python_install
%{python_expand chmod a+x %{buildroot}%{$python_sitelib}/qtpy/tests/runtests.py
-sed -i "s|^#!/usr/bin/env python$|#!%__$python|"
%{buildroot}%{$python_sitelib}/qtpy/tests/runtests.py
+sed -i "s|^#!%{_bindir}/env python$|#!%__$python|"
%{buildroot}%{$python_sitelib}/qtpy/tests/runtests.py
$python -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/qtpy/tests/
$python -O -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/qtpy/tests/
%fdupes %{buildroot}%{$python_sitelib}
++++++ QtPy-1.5.2.tar.gz -> QtPy-1.6.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPy-1.5.2/CHANGELOG.md new/QtPy-1.6.0/CHANGELOG.md
--- old/QtPy-1.5.2/CHANGELOG.md 2018-10-20 19:40:16.000000000 +0200
+++ new/QtPy-1.6.0/CHANGELOG.md 2019-01-12 01:40:31.000000000 +0100
@@ -1,5 +1,29 @@
# History of changes
+## Version 1.6 (2019-01-12)
+
+### New features
+
+* Add support for QtQuickWidgets.
+
+### Issues Closed
+
+* [Issue 178](https://github.com/spyder-ide/qtpy/issues/178) - Error when
import QtCore.__version__ in PySide2 ([PR
180](https://github.com/spyder-ide/qtpy/pull/180))
+
+In this release 1 issue was closed.
+
+### Pull Requests Merged
+
+* [PR 181](https://github.com/spyder-ide/qtpy/pull/181) - PR: Restore
QWebEngineSettings for PySide2
+* [PR 180](https://github.com/spyder-ide/qtpy/pull/180) - PR: Add
QtCore.__version__ for PySide2
([178](https://github.com/spyder-ide/qtpy/issues/178))
+* [PR 179](https://github.com/spyder-ide/qtpy/pull/179) - PR: Add
QtQuickWidgets
+
+In this release 3 pull requests were closed.
+
+
+----
+
+
## Version 1.5.2 (2018-10-20)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPy-1.5.2/PKG-INFO new/QtPy-1.6.0/PKG-INFO
--- old/QtPy-1.5.2/PKG-INFO 2018-10-20 19:42:20.000000000 +0200
+++ new/QtPy-1.6.0/PKG-INFO 2019-01-12 01:41:39.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: QtPy
-Version: 1.5.2
+Version: 1.6.0
Summary: Provides an abstraction layer on top of the various Qt bindings
(PyQt5, PyQt4 and PySide) and additional custom QWidgets.
Home-page: https://github.com/spyder-ide/qtpy
Author: Colin Duquesnoy, The Spyder Development Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPy-1.5.2/QtPy.egg-info/PKG-INFO
new/QtPy-1.6.0/QtPy.egg-info/PKG-INFO
--- old/QtPy-1.5.2/QtPy.egg-info/PKG-INFO 2018-10-20 19:42:20.000000000
+0200
+++ new/QtPy-1.6.0/QtPy.egg-info/PKG-INFO 2019-01-12 01:41:37.000000000
+0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: QtPy
-Version: 1.5.2
+Version: 1.6.0
Summary: Provides an abstraction layer on top of the various Qt bindings
(PyQt5, PyQt4 and PySide) and additional custom QWidgets.
Home-page: https://github.com/spyder-ide/qtpy
Author: Colin Duquesnoy, The Spyder Development Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPy-1.5.2/QtPy.egg-info/SOURCES.txt
new/QtPy-1.6.0/QtPy.egg-info/SOURCES.txt
--- old/QtPy-1.5.2/QtPy.egg-info/SOURCES.txt 2018-10-20 19:42:20.000000000
+0200
+++ new/QtPy-1.6.0/QtPy.egg-info/SOURCES.txt 2019-01-12 01:41:37.000000000
+0100
@@ -21,6 +21,7 @@
qtpy/QtPrintSupport.py
qtpy/QtQml.py
qtpy/QtQuick.py
+qtpy/QtQuickWidgets.py
qtpy/QtSql.py
qtpy/QtSvg.py
qtpy/QtTest.py
@@ -57,10 +58,12 @@
qtpy/tests/test_qtprintsupport.py
qtpy/tests/test_qtqml.py
qtpy/tests/test_qtquick.py
+qtpy/tests/test_qtquickwidgets.py
qtpy/tests/test_qtsql.py
qtpy/tests/test_qtsvg.py
qtpy/tests/test_qttest.py
qtpy/tests/test_qtwebchannel.py
+qtpy/tests/test_qtwebenginewidgets.py
qtpy/tests/test_qtwebsockets.py
qtpy/tests/test_qtxmlpatterns.py
qtpy/tests/test_uic.py
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPy-1.5.2/qtpy/QtCore.py
new/QtPy-1.6.0/qtpy/QtCore.py
--- old/QtPy-1.5.2/qtpy/QtCore.py 2018-08-25 20:54:38.000000000 +0200
+++ new/QtPy-1.6.0/qtpy/QtCore.py 2019-01-10 23:35:00.000000000 +0100
@@ -28,10 +28,14 @@
del pyqtSignal, pyqtSlot, pyqtProperty, QT_VERSION_STR
elif PYSIDE2:
from PySide2.QtCore import *
+
try: # may be limited to PySide-5.11a1 only
from PySide2.QtGui import QStringListModel
except:
pass
+
+ import PySide2.QtCore
+ __version__ = PySide2.QtCore.__version__
elif PYQT4:
from PyQt4.QtCore import *
# Those are things we inherited from Spyder that fix crazy crashes under
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPy-1.5.2/qtpy/QtQuickWidgets.py
new/QtPy-1.6.0/qtpy/QtQuickWidgets.py
--- old/QtPy-1.5.2/qtpy/QtQuickWidgets.py 1970-01-01 01:00:00.000000000
+0100
+++ new/QtPy-1.6.0/qtpy/QtQuickWidgets.py 2019-01-11 03:13:27.000000000
+0100
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Copyright © 2009- The Spyder Development Team
+#
+# Licensed under the terms of the MIT License
+# (see LICENSE.txt for details)
+# -----------------------------------------------------------------------------
+"""Provides QtQuickWidgets classes and functions."""
+
+# Local imports
+from . import PYQT5, PYSIDE2, PythonQtError
+
+if PYQT5:
+ from PyQt5.QtQuickWidgets import *
+elif PYSIDE2:
+ from PySide2.QtQuickWidgets import *
+else:
+ raise PythonQtError('No Qt bindings could be found')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPy-1.5.2/qtpy/QtWebEngineWidgets.py
new/QtPy-1.6.0/qtpy/QtWebEngineWidgets.py
--- old/QtPy-1.5.2/qtpy/QtWebEngineWidgets.py 2017-05-11 17:36:04.000000000
+0200
+++ new/QtPy-1.6.0/qtpy/QtWebEngineWidgets.py 2019-01-11 03:13:27.000000000
+0100
@@ -28,17 +28,9 @@
from PyQt5.QtWebKit import QWebSettings as QWebEngineSettings
WEBENGINE = False
elif PYSIDE2:
- try:
- from PySide2.QtWebEngineWidgets import QWebEnginePage
- from PySide2.QtWebEngineWidgets import QWebEngineView
- # Current PySide2 wheels seem to be missing this.
- # from PySide2.QtWebEngineWidgets import QWebEngineSettings
- except ImportError:
- from PySide2.QtWebKitWidgets import QWebPage as QWebEnginePage
- from PySide2.QtWebKitWidgets import QWebView as QWebEngineView
- # Current PySide2 wheels seem to be missing this.
- # from PySide2.QtWebKit import QWebSettings as QWebEngineSettings
- WEBENGINE = False
+ from PySide2.QtWebEngineWidgets import QWebEnginePage
+ from PySide2.QtWebEngineWidgets import QWebEngineView
+ from PySide2.QtWebEngineWidgets import QWebEngineSettings
elif PYQT4:
from PyQt4.QtWebKit import QWebPage as QWebEnginePage
from PyQt4.QtWebKit import QWebView as QWebEngineView
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPy-1.5.2/qtpy/_version.py
new/QtPy-1.6.0/qtpy/_version.py
--- old/QtPy-1.5.2/qtpy/_version.py 2018-10-20 19:41:00.000000000 +0200
+++ new/QtPy-1.6.0/qtpy/_version.py 2019-01-12 01:40:51.000000000 +0100
@@ -1,2 +1,2 @@
-version_info = (1, 5, 2)
+version_info = (1, 6, 0)
__version__ = '.'.join(map(str, version_info))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPy-1.5.2/qtpy/tests/test_patch_qcombobox.py
new/QtPy-1.6.0/qtpy/tests/test_patch_qcombobox.py
--- old/QtPy-1.5.2/qtpy/tests/test_patch_qcombobox.py 2017-05-11
17:36:04.000000000 +0200
+++ new/QtPy-1.6.0/qtpy/tests/test_patch_qcombobox.py 2019-01-10
23:35:00.000000000 +0100
@@ -1,5 +1,6 @@
from __future__ import absolute_import
+import os
import sys
import pytest
@@ -25,7 +26,8 @@
raise ValueError("Failing")
-@pytest.mark.skipif(PY3 or PYSIDE2, reason="It segfaults in Python 3 and
PYSIDE2")
+@pytest.mark.skipif(PY3 or (PYSIDE2 and os.environ.get('CI', None) is not
None),
+ reason="It segfaults in Python 3 and in our CIs with
PySide2")
def test_patched_qcombobox():
"""
In PySide, using Python objects as userData in QComboBox causes
@@ -84,6 +86,8 @@
assert widget.itemText(6) == 'f'
+@pytest.mark.skipif((PYSIDE2 and os.environ.get('CI', None) is not None),
+ reason="It segfaults in our CIs with PYSIDE2")
def test_model_item():
"""
This is a regression test for an issue that caused the call to item(0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPy-1.5.2/qtpy/tests/test_qtquickwidgets.py
new/QtPy-1.6.0/qtpy/tests/test_qtquickwidgets.py
--- old/QtPy-1.5.2/qtpy/tests/test_qtquickwidgets.py 1970-01-01
01:00:00.000000000 +0100
+++ new/QtPy-1.6.0/qtpy/tests/test_qtquickwidgets.py 2019-01-11
03:13:27.000000000 +0100
@@ -0,0 +1,10 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import PYQT5, PYSIDE2
+
+@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5
bindings")
+def test_qtquickwidgets():
+ """Test the qtpy.QtQuickWidgets namespace"""
+ from qtpy import QtQuickWidgets
+ assert QtQuickWidgets.QQuickWidget is not None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPy-1.5.2/qtpy/tests/test_qtwebenginewidgets.py
new/QtPy-1.6.0/qtpy/tests/test_qtwebenginewidgets.py
--- old/QtPy-1.5.2/qtpy/tests/test_qtwebenginewidgets.py 1970-01-01
01:00:00.000000000 +0100
+++ new/QtPy-1.6.0/qtpy/tests/test_qtwebenginewidgets.py 2019-01-11
03:13:27.000000000 +0100
@@ -0,0 +1,12 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import QtWebEngineWidgets
+
+
+def test_qtwebenginewidgets():
+ """Test the qtpy.QtWebSockets namespace"""
+
+ assert QtWebEngineWidgets.QWebEnginePage is not None
+ assert QtWebEngineWidgets.QWebEngineView is not None
+ assert QtWebEngineWidgets.QWebEngineSettings is not None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtPy-1.5.2/qtpy/tests/test_uic.py
new/QtPy-1.6.0/qtpy/tests/test_uic.py
--- old/QtPy-1.5.2/qtpy/tests/test_uic.py 2017-08-12 17:19:03.000000000
+0200
+++ new/QtPy-1.6.0/qtpy/tests/test_uic.py 2019-01-10 23:35:00.000000000
+0100
@@ -42,6 +42,8 @@
return qapp
+@pytest.mark.skipif((PYSIDE2 and os.environ.get('CI', None) is not None),
+ reason="It segfaults in our CIs with PYSIDE2")
def test_load_ui():
"""
Make sure that the patched loadUi function behaves as expected with a
@@ -53,6 +55,8 @@
assert isinstance(ui.comboBox, QComboBox)
+@pytest.mark.skipif((PYSIDE2 and os.environ.get('CI', None) is not None),
+ reason="It segfaults in our CIs with PYSIDE2")
def test_load_ui_custom_auto(tmpdir):
"""
Test that we can load a .ui file with custom widgets without having to
@@ -70,11 +74,10 @@
assert isinstance(ui.comboBox, _QComboBoxSubclass)
-@pytest.mark.skipif(PYSIDE2, reason="It fails on PySide2")
def test_load_full_uic():
"""Test that we load the full uic objects for PyQt5 and PyQt4."""
QT_API = os.environ.get('QT_API', '').lower()
- if QT_API == 'pyside':
+ if QT_API.startswith('pyside'):
assert hasattr(uic, 'loadUi')
assert not hasattr(uic, 'loadUiType')
else:
