Accepting request 781243 from home:TheBlackCat:branches:devel:languages:python:jupyter

- Update to version 4.7.0
  + Additions
    * Use qtpy as the shim layer for Python Qt bindings and remove our own shim.
  + Changes
    * Remove code to expand tabs to spaces.
    * Skip history if it is the same as the input buffer.
- Drop doc subpackage due to rapid changes in readthedocs download
  urls.  This was a hold-over from when the tests were run in a
  separate doc subpackage.

OBS-URL: https://build.opensuse.org/request/show/781243
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-qtconsole?expand=0&rev=11

python-qtconsole-rpmlintrc

@@ -0,0 +1,2 @@
+# Note: this is provided by the python3-jupyter-core dependency
+addFilter("desktopfile-without-binary .*/jupyter-qtconsole.desktop jupyter")

python-qtconsole.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Mar  3 14:27:44 UTC 2020 - Todd R <toddrme2178@gmail.com>
+
+- Update to version 4.7.0
+  + Additions
+    * Use qtpy as the shim layer for Python Qt bindings and remove our own shim.
+  + Changes
+    * Remove code to expand tabs to spaces.
+    * Skip history if it is the same as the input buffer.
+- Drop doc subpackage due to rapid changes in readthedocs download
+  urls.  This was a hold-over from when the tests were run in a
+  separate doc subpackage.
+
 -------------------------------------------------------------------
 Fri Nov 22 21:17:54 UTC 2019 - Todd R <toddrme2178@gmail.com>
 

python-qtconsole.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-qtconsole
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,16 +19,14 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define         skip_python2 1
 Name:           python-qtconsole
-Version:        4.6.0
-%define doc_ver 4.6.0
+Version:        4.7.0
 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
-Source1:        https://media.readthedocs.org/pdf/qtconsole/%{doc_ver}/qtconsole.pdf
-Source2:        https://media.readthedocs.org/htmlzip/qtconsole/%{doc_ver}/qtconsole.zip
+Source100:      python-qtconsole-rpmlintrc
 BuildRequires:  %{python_module jupyter-core}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  desktop-file-utils
@@ -38,6 +36,7 @@ BuildRequires:  hicolor-icon-theme
 BuildRequires:  python-rpm-macros
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
+Requires:       python-QtPy
 Requires:       python-Pygments
 Requires:       python-ipykernel >= 4.1
 Requires:       python-ipython_genutils
@@ -51,6 +50,8 @@ Requires:       jupyter-qtconsole = %{version}
 BuildArch:      noarch
 # SECTION test requirements
 BuildRequires:  %{python_module Pygments}
+BuildRequires:  %{python_module QtPy}
+BuildRequires:  %{python_module flaky}
 BuildRequires:  %{python_module ipykernel >= 4.1}
 BuildRequires:  %{python_module ipython_genutils}
 BuildRequires:  %{python_module jupyter-client >= 4.1}
@@ -74,10 +75,17 @@ This package provides the python components.
 %package     -n jupyter-qtconsole
 Summary:        Jupyter Qt console
 Requires:       python3-qtconsole = %{version}
+Requires:       python3-jupyter-core
 Requires:       jupyter-ipykernel >= 4.1
 Requires:       jupyter-jupyter-client >= 4.1
 Requires:       jupyter-jupyter-core
 Conflicts:      python3-jupyter_qtconsole < 4.4.4
+Provides:       jupyter-qtconsole-doc = %{version}
+Obsoletes:      jupyter-qtconsole-doc < %{version}
+Provides:       python-qtconsole-doc = %{version}
+Provides:       %{python_module qtconsole-doc = %{version}}
+Provides:       %{python_module jupyter_qtconsole-doc = %{version}}
+Obsoletes:      %{python_module jupyter_qtconsole-doc < %{version}}
 
 %description -n jupyter-qtconsole
 A rich Qt-based console for working with Jupyter kernels,
@@ -85,23 +93,8 @@ supporting rich media output, session export, and more.
 
 This package provides the jupyter components.
 
-%package     -n jupyter-qtconsole-doc
-Summary:        Documentation for the Jupyter Qt console
-Group:          Documentation/Other
-Provides:       python-qtconsole-doc = %{version}
-Provides:       %{python_module qtconsole-doc = %{version}}
-Provides:       %{python_module jupyter_qtconsole-doc = %{version}}
-Obsoletes:      %{python_module jupyter_qtconsole-doc < %{version}}
-
-%description -n jupyter-qtconsole-doc
-Documentation and help files for Jupyter's Qt console.
-
 %prep
 %setup -q -n qtconsole-%{version}
-cp %{SOURCE1} .
-unzip %{SOURCE2} -d docs
-mv docs/qtconsole-* docs/html
-rm docs/html/.buildinfo
 
 %build
 %python_build
@@ -121,13 +114,6 @@ desktop-file-edit --set-icon="JupyterQtConsole" jupyter-qtconsole.desktop
 %suse_update_desktop_file -i -r jupyter-qtconsole "System;TerminalEmulator;"
 popd
 
-mkdir -p %{buildroot}%{_docdir}/jupyter-qtconsole
-
-cp %{SOURCE1} %{buildroot}%{_docdir}/jupyter-qtconsole/
-cp -r docs/html %{buildroot}%{_docdir}/jupyter-qtconsole/
-
-%fdupes %{buildroot}%{_docdir}/jupyter-qtconsole/
-
 %check
 export QT_QPA_PLATFORM="offscreen"
 %pytest
@@ -143,10 +129,4 @@ export QT_QPA_PLATFORM="offscreen"
 %{_datadir}/applications/jupyter-qtconsole.desktop
 %{_datadir}/icons/hicolor/scalable/apps/JupyterQtConsole.svg
 
-%files -n jupyter-qtconsole-doc
-%license LICENSE
-%dir %{_docdir}/jupyter-qtconsole/
-%{_docdir}/jupyter-qtconsole/qtconsole.pdf
-%{_docdir}/jupyter-qtconsole/html
-
 %changelog

qtconsole-4.6.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:654f423662e7dfe6a9b26fac8ec76aedcf742c339909ac49f1f0c1a1b744bcd1
-size 426936

qtconsole-4.7.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7a9571ffe8adf07ede8660ee65bfacb10af64d6aa633a879e1ba0d70117f8a4
+size 423485

qtconsole.pdf

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6833320e5778c2967c8b329b42e9a7f9825b3e62253660b633a28f5dbe2ad79d
-size 416787

qtconsole.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09ba72a0641499801c73b69a3cd65e4a8081933f5bbfcc52c79dec6debc2b1a1
-size 8342215