summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsaac Yu <isaacyu1@isaacyu1.com>2022-10-30 12:40:43 -0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-11-05 21:15:21 +0700
commita2e889a7437e058eda57ff0717a6a22f50ed5ed6 (patch)
treea8966f883902d038444da4984917901347129804
parent8377299f3f6fe1d9cec399e03e2b1e23d6a43284 (diff)
downloadslackbuilds-a2e889a7437e058eda57ff0717a6a22f50ed5ed6.tar.gz
development/jupyter-notebook: Updated for version 6.5.2.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--development/jupyter-notebook/jupyter-notebook.SlackBuild6
-rw-r--r--development/jupyter-notebook/jupyter-notebook.info6
-rw-r--r--development/jupyter-notebook/nbclassic-0.4.6.patch73
3 files changed, 4 insertions, 81 deletions
diff --git a/development/jupyter-notebook/jupyter-notebook.SlackBuild b/development/jupyter-notebook/jupyter-notebook.SlackBuild
index df1b3492bb..bc47de7ce7 100644
--- a/development/jupyter-notebook/jupyter-notebook.SlackBuild
+++ b/development/jupyter-notebook/jupyter-notebook.SlackBuild
@@ -26,7 +26,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=jupyter-notebook
-VERSION=${VERSION:-6.5.1}
+VERSION=${VERSION:-6.5.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -82,10 +82,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Patch for compatibility with nbclassic 0.4.6
-# Credit to Eric Charles: https://github.com/jupyter/notebook/commit/ab716106.patch
-patch -p1 < $CWD/nbclassic-0.4.6.patch
-
python3 setup.py install --root=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/development/jupyter-notebook/jupyter-notebook.info b/development/jupyter-notebook/jupyter-notebook.info
index 192737e3e0..a27788ffb9 100644
--- a/development/jupyter-notebook/jupyter-notebook.info
+++ b/development/jupyter-notebook/jupyter-notebook.info
@@ -1,8 +1,8 @@
PRGNAM="jupyter-notebook"
-VERSION="6.5.1"
+VERSION="6.5.2"
HOMEPAGE="https://jupyter.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/n/notebook/notebook-6.5.1.tar.gz"
-MD5SUM="6975a28fb97b5b144d5a2b8f89fea617"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/n/notebook/notebook-6.5.2.tar.gz"
+MD5SUM="69deeaccc84d6a0e8a134bd1731d4353"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="jupyter-ipykernel jupyter-nbclassic"
diff --git a/development/jupyter-notebook/nbclassic-0.4.6.patch b/development/jupyter-notebook/nbclassic-0.4.6.patch
deleted file mode 100644
index ac3e8fa3a3..0000000000
--- a/development/jupyter-notebook/nbclassic-0.4.6.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From ab71610669e7548f2e9050f98da80cf1eba675ae Mon Sep 17 00:00:00 2001
-From: Eric Charles <eric@datalayer.io>
-Date: Sun, 16 Oct 2022 11:36:45 +0200
-Subject: [PATCH] Ensure custom preload is correctly handled
-
----
- docs/environment.yml | 2 +-
- notebook/templates/page.html | 12 ++++++++++++
- setup.py | 2 +-
- tools/build-main.js | 1 +
- 4 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/docs/environment.yml b/docs/environment.yml
-index 9f2872ecc3..f3b152ddbd 100644
---- a/docs/environment.yml
-+++ b/docs/environment.yml
-@@ -13,7 +13,7 @@ dependencies:
- - sphinx
- - terminado
- - myst-parser
--- nbclassic==0.4.5
-+- nbclassic==0.4.6
- - pip:
- - nbsphinx
- - Send2Trash
-diff --git a/notebook/templates/page.html b/notebook/templates/page.html
-index 927694e937..fb5d642f4e 100644
---- a/notebook/templates/page.html
-+++ b/notebook/templates/page.html
-@@ -98,6 +98,18 @@
- }
- })
-
-+ // error-catching custom-preload.js shim.
-+ define("custom-preload", function (require, exports, module) {
-+ try {
-+ var custom = require('custom/custom-preload');
-+ console.debug('loaded custom-preload.js');
-+ return custom;
-+ } catch (e) {
-+ console.error("error loading custom-preload.js", e);
-+ return {};
-+ }
-+ })
-+
- document.nbjs_translations = {{ nbjs_translations|safe }};
- document.documentElement.lang = navigator.language.toLowerCase();
- </script>
-diff --git a/setup.py b/setup.py
-index 02cc702ca2..9579214b75 100755
---- a/setup.py
-+++ b/setup.py
-@@ -122,7 +122,7 @@
- 'Send2Trash>=1.8.0',
- 'terminado>=0.8.3',
- 'prometheus_client',
-- 'nbclassic==0.4.5',
-+ 'nbclassic==0.4.6',
- ],
- extras_require = {
- 'test': ['pytest', 'coverage', 'requests', 'testpath',
-diff --git a/tools/build-main.js b/tools/build-main.js
-index 517186476a..0dcccaee64 100644
---- a/tools/build-main.js
-+++ b/tools/build-main.js
-@@ -60,6 +60,7 @@ var rjs_config = {
-
- exclude: [
- "custom/custom",
-+ "custom/custom-preload",
- ]
- };
-