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

[Kyle Keen]

    Date: Tuesday, October 11, 2016 @ 14:50:49
  Author: kkeen
Revision: 191952

upgpkg: jupyter 4.1.0-6

Modified:
  jupyter/trunk/PKGBUILD

----------+
 PKGBUILD |  122 ++++++++-----------------------------------------------------
 1 file changed, 17 insertions(+), 105 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-11 14:46:36 UTC (rev 191951)
+++ PKGBUILD	2016-10-11 14:50:49 UTC (rev 191952)
@@ -4,128 +4,40 @@
 pkgbase=jupyter
 pkgname=(jupyter ipython2-notebook)
 pkgver=4.1.0
-pkgrel=5
+pkgrel=6
 pkgdesc="A language-agnostic web-based interactive shell/notebook server."
 arch=('any')
 url="http://jupyter.org/"
 license=('BSD')
-depends=('ipython' 'python-ipykernel' 'python-setuptools'
-         'python-jinja' 'python-pyzmq' 'python-jsonschema'
-         'python-mistune' 'python-pygments')
-makedepends=('python-setuptools' 'python2-setuptools' 'npm' 'git')
-optdepends=('jupyter-nbconvert: notebook conversion'
-            'qt5-svg: jupyter-qtconsole'
-            'python-pyqt5: jupyter-qtconsole'
-            'python-sip: jupyter-qtconsole')
+depends=('python-setuptools' 'python-jinja' 'python-mistune'
+         'ipython' 'python-ipykernel' 'python-jupyter_core'
+         'python-ipywidgets' 'jupyter-nbformat' 'jupyter_console'
+         'python-jupyter_client')
+optdepends=('jupyter-nbconvert: notebook conversion')
+source=()
+md5sums=()
 
-# todo: figure out which deps left with jupyter-notebook
-# todo: figure out which deps left with jupyter-nbconvert
+# and now with everything split out, nothing is left
+# todo: packages depending on jupyter/ipython2-notebook don't have to
+# (unless they want to make it easy for me to handle updates?)
 
-# rebundle all the parts that were split out
-# but split them out officially over time
-_ipywv=4.1.1  # ipywidgets
-_jnbfv=4.0.1  # notebook format
-_jconv=5.0.0  # jupyter console
-_jcliv=4.3.0  # jupyter client
-_qtcv=4.2.1   # qtconsole
+# python-jinja and python-mistune are missing from something in the tree?
 
-# ipywidgets 5.2.X may also be a joke, based on speed of releases
-# and it seems to be because it doesn't do npm correctly
+# honorable mention for python{,2}-qtconsole somewhere?
 
-# future order of splits:
-# python{,2}-jupyter_core
-# python{,2}-jupyter_client
-# python-ipywidgets
-
-source=("jupyter_core-$pkgver.tgz::https://github.com/jupyter/jupyter_core/archive/$pkgver.tar.gz"
-        "ipywidgets-$_ipywv.tgz::https://github.com/ipython/ipywidgets/archive/$_ipywv.tar.gz"
-        "nbformat-$_jnbfv.tgz::https://github.com/jupyter/nbformat/archive/$_jnbfv.tar.gz"
-        "jupyter_console-$_jconv.tgz::https://github.com/jupyter/jupyter_console/archive/$_jconv.tar.gz"
-        "jupyter_client-$_jcliv.tgz::https://github.com/jupyter/jupyter_client/archive/$_jcliv.tar.gz"
-        "qtconsole-$_qtcv.tgz::https://github.com/jupyter/qtconsole/archive/$_qtcv.tar.gz")
-md5sums=('b7e928f965f68aef13fea1bf9d6384aa'
-         '099e9b76c52839dc33604aad7a2f1a42'
-         'ab7172e517c9d561c0c01eef5631b4c8'
-         '08a9fde32a45c9e2e0b4cec6eca249c2'
-         '257d9f5429dac4d9511db84d201d3a9e'
-         '97a3e29cd69bc0270411b313c907c173')
-
-# qtconsole deps?
-# python-pyqt5 python-sip python-pygments python-pyzmq
-
-prepare() {
+build() {
   cd "$srcdir"
-  cp -r jupyter_core-$pkgver   python2-jupyter_core-$pkgver
-  cp -r jupyter_client-$_jcliv python2-jupyter_client-$_jcliv
-  cp -r qtconsole-$_qtcv       python2-qtconsole-$_qtcv
 }
 
-build() {
-  cd "$srcdir/ipywidgets-$_ipywv"
-  # needs node, downloads a lot of stuff
-  python3 setup.py build
-  # as of 5.something it doesn't automatically npm?
-  # npm install seems very broken for tarball builds
-  #cd jupyter-js-widgets
-  #npm install
-  #cd ..
-  #cd widgetsnbextension
-  #npm install
-  #cd ..
-}
-
 package_jupyter() {
-  cd "$srcdir/jupyter_core-$pkgver"
-  python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-
-  cd "$srcdir/ipywidgets-$_ipywv"
-  python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-
-  cd "$srcdir/nbformat-$_jnbfv"
-  python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-
-  cd "$srcdir/jupyter_console-$_jconv"
-  python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=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
-  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"
 }
 
 package_ipython2-notebook() {
+  # deprecated package?
   pkgdesc="Misc libraries required for notebook integration."
-  depends=('ipython2' 'python2-ipykernel' 'python2-pyzmq')
-  optdepends=('python2-pyqt5: jupyter-qtconsole-py2'
-              'qt5-svg: jupyter-qtconsole-py2'
-              'python2-sip: jupyter-qtconsole-py2')
-
-  cd "$srcdir/python2-jupyter_core-$pkgver"
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-
-  cd "$srcdir/python2-jupyter_client-$_jcliv"
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-
-  cd "$srcdir/python2-qtconsole-$_qtcv"
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-
-  cd "$pkgdir/usr/bin"
-  rm jupyter
-  rm jupyter-kernelspec
-  rm jupyter-migrate
-  mv jupyter-qtconsole jupyter-qtconsole-py2
-
+  depends=('ipython2' 'python2-ipykernel'
+           'python2-jupyter_core' 'python2-jupyter_client')
   cd "$srcdir"
-  install -Dm644 "jupyter_core-$pkgver/COPYING.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }