summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Benjamin Trigona-Harany2019-05-17 08:21:37 +0200
committer Willy Sudiarto Raharjo2019-05-18 02:22:18 +0200
commit0fd3654c5227f8b6922d68ab8adae0bab22c5fdf (patch)
treed0cbecd62548b3542240d0a4ce9fd74179e1561a
parentd29b436c8b90231ee72316ff957268c65c0e73a2 (diff)
downloadslackbuilds-0fd3654c5227f8b6922d68ab8adae0bab22c5fdf.tar.gz
development/jupyter-nbdime: Updated to use Python 3.
Signed-off-by: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
-rw-r--r--development/jupyter-nbdime/README2
-rw-r--r--development/jupyter-nbdime/jupyter-nbdime.SlackBuild6
-rw-r--r--development/jupyter-nbdime/jupyter-nbdime.info2
3 files changed, 6 insertions, 4 deletions
diff --git a/development/jupyter-nbdime/README b/development/jupyter-nbdime/README
index e2aeaa08fd..9ce701916f 100644
--- a/development/jupyter-nbdime/README
+++ b/development/jupyter-nbdime/README
@@ -5,3 +5,5 @@ nbdime provides tools for diffing and merging of Jupyter Notebooks.
* nbdiff-web shows you a rich rendered diff of notebooks
* nbmerge-web gives you a web-based three-way merge tool for notebooks
* nbshow present a single notebook in a terminal-friendly way
+
+All dependencies must be built with support for Python 3.
diff --git a/development/jupyter-nbdime/jupyter-nbdime.SlackBuild b/development/jupyter-nbdime/jupyter-nbdime.SlackBuild
index 9146397a8f..34407016b3 100644
--- a/development/jupyter-nbdime/jupyter-nbdime.SlackBuild
+++ b/development/jupyter-nbdime/jupyter-nbdime.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for jupyter-nbdime
-# Copyright 2017-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
SRCNAM=nbdime
PRGNAM=jupyter-$SRCNAM
VERSION=${VERSION:-1.0.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -70,7 +70,7 @@ 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 {} \;
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/development/jupyter-nbdime/jupyter-nbdime.info b/development/jupyter-nbdime/jupyter-nbdime.info
index e41a9f5a48..d63d28afdf 100644
--- a/development/jupyter-nbdime/jupyter-nbdime.info
+++ b/development/jupyter-nbdime/jupyter-nbdime.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/source/n/nbdime/nbdime-1.0.4.t
MD5SUM="05adadfe7f859a32f5a49505265b9887"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="colorama functools-lru-cache GitPython jupyter-notebook python-requests shutil_which"
+REQUIRES="colorama GitPython jupyter-notebook python-requests"
MAINTAINER="Benjamin Trigona-Harany"
EMAIL="slackbuilds@jaxartes.net"