diff -Nru ipywidgets-5.2.2/debian/changelog ipywidgets-5.2.2/debian/changelog --- ipywidgets-5.2.2/debian/changelog 2016-12-12 22:30:53.000000000 +0000 +++ ipywidgets-5.2.2/debian/changelog 2017-01-07 13:39:15.000000000 +0000 @@ -1,3 +1,16 @@ +ipywidgets (5.2.2-3) unstable; urgency=medium + + [ Gordon Ball ] + * Add explicit build-dependency on m4 + * The warning previously displayed when importing ipywidgets if + widgetsnbextension wasn't installed has been removed, since the + extension is installed directly (see: #848252) + + [ Ximin Luo ] + * Add Suggests: python-ipywidgets-doc (Closes: #849613) + + -- Gordon Ball Sat, 07 Jan 2017 14:39:15 +0100 + ipywidgets (5.2.2-2) unstable; urgency=medium * jupyter-nbextension-jupyter-js-widgets: Depend on newer pythonX-notebook diff -Nru ipywidgets-5.2.2/debian/control ipywidgets-5.2.2/debian/control --- ipywidgets-5.2.2/debian/control 2016-12-12 22:30:18.000000000 +0000 +++ ipywidgets-5.2.2/debian/control 2017-01-07 13:39:15.000000000 +0000 @@ -43,7 +43,8 @@ python3-traitlets, python3-sphinx, python3-sphinx-rtd-theme, - pandoc + pandoc, + m4 X-Python-Version: >= 2.7 X-Python3-Version: >= 3.3 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/ipywidgets.git @@ -52,6 +53,7 @@ Package: python-ipywidgets Architecture: all Depends: ${misc:Depends}, ${python:Depends} +Suggests: python-ipywidgets-doc Description: Interactive widgets for the Jupyter notebook (Python 2) Notebooks come alive when interactive widgets are used. Learning becomes an immersive and fun experience. Researchers can easily see how changing inputs @@ -62,6 +64,7 @@ Package: python3-ipywidgets Architecture: all Depends: ${misc:Depends}, ${python3:Depends} +Suggests: python-ipywidgets-doc Description: Interactive widgets for the Jupyter notebook (Python 3) Notebooks come alive when interactive widgets are used. Learning becomes an immersive and fun experience. Researchers can easily see how changing inputs diff -Nru ipywidgets-5.2.2/debian/.git-dpm ipywidgets-5.2.2/debian/.git-dpm --- ipywidgets-5.2.2/debian/.git-dpm 2016-12-03 16:41:13.000000000 +0000 +++ ipywidgets-5.2.2/debian/.git-dpm 2017-01-07 13:39:15.000000000 +0000 @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -44539bd8afdc910958f947eb97db98f9504ad578 -44539bd8afdc910958f947eb97db98f9504ad578 +3d3e2a4e987155dc13a532ecf8c57c8566f250e2 +3d3e2a4e987155dc13a532ecf8c57c8566f250e2 787a902919a1edd762701e3238c9c3cf03271786 787a902919a1edd762701e3238c9c3cf03271786 ipywidgets_5.2.2.orig.tar.gz diff -Nru ipywidgets-5.2.2/debian/jupyter-nbextension-jupyter-js-widgets.postinst ipywidgets-5.2.2/debian/jupyter-nbextension-jupyter-js-widgets.postinst --- ipywidgets-5.2.2/debian/jupyter-nbextension-jupyter-js-widgets.postinst 2016-12-05 11:25:06.000000000 +0000 +++ ipywidgets-5.2.2/debian/jupyter-nbextension-jupyter-js-widgets.postinst 2017-01-07 13:39:15.000000000 +0000 @@ -23,8 +23,14 @@ configure) if python3 -c "import notebook.nbextensions" 2>/dev/null; then PYTHON=python3 - else + elif python -c "import notebook.nbextensions" 2>/dev/null; then PYTHON=python + else + echo >&2 "notebook.nbextensions unavailable for either python or python3" + echo >&2 "this extension will NOT be enabled in the notebook; to fix this" + echo >&2 "install either python-notebook or python3-notebook then run:" + echo >&2 " dpkg-reconfigure jupyter-nbextension-jupyter-js-widgets" + PYTHON=/bin/true fi $PYTHON -m notebook.nbextensions enable --sys-prefix jupyter-js-widgets/extension ;; diff -Nru ipywidgets-5.2.2/debian/jupyter-nbextension-jupyter-js-widgets.prerm ipywidgets-5.2.2/debian/jupyter-nbextension-jupyter-js-widgets.prerm --- ipywidgets-5.2.2/debian/jupyter-nbextension-jupyter-js-widgets.prerm 2016-12-05 11:25:32.000000000 +0000 +++ ipywidgets-5.2.2/debian/jupyter-nbextension-jupyter-js-widgets.prerm 2017-01-07 13:39:15.000000000 +0000 @@ -22,8 +22,12 @@ remove|upgrade|deconfigure) if python3 -c "import notebook.nbextensions" 2>/dev/null; then PYTHON=python3 - else + elif python -c "import notebook.nbextensions" 2>/dev/null; then PYTHON=python + else + echo >&2 "notebook.nbextensions unavailable for either python or python3" + echo >&2 "the jupyter-js-widgets notebook extension will not be disabled" + PYTHON=/bin/true fi $PYTHON -m notebook.nbextensions disable --sys-prefix jupyter-js-widgets/extension ;; diff -Nru ipywidgets-5.2.2/debian/patches/0007-Remove-unneeded-notebook-version-warning.patch ipywidgets-5.2.2/debian/patches/0007-Remove-unneeded-notebook-version-warning.patch --- ipywidgets-5.2.2/debian/patches/0007-Remove-unneeded-notebook-version-warning.patch 1970-01-01 00:00:00.000000000 +0000 +++ ipywidgets-5.2.2/debian/patches/0007-Remove-unneeded-notebook-version-warning.patch 2017-01-07 13:39:15.000000000 +0000 @@ -0,0 +1,37 @@ +From 3d3e2a4e987155dc13a532ecf8c57c8566f250e2 Mon Sep 17 00:00:00 2001 +From: Gordon Ball +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 -Nru ipywidgets-5.2.2/debian/patches/series ipywidgets-5.2.2/debian/patches/series --- ipywidgets-5.2.2/debian/patches/series 2016-12-03 16:41:13.000000000 +0000 +++ ipywidgets-5.2.2/debian/patches/series 2017-01-07 13:39:15.000000000 +0000 @@ -4,3 +4,4 @@ 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