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

[Kyle Keen]

    Date: Friday, December 11, 2015 @ 20:55:03
  Author: kkeen
Revision: 153060

upgpkg: jupyter 4.0.6-3  FS#47046

Modified:
  jupyter/trunk/PKGBUILD

----------+
 PKGBUILD |   64 ++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-11 19:38:09 UTC (rev 153059)
+++ PKGBUILD	2015-12-11 19:55:03 UTC (rev 153060)
@@ -4,7 +4,7 @@
 pkgbase=jupyter
 pkgname=(jupyter ipython2-notebook)
 pkgver=4.0.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A language-agnostic web-based interactive shell/notebook server."
 arch=('any')
 url="http://jupyter.org/"
@@ -18,31 +18,34 @@
             'python-pyqt5: jupyter-qtconsole'
             'python-sip: jupyter-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.4  # notebook
+# rebundle all the parts that were split out
+_ipykv=4.2.1  # ipykernel
+_ipywv=4.1.1  # ipywidgets
+_jnbcv=4.1.0  # notebook convert
+_jnbfv=4.0.1  # notebook format
+_jconv=4.0.3  # jupyter console
+_jcliv=4.1.1  # jupyter client
+_notev=4.0.6  # notebook
+_qtcv=4.1.1   # qtconsole
 
 source=("jupyter_core.tgz::https://github.com/jupyter/jupyter_core/archive/$pkgver.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.2.tar.gz"
-        "jupyter_client.tgz::https://github.com/jupyter/jupyter_client/archive/4.0.0.tar.gz"
+        "nbconvert.tgz::https://github.com/jupyter/nbconvert/archive/$_jnbcv.tar.gz"
+        "nbformat.tgz::https://github.com/jupyter/nbformat/archive/$_jnbfv.tar.gz"
+        "jupyter_console.tgz::https://github.com/jupyter/jupyter_console/archive/$_jconv.tar.gz"
+        "jupyter_client.tgz::https://github.com/jupyter/jupyter_client/archive/$_jcliv.tar.gz"
         "notebook.tgz::https://github.com/jupyter/notebook/archive/$_notev.tar.gz"
-        "https://pypi.python.org/packages/source/q/qtconsole/qtconsole-$_qtcv.tar.gz")
+        "qtconsole.tgz::https://github.com/jupyter/qtconsole/archive/$_qtcv.tar.gz")
 md5sums=('50a73c3a4a8ed047a3674d2b5274cc3b'
-         '690f424a89e38a5559802bb58223142e'
-         '1ced3f6b0893f7a43c6392252c0f80ab'
-         '9661620b1e10a7b46f314588d2d0932f'
-         '7cf61359fa4e9cf3ef5e969e2fcb909e'
-         'f2e174938c91136549b908bd39fa5d59'
-         '00fa63c67cb3adf359d09dc4d803aff5'
-         'ab72f28f6af8107d71241a4110e92c05'
-         'a8f17246361ee37ec55d3222dee9e18c')
+         'de583ee9c84db6296269ce7de0afb63f'
+         '099e9b76c52839dc33604aad7a2f1a42'
+         '06655576713ba1ff7cece2b92760c187'
+         'ab7172e517c9d561c0c01eef5631b4c8'
+         '0e928ea261e7f8154698cf69ed4f2459'
+         '8436e4a3266a442f576cdfef39dc0e19'
+         'd70d8a6d01893f4b64df9edbc0e13b52'
+         '09edb4932e59a07f26ff1fd492c9f740')
 
 # notebook optdeps ?
 # 'haskell-pandoc: ipython notebook conversion'
@@ -55,9 +58,9 @@
 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 jupyter_client-$_jcliv python2-jupyter_client-$_jcliv
   cp -r ipykernel-$_ipykv    python2-ipykernel-$_ipykv
-  cp -r qtconsole-$_qtcv      python2-qtconsole-$_qtcv
+  cp -r qtconsole-$_qtcv     python2-qtconsole-$_qtcv
 }
 
 build() {
@@ -97,21 +100,26 @@
   ln -s /usr/share/mathjax \
   "$pkgdir/usr/lib/python3.5/site-packages/notebook/static/components/MathJax"
 
-  cd "$srcdir/nbconvert-4.0.0"
+  cd "$srcdir/nbconvert-$_jnbcv"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  cd "$srcdir/nbformat-4.0.0"
+  cd "$srcdir/nbformat-$_jnbfv"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  cd "$srcdir/jupyter_console-4.0.2"
+  cd "$srcdir/jupyter_console-$_jconv"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  cd "$srcdir/jupyter_client-4.0.0"
+  cd "$srcdir/jupyter_client-$_jcliv"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=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 examples
+  # FS#47046 fix .desktop icon
+  sed -i 's|^Icon=.*$|Icon=/usr/lib/python3.5/site-packages/qtconsole/resources/icon/JupyterConsole.svg|' \
+    jupyter-qtconsole.desktop
+  install -Dm644 jupyter-qtconsole.desktop \
+    "$pkgdir/usr/share/applications/jupyter-qtconsole.desktop"
 
   cd "$srcdir"
   install -Dm644 "jupyter_core-$pkgver/COPYING.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -130,7 +138,7 @@
   cd "$srcdir/python2-jupyter_core-$pkgver"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  cd "$srcdir/python2-jupyter_client-4.0.0"
+  cd "$srcdir/python2-jupyter_client-$_jcliv"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
   cd "$srcdir/python2-qtconsole-$_qtcv"