Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-qtconsole for
openSUSE:Factory checked in at 2022-08-29 09:42:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-qtconsole (Old)
and /work/SRC/openSUSE:Factory/.python-qtconsole.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qtconsole"
Mon Aug 29 09:42:57 2022 rev:25 rq:999724 version:5.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-qtconsole/python-qtconsole.changes
2022-06-24 09:45:15.681674963 +0200
+++
/work/SRC/openSUSE:Factory/.python-qtconsole.new.2083/python-qtconsole.changes
2022-08-29 09:43:11.887831286 +0200
@@ -1,0 +2,12 @@
+Sun Aug 28 21:57:03 UTC 2022 - Ben Greiner <[email protected]>
+
+- Update to version 5.3.2
+ * Fix syntax highlighting with multiline inputs.
+- Test with xvfb display
+- Remove skip of previously segfaulting tests
+- Allow PyQt6 and Pyside6 as backend
+- Add missing pyzmq requirement (was already transitive)
+- Remove obsolete jupyter package, provide desktop files and icon
+ for every flavor
+
+-------------------------------------------------------------------
Old:
----
python-qtconsole-rpmlintrc
qtconsole-5.3.1.tar.gz
New:
----
qtconsole-5.3.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qtconsole.spec ++++++
--- /var/tmp/diff_new_pack.NWAR7A/_old 2022-08-29 09:43:12.539832835 +0200
+++ /var/tmp/diff_new_pack.NWAR7A/_new 2022-08-29 09:43:12.543832845 +0200
@@ -24,14 +24,13 @@
%bcond_with libalternatives
%endif
Name: python-qtconsole
-Version: 5.3.1
+Version: 5.3.2
Release: 0
Summary: Jupyter Qt console
License: BSD-3-Clause
Group: Development/Languages/Python
URL: https://github.com/jupyter/qtconsole
Source0:
https://files.pythonhosted.org/packages/source/q/qtconsole/qtconsole-%{version}.tar.gz
-Source100: python-qtconsole-rpmlintrc
BuildRequires: %{python_module base >= 3.7}
BuildRequires: %{python_module jupyter-core}
BuildRequires: %{python_module setuptools}
@@ -43,19 +42,23 @@
BuildRequires: unzip
BuildRequires: update-desktop-files
# QtPy does note require or depend on one of the frameworks itself
-Requires: (python-qt5 or python-pyside2)
-Requires: jupyter-qtconsole = %{version}
+Requires: (python-qt5 or python-pyside2 or python-PyQt6 or
python-pyside6)
Requires: python-Pygments
Requires: python-QtPy >= 2.0.1
Requires: python-ipykernel >= 4.1
Requires: python-ipython_genutils
Requires: python-jupyter-client >= 4.1
Requires: python-jupyter-core
+Requires: python-pyzmq >= 17.1
Requires: python-traitlets
Conflicts: python-traitlets = 5.2.1
Conflicts: python-traitlets = 5.2.2
Provides: python-jupyter_qtconsole = %{version}
Obsoletes: python-jupyter_qtconsole < %{version}
+%if "%{python_flavor}" == "%{primary_python}"
+Provides: jupyter-qtconsole = %{version}-%{release}
+Obsoletes: jupyter-qtconsole < %{version}-%{release}
+%endif
BuildArch: noarch
%if %{with libalternatives}
BuildRequires: alts
@@ -72,7 +75,9 @@
BuildRequires: %{python_module ipython_genutils}
BuildRequires: %{python_module jupyter-client >= 4.1}
BuildRequires: %{python_module pytest-qt}
+BuildRequires: %{python_module pytest-xvfb}
BuildRequires: %{python_module pytest}
+BuildRequires: %{python_module pyzmq >= 17.1}
BuildRequires: %{python_module qt5}
BuildRequires: %{python_module traitlets}
# /SECTION
@@ -82,30 +87,6 @@
A rich Qt-based console for working with Jupyter kernels,
supporting rich media output, session export, and more.
-This package provides the python components.
-
-%package -n jupyter-qtconsole
-Summary: Jupyter Qt console
-Group: Development/Languages/Python
-Requires: jupyter-ipykernel >= 4.1
-Requires: jupyter-jupyter-client >= 4.1
-Requires: jupyter-jupyter-core
-Requires: python3-jupyter-core
-Requires: python3-qtconsole = %{version}
-Conflicts: python3-jupyter_qtconsole < 4.4.4
-Provides: jupyter-qtconsole-doc = %{version}
-Obsoletes: jupyter-qtconsole-doc < %{version}
-Provides: %{python_module jupyter_qtconsole-doc = %{version}}
-Provides: %{python_module qtconsole-doc = %{version}}
-Provides: python-qtconsole-doc = %{version}
-Obsoletes: %{python_module jupyter_qtconsole-doc < %{version}}
-
-%description -n jupyter-qtconsole
-A rich Qt-based console for working with Jupyter kernels,
-supporting rich media output, session export, and more.
-
-This package provides the jupyter components.
-
%prep
%setup -q -n qtconsole-%{version}
@@ -117,23 +98,25 @@
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%python_clone -a %{buildroot}%{_bindir}/jupyter-qtconsole
+
# Install icon
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
-cp qtconsole/resources/icon/JupyterConsole.svg
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/JupyterQtConsole.svg
+%python_expand cp qtconsole/resources/icon/JupyterConsole.svg
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/JupyterQtConsole-%{$python_bin_suffix}.svg
# Modify and install .desktop file
pushd examples
-desktop-file-edit --set-icon="JupyterQtConsole" jupyter-qtconsole.desktop
-%suse_update_desktop_file -i -r jupyter-qtconsole "System;TerminalEmulator;"
+%{python_expand # clone desktop file for flavors
+cp jupyter-qtconsole.desktop jupyter-qtconsole-%{$python_bin_suffix}.desktop
+desktop-file-edit \
+ --set-icon="JupyterQtConsole-%{$python_bin_suffix}" \
+ --set-key=Exec --set-value="jupyter-qtconsole-%{$python_bin_suffix}"
jupyter-qtconsole-%{$python_bin_suffix}.desktop
+%suse_update_desktop_file -i -r jupyter-qtconsole-%{$python_bin_suffix}
"System;TerminalEmulator;"
+}
popd
-%python_clone -a %{buildroot}%{_bindir}/jupyter-qtconsole
-
%check
-export QT_QPA_PLATFORM="offscreen"
-# test skips: https://github.com/jupyter/qtconsole/issues/443
-# now with test_input too. But does not seem to happen on the build server,
only locally.
-%pytest -ra -k "not (test_00 and (test_scroll or test_debug or test_input))"
+%pytest -ra
%pre
%python_libalternatives_reset_alternative jupyter-qtconsole
@@ -147,12 +130,9 @@
%files %{python_files}
%license LICENSE
%python_alternative %{_bindir}/jupyter-qtconsole
-%{python_sitelib}/qtconsole-%{version}-py*.egg-info
+%{_datadir}/applications/jupyter-qtconsole-%{python_bin_suffix}.desktop
+%{_datadir}/icons/hicolor/scalable/apps/JupyterQtConsole-%{python_bin_suffix}.svg
+%{python_sitelib}/qtconsole-%{version}*-info
%{python_sitelib}/qtconsole/
-%files -n jupyter-qtconsole
-%license LICENSE
-%{_datadir}/applications/jupyter-qtconsole.desktop
-%{_datadir}/icons/hicolor/scalable/apps/JupyterQtConsole.svg
-
%changelog
++++++ qtconsole-5.3.1.tar.gz -> qtconsole-5.3.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.3.1/PKG-INFO new/qtconsole-5.3.2/PKG-INFO
--- old/qtconsole-5.3.1/PKG-INFO 2022-06-05 19:29:31.648980600 +0200
+++ new/qtconsole-5.3.2/PKG-INFO 2022-08-28 03:42:44.820807200 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: qtconsole
-Version: 5.3.1
+Version: 5.3.2
Summary: Jupyter Qt console
Home-page: http://jupyter.org
Author: Jupyter Development Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.3.1/docs/source/changelog.rst
new/qtconsole-5.3.2/docs/source/changelog.rst
--- old/qtconsole-5.3.1/docs/source/changelog.rst 2022-06-05
19:26:33.000000000 +0200
+++ new/qtconsole-5.3.2/docs/source/changelog.rst 2022-08-28
03:39:29.000000000 +0200
@@ -8,6 +8,15 @@
5.3
~~~
+5.3.2
+-----
+
+`5.3.2 on GitHub <https://github.com/jupyter/qtconsole/milestones/5.3.2>`__
+
+* Fix syntax highlighting with multiline inputs.
+* Don't call processEvents when showing input prompts on Mac because it's not
+ necessary.
+
5.3.1
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.3.1/qtconsole/_version.py
new/qtconsole-5.3.2/qtconsole/_version.py
--- old/qtconsole-5.3.1/qtconsole/_version.py 2022-06-05 19:28:45.000000000
+0200
+++ new/qtconsole-5.3.2/qtconsole/_version.py 2022-08-28 03:41:29.000000000
+0200
@@ -1,2 +1,2 @@
-version_info = (5, 3, 1)
+version_info = (5, 3, 2)
__version__ = '.'.join(map(str, version_info))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.3.1/qtconsole/console_widget.py
new/qtconsole-5.3.2/qtconsole/console_widget.py
--- old/qtconsole-5.3.1/qtconsole/console_widget.py 2022-05-30
03:57:55.000000000 +0200
+++ new/qtconsole-5.3.2/qtconsole/console_widget.py 2022-08-28
03:35:39.000000000 +0200
@@ -2483,7 +2483,8 @@
# This is necessary to solve out-of-order insertion of mixed stdin and
# stdout stream texts.
# Fixes spyder-ide/spyder#17710
- QtCore.QCoreApplication.processEvents()
+ if not sys.platform == 'darwin':
+ QtCore.QCoreApplication.processEvents()
cursor = self._get_end_cursor()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.3.1/qtconsole/frontend_widget.py
new/qtconsole-5.3.2/qtconsole/frontend_widget.py
--- old/qtconsole-5.3.1/qtconsole/frontend_widget.py 2022-05-29
18:43:26.000000000 +0200
+++ new/qtconsole-5.3.2/qtconsole/frontend_widget.py 2022-08-28
02:04:32.000000000 +0200
@@ -69,6 +69,10 @@
current_block = self.currentBlock()
string = current_block.text()
+ # QTextBlock::text() can still return non-breaking spaces
+ # for the continuation prompt
+ string = string.replace("\xa0", " ")
+
# Only highlight if we can identify a prompt, but make sure not to
# highlight the prompt.
without_prompt = self.transform_ipy_prompt(string)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.3.1/qtconsole.egg-info/PKG-INFO
new/qtconsole-5.3.2/qtconsole.egg-info/PKG-INFO
--- old/qtconsole-5.3.1/qtconsole.egg-info/PKG-INFO 2022-06-05
19:29:31.000000000 +0200
+++ new/qtconsole-5.3.2/qtconsole.egg-info/PKG-INFO 2022-08-28
03:42:44.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: qtconsole
-Version: 5.3.1
+Version: 5.3.2
Summary: Jupyter Qt console
Home-page: http://jupyter.org
Author: Jupyter Development Team
