python/ipython: Moved from development/, upgraded for version 5.1.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

6 files changed, 25 insertions, 32 deletions

diff --git a/development/ipython/README b/development/ipython/README
deleted file mode 100644
index 3f141871f4..0000000000
--- a/development/ipython/README
+++ /dev/null
@@ -1,12 +0,0 @@
-IPython is a replacement shell for Python programming. It offers an enhanced
-Python shell for the terminal.
-
-The following additional features may be enabled by installing the listed
-optional dependencies:
-
-* parallel computing: pyzmq
-* Qt console: Pygments, pyzmq
-* nbconvert: pandoc, Pygments, Sphinx
-* notebook: Jinja2, jsonschema, pyzmq, tornado
-* plotting: matplotlib
-* LaTeX in notebooks: ipython-mathjax
diff --git a/development/ipython/ipython.info b/development/ipython/ipython.info
deleted file mode 100644
index dc40104cb7..0000000000
--- a/development/ipython/ipython.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ipython"
-VERSION="3.1.0"
-HOMEPAGE="http://ipython.org"
-DOWNLOAD="http://archive.ipython.org/release/3.1.0/ipython-3.1.0.tar.gz"
-MD5SUM="a749d90c16068687b0ec45a27e72ef8f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
diff --git a/python/ipython/README b/python/ipython/README
new file mode 100644
index 0000000000..3832cc1ea1
--- /dev/null
+++ b/python/ipython/README
@@ -0,0 +1,5 @@
+IPython is a replacement shell for Python programming. It offers an
+enhanced Python shell for the terminal.
+
+This package no longer provides IPython notebook functionality. This is
+now provided with the jupyter-notebook and jupyter-ipykernel packages.
diff --git a/development/ipython/ipython.SlackBuild b/python/ipython/ipython.SlackBuild
index 50da8a8dd2..ee81e14b7b 100644
--- a/development/ipython/ipython.SlackBuild
+++ b/python/ipython/ipython.SlackBuild
@@ -25,13 +25,13 @@
 # Maintained by Benjamin-Trigona-Harany
 
 PRGNAM=ipython
-VERSION=${VERSION:-3.1.0}
+VERSION=${VERSION:-5.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
diff --git a/python/ipython/ipython.info b/python/ipython/ipython.info
new file mode 100644
index 0000000000..ca219301fa
--- /dev/null
+++ b/python/ipython/ipython.info
@@ -0,0 +1,10 @@
+PRGNAM="ipython"
+VERSION="5.1.0"
+HOMEPAGE="http://ipython.org"
+DOWNLOAD="https://github.com/ipython/ipython/archive/5.1.0/ipython-5.1.0.tar.gz"
+MD5SUM="44c98687e249adb08f8eb1928a5492a1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="decorator pexpect pickleshare prompt_toolkit Pygments shutil_get_terminal_size simplegeneric traitlets"
+MAINTAINER="Benjamin Trigona-Harany"
+EMAIL="slackbuilds@jaxartes.net"
diff --git a/development/ipython/slack-desc b/python/ipython/slack-desc
index dd49fc8430..2f9295b294 100644
--- a/development/ipython/slack-desc
+++ b/python/ipython/slack-desc
@@ -8,12 +8,12 @@
        |-----handy-ruler------------------------------------------------------|
 ipython: ipython (an enhanced Python shell)
 ipython:
-ipython: IPython is a multiplatform, Free Software project (BSD licensed) that
-ipython: offers:
-ipython: * An enhanced Python shell designed for efficient interactive work.
-ipython: * A library to build customized interactive environments using
-ipython: Python as the basic language
-ipython: * A system for interactive distributed and parallel computing
-ipython:
-ipython: Home Page: http://ipython.scipy.org/moin/
+ipython: IPython is a multiplatform project that offers an enhanced Python
+ipython: shell designed for efficient interactive work.
+ipython:
+ipython:
+ipython:
+ipython:
+ipython:
+ipython:
 ipython: