[arch-commits] Commit in jupyter/trunk (PKGBUILD)

[Kyle Keen]

    Date: Saturday, August 15, 2015 @ 13:46:40
  Author: kkeen
Revision: 138380

upgpkg: jupyter 4.0.2-2  bugfix: qtconsole

Modified:
  jupyter/trunk/PKGBUILD

----------+
 PKGBUILD |   79 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 44 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-15 11:43:06 UTC (rev 138379)
+++ PKGBUILD	2015-08-15 11:46:40 UTC (rev 138380)
@@ -4,8 +4,8 @@
 pkgbase=jupyter
 pkgname=(jupyter ipython2-notebook)
 pkgver=4.0.2
-pkgrel=1
-pkgdesc="A language-agnostic interactive shell/notebook server."
+pkgrel=2
+pkgdesc="A language-agnostic web-based interactive shell/notebook server."
 arch=('any')
 url="http://jupyter.org/"
 license=('BSD')
@@ -13,6 +13,8 @@
          'python-jinja' 'python-pyzmq' 'python-tornado' 'python-jsonschema'
          'python-terminado' 'python-mistune' 'python-pygments')
 makedepends=('python-setuptools' 'python2-setuptools' 'npm' 'git')
+optdepends=('python-pyqt5: qtconsole'
+            'python-sip: qtconsole')
 source=("jupyter_core.tgz::https://github.com/jupyter/jupyter_core/archive/$pkgver.tar.gz"
         "ipykernel.tgz::https://github.com/ipython/ipykernel/archive/4.0.3.tar.gz"
         "ipywidgets.tgz::https://github.com/ipython/ipywidgets/archive/4.0.2.tar.gz"
@@ -20,7 +22,8 @@
         "nbformat.tar.gz::https://github.com/jupyter/nbformat/archive/4.0.0.tar.gz"
         "jupyter_console.tgz::https://github.com/jupyter/jupyter_console/archive/4.0.0.tar.gz"
         "jupyter_client.tgz::https://github.com/jupyter/jupyter_client/archive/4.0.0.tar.gz"
-        "notebook.tgz::https://github.com/jupyter/notebook/archive/4.0.1.tar.gz")
+        "notebook.tgz::https://github.com/jupyter/notebook/archive/4.0.1.tar.gz"
+        "https://pypi.python.org/packages/source/q/qtconsole/qtconsole-4.0.0.tar.gz")
 md5sums=('ae0d0197c4febf43c050a97ac6277263'
          '690f424a89e38a5559802bb58223142e'
          '1ced3f6b0893f7a43c6392252c0f80ab'
@@ -28,10 +31,9 @@
          '7cf61359fa4e9cf3ef5e969e2fcb909e'
          'c34deb24f1c14208b2cb4c60f346d298'
          '00fa63c67cb3adf359d09dc4d803aff5'
-         '1b66b9074df8e3d9d53ee00dde31cea1')
+         '1b66b9074df8e3d9d53ee00dde31cea1'
+         '1e26773423044dba4ec138f1725d5582')
 
-# jupyter/qtconsole hasn't had an actual release so not including it for now
-
 # notebook optdeps ?
 # 'haskell-pandoc: ipython notebook conversion'
 # 'texlive-bin: notebook pdf export'
@@ -41,6 +43,7 @@
   cp -r jupyter_core-$pkgver python2-jupyter_core-$pkgver
   cp -r jupyter_client-4.0.0 python2-jupyter_client-4.0.0
   cp -r ipykernel-4.0.3      python2-ipykernel-4.0.3
+  cp -r qtconsole-4.0.0      python2-qtconsole-4.0.0
 }
 
 build_jupyter() {
@@ -53,39 +56,43 @@
 
 package_jupyter() {
   provides=('ipython-notebook')
-  cd "$srcdir"
+  #replaces=('ipython-notebook')
 
-  pushd "jupyter_core-$pkgver"
+  cd "$srcdir/jupyter_core-$pkgver"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "ipykernel-4.0.3"
-  # this feels like it should be in the ipython package
+
+  cd "$srcdir/ipykernel-4.0.3"
+  # this is in the ipython package
   #python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "ipywidgets-4.0.2"
+
+  cd "$srcdir/ipywidgets-4.0.2"
   # needs node
+  # not sure why this is broken
   # weird read perms error on ~/.config/configstore/bower-github.yml ?
-  # (yes that is outside of srcdir)
-  # not sure why this is broken
+  # multiple conflicting versions of bower ?
+  # relative paths inside 'less' ?
   #python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "notebook-4.0.1"
+
+  cd "$srcdir/notebook-4.0.1"
   # needs node
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "nbconvert-4.0.0"
+
+  cd "$srcdir/nbconvert-4.0.0"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "nbformat-4.0.0"
+
+  cd "$srcdir/nbformat-4.0.0"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "jupyter_console-4.0.0"
+
+  cd "$srcdir/jupyter_console-4.0.0"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "jupyter_client-4.0.0"
+
+  cd "$srcdir/jupyter_client-4.0.0"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
 
+  cd "$srcdir/qtconsole-4.0.0"
+  python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
+
+  cd "$srcdir"
   install -Dm644 "jupyter_core-$pkgver/COPYING.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
@@ -93,24 +100,26 @@
   pkgdesc="An enhanced Interactive Python2 shell."
   depends=('ipython2' 'jupyter')
 
-  cd "$srcdir"
+  cd "$srcdir/python2-ipykernel-4.0.3"
+  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  pushd "python2-ipykernel-4.0.3"
+  cd "$srcdir/python2-jupyter_core-$pkgver"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "python2-jupyter_core-$pkgver"
+
+  cd "$srcdir/python2-jupyter_client-4.0.0"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "python2-jupyter_client-4.0.0"
+
+  cd "$srcdir/python2-qtconsole-4.0.0"
+  # needed for spyder2
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
 
-  pushd "$pkgdir/usr/bin"
+  cd "$pkgdir/usr/bin"
   mv jupyter jupyter-py2
   mv jupyter-kernelspec jupyter-kernelspec-py2
   mv jupyter-migrate jupyter-migrate-py2
-  popd
+  mv jupyter-qtconsole jupyter-qtconsole-py2
 
+  cd "$srcdir"
   install -d "$pkgdir/usr/share/jupyter/kernels/python2"
   echo '{"display_name": "IPython 2", "language": "python2", "argv": ["python2", "-c", "from IPython.kernel.zmq.kernelapp import main; main()", "-f", "{connection_file}"],"codemirror_mode": {"version": 2, "name": "ipython2"}}' > "$pkgdir/usr/share/jupyter/kernels/python2/kernel.json"