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

[Kyle Keen]

    Date: Saturday, January 30, 2016 @ 03:56:47
  Author: kkeen
Revision: 159435

upgpkg: jupyter 4.0.6-5  split out jupyter-notebook

Modified:
  jupyter/trunk/PKGBUILD

----------+
 PKGBUILD |   42 ++++++++----------------------------------
 1 file changed, 8 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-30 02:26:37 UTC (rev 159434)
+++ PKGBUILD	2016-01-30 02:56:47 UTC (rev 159435)
@@ -4,28 +4,29 @@
 pkgbase=jupyter
 pkgname=(jupyter ipython2-notebook)
 pkgver=4.0.6
-pkgrel=4
+pkgrel=5
 pkgdesc="A language-agnostic web-based interactive shell/notebook server."
 arch=('any')
 url="http://jupyter.org/"
 license=('BSD')
-depends=('ipython' 'python-setuptools'
+depends=('ipython' 'jupyter-notebook' 'python-setuptools'
          'python-jinja' 'python-pyzmq' 'python-tornado' 'python-jsonschema'
          'python-terminado' 'python-mistune' 'python-pygments')
 makedepends=('python-setuptools' 'python2-setuptools' 'npm' 'git')
-optdepends=('mathjax: latex equation rendering'
+optdepends=('pandoc: notebook conversion'
             'qt5-svg: jupyter-qtconsole'
             'python-pyqt5: jupyter-qtconsole'
             'python-sip: jupyter-qtconsole')
 
+# todo: figure out which deps left with jupyter-notebook
+
 # rebundle all the parts that were split out
 _ipykv=4.2.2  # ipykernel
 _ipywv=4.1.1  # ipywidgets
 _jnbcv=4.1.0  # notebook convert
 _jnbfv=4.0.1  # notebook format
-_jconv=4.0.3  # jupyter console
+_jconv=4.1.0  # jupyter console
 _jcliv=4.1.1  # jupyter client
-_notev=4.1.0  # notebook
 _qtcv=4.1.1   # qtconsole
 
 source=("jupyter_core.tgz::https://github.com/jupyter/jupyter_core/archive/$pkgver.tar.gz"
@@ -35,7 +36,6 @@
         "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"
         "qtconsole.tgz::https://github.com/jupyter/qtconsole/archive/$_qtcv.tar.gz")
 md5sums=('50a73c3a4a8ed047a3674d2b5274cc3b'
          '4ac8ae11f1eef4920bf4a5383e13ab50'
@@ -42,18 +42,12 @@
          '099e9b76c52839dc33604aad7a2f1a42'
          '06655576713ba1ff7cece2b92760c187'
          'ab7172e517c9d561c0c01eef5631b4c8'
-         '0e928ea261e7f8154698cf69ed4f2459'
+         '9c655076262760bdbeeada9d7f586237'
          '8436e4a3266a442f576cdfef39dc0e19'
-         '763ab54b3fc69f6225b9659b6994e756'
          '09edb4932e59a07f26ff1fd492c9f740')
 
-# 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?
+# python-pyqt5 python-sip python-pygments python-pyzmq
 
 prepare() {
   cd "$srcdir"
@@ -64,16 +58,6 @@
 }
 
 build() {
-  cd "$srcdir"
-
-  # FS45999 disable bundled mathjax
-  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
-  # needs node, downloads a lot of stuff
-  python3 setup.py build
-
   cd "$srcdir/ipywidgets-$_ipywv"
   # needs node, downloads a lot of stuff
   python3 setup.py build
@@ -80,9 +64,6 @@
 }
 
 package_jupyter() {
-  provides=('ipython-notebook')
-  #replaces=('ipython-notebook')
-
   cd "$srcdir/jupyter_core-$pkgver"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
@@ -93,13 +74,6 @@
   cd "$srcdir/ipywidgets-$_ipywv"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  cd "$srcdir/notebook-$_notev"
-  # needs node
-  python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  # FS45999 use system mathjax
-  ln -s /usr/share/mathjax \
-  "$pkgdir/usr/lib/python3.5/site-packages/notebook/static/components/MathJax"
-
   cd "$srcdir/nbconvert-$_jnbcv"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0