[Python-modules-commits] [ipywidgets] 02/03: merge patched into master

[Gordon Ball]

This is an automated email from the git hooks/post-receive script.

chronitis-guest pushed a commit to branch master
in repository ipywidgets.

commit 30237359afd17b5c34b39d8f56af846a989408dd
Merge: 7f26867 3d3e2a4
Author: Gordon Ball <gordon at chronitis.net>
Date:   Sat Dec 17 16:55:06 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...-Remove-unneeded-notebook-version-warning.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 ipywidgets/__init__.py                             | 17 +---------
 4 files changed, 41 insertions(+), 18 deletions(-)

diff --cc debian/.git-dpm
index 51a2367,0000000..7b2b1da
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 44539bd8afdc910958f947eb97db98f9504ad578
- 44539bd8afdc910958f947eb97db98f9504ad578
++3d3e2a4e987155dc13a532ecf8c57c8566f250e2
++3d3e2a4e987155dc13a532ecf8c57c8566f250e2
 +787a902919a1edd762701e3238c9c3cf03271786
 +787a902919a1edd762701e3238c9c3cf03271786
 +ipywidgets_5.2.2.orig.tar.gz
 +a4e18ed6a91bca345ee074af8d77b2bebc4a1e96
 +2483849
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0007-Remove-unneeded-notebook-version-warning.patch
index 0000000,0000000..af97371
new file mode 100644
--- /dev/null
+++ b/debian/patches/0007-Remove-unneeded-notebook-version-warning.patch
@@@ -1,0 -1,0 +1,37 @@@
++From 3d3e2a4e987155dc13a532ecf8c57c8566f250e2 Mon Sep 17 00:00:00 2001
++From: Gordon Ball <gordon at chronitis.net>
++Date: Sat, 17 Dec 2016 16:53:46 +0100
++Subject: Remove unneeded notebook version warning
++
++This warning tries to detect the presence of widgetsnbextension, but the
++debian packaging installs the extension directly, causing this warning
++to be wrongly displayed.
++---
++ ipywidgets/__init__.py | 17 +----------------
++ 1 file changed, 1 insertion(+), 16 deletions(-)
++
++diff --git a/ipywidgets/__init__.py b/ipywidgets/__init__.py
++index 16f4eed..21cc031 100644
++--- a/ipywidgets/__init__.py
+++++ b/ipywidgets/__init__.py
++@@ -50,19 +50,4 @@ _handle_ipython()
++ 
++ 
++ def find_static_assets():
++-    import warnings
++-    try:
++-        import widgetsnbextension
++-        if hasattr(widgetsnbextension, 'find_static_assets'):
++-            return widgetsnbextension.find_static_assets()
++-        else:
++-            warnings.warn("""The version of ipywidgets that you have installed
++-            only works with Jupyter Notebook 4.2 or later.  Your version of the
++-            Jupyter Notebook is too old. If you'd like to use ipywidgets with an
++-            older version of the notebook, use ipywidgets 4.x or earlier.
++-            """, RuntimeWarning)
++-            return []
++-    except ImportError:
++-        warnings.warn("""To use the widgets with your installed Jupyter Notebook
++-        version, please install ipywidgets 4.x or earlier.""", RuntimeWarning)
++-        return []
+++    return []
diff --cc debian/patches/series
index 3818c81,0000000..fbbf439
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,7 @@@
 +0001-Unconditionally-import-setuptools-to-pick-up-depende.patch
 +0002-Fix-upstream-package.json-otherwise-the-webpack-buil.patch
 +0003-Don-t-build-extension.js-in-widgetsnbextension-setup.patch
 +0004-Use-relative-paths-otherwise-the-examples-stuff-give.patch
 +0005-Empty-out-build-local-since-we-replace-it-with-our-o.patch
 +0006-Use-local-MathJax.patch
++0007-Remove-unneeded-notebook-version-warning.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/ipywidgets.git