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

[Kyle Keen]

    Date: Sunday, March 6, 2016 @ 17:01:40
  Author: kkeen
Revision: 165388

upgpkg: jupyter 4.0.6-7

Modified:
  jupyter/trunk/PKGBUILD

----------+
 PKGBUILD |   25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-06 15:43:32 UTC (rev 165387)
+++ PKGBUILD	2016-03-06 16:01:40 UTC (rev 165388)
@@ -4,12 +4,12 @@
 pkgbase=jupyter
 pkgname=(jupyter ipython2-notebook)
 pkgver=4.0.6
-pkgrel=6
+pkgrel=7
 pkgdesc="A language-agnostic web-based interactive shell/notebook server."
 arch=('any')
 url="http://jupyter.org/"
 license=('BSD')
-depends=('ipython' 'python-setuptools'
+depends=('ipython' 'python-ipykernel' 'python-setuptools'
          'python-jinja' 'python-pyzmq' 'python-jsonschema'
          'python-mistune' 'python-pygments')
 makedepends=('python-setuptools' 'python2-setuptools' 'npm' 'git')
@@ -21,7 +21,7 @@
 # todo: figure out which deps left with jupyter-notebook
 
 # rebundle all the parts that were split out
-_ipykv=4.3.0  # ipykernel
+# but split them out officially over time
 _ipywv=4.1.1  # ipywidgets
 _jnbcv=4.1.0  # notebook convert
 _jnbfv=4.0.1  # notebook format
@@ -30,7 +30,6 @@
 _qtcv=4.1.1   # qtconsole
 
 source=("jupyter_core-$pkgver.tgz::https://github.com/jupyter/jupyter_core/archive/$pkgver.tar.gz"
-        "ipykernel-$_ipykv.tgz::https://github.com/ipython/ipykernel/archive/$_ipykv.tar.gz"
         "ipywidgets-$_ipywv.tgz::https://github.com/ipython/ipywidgets/archive/$_ipywv.tar.gz"
         "nbconvert-$_jnbcv.tgz::https://github.com/jupyter/nbconvert/archive/$_jnbcv.tar.gz"
         "nbformat-$_jnbfv.tgz::https://github.com/jupyter/nbformat/archive/$_jnbfv.tar.gz"
@@ -38,7 +37,6 @@
         "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=('50a73c3a4a8ed047a3674d2b5274cc3b'
-         '5961164fe908faf798232a265ed48c73'
          '099e9b76c52839dc33604aad7a2f1a42'
          '06655576713ba1ff7cece2b92760c187'
          'ab7172e517c9d561c0c01eef5631b4c8'
@@ -51,10 +49,9 @@
 
 prepare() {
   cd "$srcdir"
-  cp -r jupyter_core-$pkgver python2-jupyter_core-$pkgver
+  cp -r jupyter_core-$pkgver   python2-jupyter_core-$pkgver
   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() {
@@ -67,10 +64,6 @@
   cd "$srcdir/jupyter_core-$pkgver"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  cd "$srcdir/ipykernel-$_ipykv"
-  # this is in the ipython package
-  #python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-
   cd "$srcdir/ipywidgets-$_ipywv"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
@@ -101,14 +94,11 @@
 
 package_ipython2-notebook() {
   pkgdesc="An enhanced Interactive Python2 shell."
-  depends=('ipython2' 'python2-pyzmq')
+  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-ipykernel-$_ipykv"
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-
   cd "$srcdir/python2-jupyter_core-$pkgver"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
@@ -125,9 +115,6 @@
   mv jupyter-qtconsole jupyter-qtconsole-py2
 
   cd "$srcdir"
-  install -d "$pkgdir/usr/share/jupyter/kernels/python2"
-  echo '{"display_name": "Python 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"
-
   install -Dm644 "jupyter_core-$pkgver/COPYING.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }