Date: Saturday, July 13, 2019 @ 18:01:55
Author: arojas
Revision: 489374
Simplify python3 jupyter patch
Modified:
sagemath/trunk/PKGBUILD
sagemath/trunk/sagemath-python3-notebook.patch
---------------------------------+
PKGBUILD | 2 +-
sagemath-python3-notebook.patch | 25 ++++++++-----------------
2 files changed, 9 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-07-13 16:05:52 UTC (rev 489373)
+++ PKGBUILD 2019-07-13 18:01:55 UTC (rev 489374)
@@ -51,7 +51,7 @@
'1c2a2d750e81ac65a1dc07094f086ba07f4862288c935a1cd009cdd62bcfc23c'
'328e45e78065b5f6527174bda48cfff6828acbf107c2535b0a9a92c3ceb35842'
'596d03daf53a76b04029b120619253250b0e58d530d69f14afa169e27e06f446'
- '7be9f88975079d671eb3cde78e752e74741bcc29ba9b323bab5cddf50ce6dec9'
+ 'e554cdf689100c787a5fbcb7fe281cd68bef081e08bd58df8be1d113a4665d7e'
'1f2a34e15bf732ec8687c467a52e897615505dc3ddd792d811e8b6a7e19f1517'
'7fcb52e96935dccb0f958d37c2f4e3918392480b9af53e08562f6cba6c68cb94'
'a8c1409f4b4f1553b4f7602d4a6f0f3c6297ed258feed079f6560b0ec2dc62c6'
Modified: sagemath-python3-notebook.patch
===================================================================
--- sagemath-python3-notebook.patch 2019-07-13 16:05:52 UTC (rev 489373)
+++ sagemath-python3-notebook.patch 2019-07-13 18:01:55 UTC (rev 489374)
@@ -2,10 +2,14 @@
index 74192da240..0ede281aad 100755
--- a/src/bin/sage-notebook
+++ b/src/bin/sage-notebook
-@@ -95,8 +95,7 @@ class NotebookJupyter(object):
- if not have_prerequisites():
- print(self.PREREQUISITE_ERROR)
- raise SystemExit(1)
+@@ -91,12 +91,7 @@ class NotebookJupyter(object):
+
+ def __init__(self, argv):
+ self.print_banner()
+- from sage.repl.ipython_kernel.install import have_prerequisites
+- 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)
@@ -12,16 +16,3 @@
class NotebookJupyterlab(object):
-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
-@@ -304,7 +304,6 @@ def have_prerequisites(debug=True):
- True
- """
- try:
-- from notebook.notebookapp import NotebookApp
- return True
- except ImportError:
- if debug:
-
