[arch-commits] Commit in sagemath/trunk (PKGBUILD sagemath-python3-notebook.patch)

[Antonio Rojas]

    Date: Tuesday, March 28, 2017 @ 19:08:08
  Author: arojas
Revision: 219758

Make 'sage -notebook=jupyter' work with our jupyter-notebook package

Added:
  sagemath/trunk/sagemath-python3-notebook.patch
Modified:
  sagemath/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |    4 +++-
 sagemath-python3-notebook.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-28 18:02:25 UTC (rev 219757)
+++ PKGBUILD	2017-03-28 19:08:08 UTC (rev 219758)
@@ -35,7 +35,7 @@
   mcqd coxeter3 cryptominisat2 modular_decomposition bliss-graphs tdlib python2-pkgconfig meataxe libfes)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz"
         env.patch skip-check.patch cython-sys-path.patch is-package-installed.patch package.patch latte-count.patch
-        jupyter-path.patch test-optional.patch ecm-7.patch increase-rtol.patch r-no-readline.patch
+        jupyter-path.patch sagemath-python3-notebook.patch test-optional.patch ecm-7.patch increase-rtol.patch r-no-readline.patch
         sagemath-planarity3.patch fes02.patch sagemath-singular-4.1.0.p2.patch)
 sha256sums=('e6e0729ab25446e7c922058db0eee4b0b294b32c196e34842e843ea9fae41423'
             '9dba04ff13626a7b6c338a8b18a6c27d343f68a547a218533cf773af3dae6635'
@@ -81,6 +81,8 @@
   patch -p0 -i ../sagemath-singular-4.1.0.p2.patch
 # use correct latte-count binary name
   patch -p1 -i ../latte-count.patch
+# make 'sage -notebook=jupyter' work with our python3 jupyter-notebook package
+  patch -p1 -i ../sagemath-python3-notebook.patch
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209

Added: sagemath-python3-notebook.patch
===================================================================
--- sagemath-python3-notebook.patch	                        (rev 0)
+++ sagemath-python3-notebook.patch	2017-03-28 19:08:08 UTC (rev 219758)
@@ -0,0 +1,27 @@
+diff --git a/src/bin/sage-notebook b/src/bin/sage-notebook
+index 74192da240..0ede281aad 100755
+--- a/src/bin/sage-notebook
++++ b/src/bin/sage-notebook
+@@ -96,8 +96,7 @@ class NotebookJupyter(object):
+         if not have_prerequisites():
+             print(self.PREREQUISITE_ERROR)
+             raise SystemExit(1)
+-        from notebook.notebookapp import main
+-        main(argv)
++        os.execvp('jupyter-notebook', ['jupyter-notebook'] + argv)
+ 
+ 
+ class SageNBExport(NotebookJupyter):
+diff --git a/src/sage/repl/ipython_kernel/install.py b/src/sage/repl/ipython_kernel/install.py
+index 3912b8cdf5..bd40cdadda 100644
+--- a/src/sage/repl/ipython_kernel/install.py
++++ b/src/sage/repl/ipython_kernel/install.py
+@@ -281,7 +281,6 @@ def have_prerequisites(debug=True):
+         True
+     """
+     try:
+-        from notebook.notebookapp import NotebookApp
+         return True
+     except ImportError:
+         if debug:
+