[Python-modules-commits] [jupyter-notebook] 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 jupyter-notebook.

commit e2fa2ef8d57ff2370e83a7dd7ef44fdc63b18af0
Merge: b8844e5 a79776c
Author: Gordon Ball <gordon at chronitis.net>
Date:   Sat Dec 17 16:48:51 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...008-Don-t-automatically-import-ipywidgets.patch | 40 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 notebook/notebookapp.py                            | 17 ---------
 4 files changed, 43 insertions(+), 19 deletions(-)

diff --cc debian/.git-dpm
index dfdd9a8,0000000..91954b9
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
- c2a64f5f74f916065305011fbeffd6f77ed08a7f
- c2a64f5f74f916065305011fbeffd6f77ed08a7f
++a79776cde676a6109f0c4e1d045d724285d298fb
++a79776cde676a6109f0c4e1d045d724285d298fb
 +1b789b6b3bfdc79fa5ba90dd5aa3dadd3ce542eb
 +1b789b6b3bfdc79fa5ba90dd5aa3dadd3ce542eb
 +jupyter-notebook_4.2.3.orig.tar.gz
 +cd42c2013047d2722d3990db4787820cff51cbc8
 +4456566
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0008-Don-t-automatically-import-ipywidgets.patch
index 0000000,0000000..7a06e60
new file mode 100644
--- /dev/null
+++ b/debian/patches/0008-Don-t-automatically-import-ipywidgets.patch
@@@ -1,0 -1,0 +1,40 @@@
++From a79776cde676a6109f0c4e1d045d724285d298fb Mon Sep 17 00:00:00 2001
++From: Gordon Ball <gordon at chronitis.net>
++Date: Sat, 17 Dec 2016 16:46:56 +0100
++Subject: Don't automatically import ipywidgets
++
++ipywidgets.find_static_assets() is a no-op for ipywidgets > 4, which instead
++use the nbextensions mechanism, but causes a warning to be shown if the
++(redundant) widgetsnbextension package is not installed
++---
++ notebook/notebookapp.py | 17 -----------------
++ 1 file changed, 17 deletions(-)
++
++diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py
++index ab73020..bd801e9 100644
++--- a/notebook/notebookapp.py
+++++ b/notebook/notebookapp.py
++@@ -234,23 +234,6 @@ class NotebookWebApplication(web.Application):
++         handlers.extend(load_handlers('services.kernelspecs.handlers'))
++         handlers.extend(load_handlers('services.security.handlers'))
++         
++-        # BEGIN HARDCODED WIDGETS HACK
++-        # TODO: Remove on notebook 5.0
++-        try:
++-            import widgetsnbextension
++-        except:
++-            try:
++-                import ipywidgets as widgets
++-                handlers.append(
++-                    (r"/nbextensions/widgets/(.*)", FileFindHandler, {
++-                        'path': widgets.find_static_assets(),
++-                        'no_cache_paths': ['/'], # don't cache anything in nbextensions
++-                    }),
++-                )
++-            except:
++-                app_log.warning('Widgets are unavailable. Please install widgetsnbextension or ipywidgets 4.0')
++-        # END HARDCODED WIDGETS HACK
++-        
++         handlers.append(
++             (r"/nbextensions/(.*)", FileFindHandler, {
++                 'path': settings['nbextensions_path'],
diff --cc debian/patches/series
index a01fa96,0000000..1c2c362
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,0 +1,8 @@@
 +0001-Nodejs-binary-and-import-names.patch
 +0002-Use-local-MathJax-in-documentation.patch
 +0003-Unmask-setuptools-in-setup.py-so-dependencies-are-de.patch
 +0004-jquery-ui-1.12-compatibility-changes.patch
 +0005-Call-lessc-with-source-map-basepath-option-for-repro.patch
 +0006-Work-around-https-github.com-less-less.js-pull-3002.patch
 +0007-Debian-specific-hack-to-fix-upstream-s-non-increment.patch
++0008-Don-t-automatically-import-ipywidgets.patch

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