[sagemath] 01/01: Use Debian's ipywidgets and widgetsnbextension

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository sagemath.

commit 53b063f07159d0748793995ce3abff9b98b2baa3
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Dec 2 01:52:42 2016 +0100

    Use Debian's ipywidgets and widgetsnbextension
---
 debian/control.in                        |  2 ++
 debian/patches/debian-temp-userdir.patch | 14 --------------
 debian/patches/series                    |  1 -
 debian/pruner/configure.ac               |  3 +--
 debian/pruner/pruner.py.in               |  1 +
 debian/todo-stretch.md                   |  4 ++--
 6 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index 30cc605..9999836 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -36,6 +36,7 @@ Build-Depends:
  ipython (>= 5.1.0-2),
  jupyter-client,
  jupyter-core,
+ jupyter-nbextension-jupyter-js-widgets,
  lcalc (>= 1.23+dfsg-6+b1),
  libatlas-base-dev,
  libblas-dev,
@@ -128,6 +129,7 @@ Build-Depends:
  python-imagesize,
  python-ipykernel,
  python-ipython-genutils,
+ python-ipywidgets,
  python-itsdangerous,
  python-jsonschema,
  python-matplotlib,
diff --git a/debian/patches/debian-temp-userdir.patch b/debian/patches/debian-temp-userdir.patch
deleted file mode 100644
index 0cc07f9..0000000
--- a/debian/patches/debian-temp-userdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Install Sage spkgs to user's home directory
- This is a temporary measure to get everything working quickly.
- Eventually we will get rid of this, and add them to the pruner.
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/sage/build/pkgs/ipywidgets/spkg-install
-+++ b/sage/build/pkgs/ipywidgets/spkg-install
-@@ -11,4 +11,4 @@
-     fi
- done
- 
--$PIP_INSTALL .
-+python setup.py install --user
diff --git a/debian/patches/series b/debian/patches/series
index a000376..b193ff7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 # fixes to Sage's code, an inherent problem on their side
 # we should probably forward these upstream
-debian-temp-userdir.patch
 python_security.patch
 silence_debian_bug_780186.patch
 silence_ecl_opt_signals.patch
diff --git a/debian/pruner/configure.ac b/debian/pruner/configure.ac
index 8520c65..73cd756 100644
--- a/debian/pruner/configure.ac
+++ b/debian/pruner/configure.ac
@@ -321,8 +321,7 @@ AC_SUBST(HAS_TACHYON)
 HAS_THEBE="True"
 AC_SUBST(HAS_THEBE)
 
-# FIXME(widgetsnbextension): we don't have a package yet, but don't want to install from sage
-HAS_WIDGETSNBEXTENSION="True"
+AC_CHECK_FILE(/usr/share/jupyter/nbextensions/jupyter-js-widgets/extension.js, HAS_WIDGETSNBEXTENSION="True", HAS_WIDGETSNBEXTENSION="False")
 AC_SUBST(HAS_WIDGETSNBEXTENSION)
 
 # FIXME(zeromq): useful only for pyzmq
diff --git a/debian/pruner/pruner.py.in b/debian/pruner/pruner.py.in
index 1d77577..1ef4a41 100644
--- a/debian/pruner/pruner.py.in
+++ b/debian/pruner/pruner.py.in
@@ -161,6 +161,7 @@ python_modules = [
     'imagesize',
     'ipykernel',
     'ipython_genutils',
+    'ipywidgets',
     'itsdangerous',
     'jinja2',
     'jsonschema',
diff --git a/debian/todo-stretch.md b/debian/todo-stretch.md
index 5b51784..94a4425 100644
--- a/debian/todo-stretch.md
+++ b/debian/todo-stretch.md
@@ -5,9 +5,9 @@ Upload packages to NEW, ASAP
 
 *   New packages:
     *   ipywidgets (including jupyter-js-widgets, widgetsnbextension)
-        * more info starting from https://lists.alioth.debian.org/pipermail/debian-science-sagemath/Week-of-Mon-20161114/thread.html#429
+        * only a few things left, see d/TODO in https://anonscm.debian.org/git/python-modules/packages/ipywidgets.git
     *   sagenb
-        * lots of JS deps, need to evaluate ASAP
+        * lots of JS deps, will have to bundle quite a lot and hope ftp-masters are cool
         * Fix "Error typesetting mathematics" with every output, seems to be mathjax related.
     *   sagemath
         * ignore known failing doctests

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git