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

[Kyle Keen]

    Date: Friday, August 21, 2015 @ 19:34:10
  Author: kkeen
Revision: 138604

upgpkg: jupyter 4.0.4-1

Modified:
  jupyter/trunk/PKGBUILD

----------+
 PKGBUILD |   49 +++++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-21 17:26:37 UTC (rev 138603)
+++ PKGBUILD	2015-08-21 17:34:10 UTC (rev 138604)
@@ -3,8 +3,8 @@
 
 pkgbase=jupyter
 pkgname=(jupyter ipython2-notebook)
-pkgver=4.0.2
-pkgrel=4
+pkgver=4.0.4
+pkgrel=1
 pkgdesc="A language-agnostic web-based interactive shell/notebook server."
 arch=('any')
 url="http://jupyter.org/"
@@ -16,16 +16,24 @@
 optdepends=('mathjax: latex equation rendering'
             'python-pyqt5: qtconsole'
             'python-sip: qtconsole')
+
+# some of these will update rapidly, others never
+# so _vers will be phased in as new updates are released
+_ipykv=4.0.3  # ipykernel
+_ipywv=4.0.2  # ipywidgets
+_qtcv=4.0.1   # qtconsole
+_notev=4.0.1  # notebook
+
 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"
+        "ipykernel.tgz::https://github.com/ipython/ipykernel/archive/$_ipykv.tar.gz"
+        "ipywidgets.tgz::https://github.com/ipython/ipywidgets/archive/$_ipywv.tar.gz"
         "nbconvert.tgz::https://github.com/jupyter/nbconvert/archive/4.0.0.tar.gz"
         "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"
-        "https://pypi.python.org/packages/source/q/qtconsole/qtconsole-4.0.0.tar.gz")
-md5sums=('ae0d0197c4febf43c050a97ac6277263'
+        "notebook.tgz::https://github.com/jupyter/notebook/archive/$_notev.tar.gz"
+        "https://pypi.python.org/packages/source/q/qtconsole/qtconsole-$_qtcv.tar.gz")
+md5sums=('5b6ca0e73bf559f4fe6106a6e412f913'
          '690f424a89e38a5559802bb58223142e'
          '1ced3f6b0893f7a43c6392252c0f80ab'
          '9661620b1e10a7b46f314588d2d0932f'
@@ -33,18 +41,22 @@
          'c34deb24f1c14208b2cb4c60f346d298'
          '00fa63c67cb3adf359d09dc4d803aff5'
          '1b66b9074df8e3d9d53ee00dde31cea1'
-         '1e26773423044dba4ec138f1725d5582')
+         'a8f17246361ee37ec55d3222dee9e18c')
 
 # notebook optdeps ?
 # 'haskell-pandoc: ipython notebook conversion'
 # 'texlive-bin: notebook pdf export'
 
+# qtconsole deps?
+# python-pyqt4 python-sip python-pygments python-pyzmq
+# is qt5 now?
+
 prepare() {
   cd "$srcdir"
   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
+  cp -r ipykernel-$_ipykv    python2-ipykernel-$_ipykv
+  cp -r qtconsole-$_qtcv      python2-qtconsole-$_qtcv
 }
 
 build() {
@@ -51,7 +63,7 @@
   cd "$srcdir"
 
   # FS45999 disable bundled mathjax
-  cd "$srcdir/notebook-4.0.1"
+  cd "$srcdir/notebook-$_notev"
   sed -i 's/^.*MathJax.*$//' bower.json 
   #sed -i '/Trim mathjax/,/^                static_data.append/d' setupbase.py
   sed -i 's/mj(/#mj(/' setupbase.py
@@ -58,7 +70,7 @@
   # needs node, downloads a lot of stuff
   python3 setup.py build
 
-  cd "$srcdir/ipywidgets-4.0.2"
+  cd "$srcdir/ipywidgets-$_ipywv"
   # needs node, downloads a lot of stuff
   python3 setup.py build
 }
@@ -70,14 +82,14 @@
   cd "$srcdir/jupyter_core-$pkgver"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  cd "$srcdir/ipykernel-4.0.3"
+  cd "$srcdir/ipykernel-$_ipykv"
   # this is in the ipython package
   #python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  cd "$srcdir/ipywidgets-4.0.2"
+  cd "$srcdir/ipywidgets-$_ipywv"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  cd "$srcdir/notebook-4.0.1"
+  cd "$srcdir/notebook-$_notev"
   # needs node
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
   # FS45999 use system mathjax
@@ -96,8 +108,9 @@
   cd "$srcdir/jupyter_client-4.0.0"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  cd "$srcdir/qtconsole-4.0.0"
+  cd "$srcdir/qtconsole-$_qtcv"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
+  install -Dm644 examples/jupyter-qtconsole.desktop "$pkgdir/usr/share/applications/ipython-qtconsole.desktop"
 
   cd "$srcdir"
   install -Dm644 "jupyter_core-$pkgver/COPYING.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -109,7 +122,7 @@
   optdepends=('python2-pyqt5: jupyter-qtconsole-py2'
               'python2-sip: jupyter-qtconsole-py2')
 
-  cd "$srcdir/python2-ipykernel-4.0.3"
+  cd "$srcdir/python2-ipykernel-$_ipykv"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
   cd "$srcdir/python2-jupyter_core-$pkgver"
@@ -118,7 +131,7 @@
   cd "$srcdir/python2-jupyter_client-4.0.0"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  cd "$srcdir/python2-qtconsole-4.0.0"
+  cd "$srcdir/python2-qtconsole-$_qtcv"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
   cd "$pkgdir/usr/bin"