From 1b467166572607bd07fe2fdf1604a10cb20ef7f7 Mon Sep 17 00:00:00 2001
From: Joe Garcia <joe.garcia@ssec.wisc.edu>
Date: Mon, 15 Mar 2021 10:02:19 -0500
Subject: [PATCH] patch jupyter to skip qtconsole if qt5 isn't included
---
ShellB3/shallbethree.sh | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh
index 92e603a1..7f335d03 100755
--- a/ShellB3/shallbethree.sh
+++ b/ShellB3/shallbethree.sh
@@ -9015,11 +9015,37 @@ SCRIPT
simple_py_install src/optional/prometheus_client-*.tar.* || oops "prometheus_client did not install"
pip_install src/optional/notebook-*.tar.* || oops "notebook did not install"
simple_py_install src/optional/jupyter_console-*.tar.* || oops "Jupyter console did not install"
+
+ _find_cots QT5DIR bin/qmake $QT5DIR $BASE
+
+ if [ -n "${QT5DIR}" ] ; then
simple_py_install src/optional/qtconsole-*.tar.* || oops "qtconsole did not install"
+ fi
simple_py_install src/optional/widgetsnbextension-*.tar.* || oops "widgetsnbextension did not install"
simple_py_install src/optional/jupyter-packaging-*.tar.* || oops "jupyter-packaging- did not install"
simple_py_install src/optional/jupyterlab_widgets-*.tar.* || oops "jupyterlab_widgets did not install"
simple_py_install src/optional/ipywidgets-*.tar.* || oops "ipywidgets did not install"
+ if [ -z "${QT5DIR}" ] ; then
+ make_patch jupyter <<PATCH
+--- setup.py 2015-08-11 19:42:23.000000000 -0500
++++ setup.py 2021-03-15 09:56:10.000000000 -0500
+@@ -19,13 +19,12 @@
+ name = 'jupyter',
+ version = '1.0.0',
+ description = "Jupyter metapackage. Install all the Jupyter components in one go.",
+- long_description = """Install the Jupyter system, including the notebook, qtconsole, and the IPython kernel.""",
++ long_description = """Install the Jupyter system, including the notebook, and the IPython kernel.""",
+ author = "Jupyter Development Team",
+ author_email = "jupyter@googlegroups.org",
+ py_modules = ['jupyter'],
+ install_requires = [
+ 'notebook',
+- 'qtconsole',
+ 'jupyter-console',
+ 'nbconvert',
+ 'ipykernel',
+PATCH
+ fi
simple_py_install src/optional/jupyter-*.tar.* || oops "Jupyter did not install"
isDarwin && make_frameworklinks
--
GitLab