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

[Kyle Keen]

    Date: Sunday, August 16, 2015 @ 13:58:00
  Author: kkeen
Revision: 138407

upgpkg: jupyter 4.0.2-3  FS#45993

Modified:
  jupyter/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-16 11:19:18 UTC (rev 138406)
+++ PKGBUILD	2015-08-16 11:58:00 UTC (rev 138407)
@@ -4,7 +4,7 @@
 pkgbase=jupyter
 pkgname=(jupyter ipython2-notebook)
 pkgver=4.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A language-agnostic web-based interactive shell/notebook server."
 arch=('any')
 url="http://jupyter.org/"
@@ -98,7 +98,9 @@
 
 package_ipython2-notebook() {
   pkgdesc="An enhanced Interactive Python2 shell."
-  depends=('ipython2' 'jupyter')
+  depends=('ipython2' 'jupyter' 'python2-pyzmq')
+  optdepends=('python2-pyqt5: jupyter-qtconsole-py2'
+              'python2-sip: jupyter-qtconsole-py2')
 
   cd "$srcdir/python2-ipykernel-4.0.3"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
@@ -110,18 +112,17 @@
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
   cd "$srcdir/python2-qtconsole-4.0.0"
-  # needed for spyder2
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
   cd "$pkgdir/usr/bin"
-  mv jupyter jupyter-py2
-  mv jupyter-kernelspec jupyter-kernelspec-py2
-  mv jupyter-migrate jupyter-migrate-py2
+  rm jupyter
+  rm jupyter-kernelspec
+  rm jupyter-migrate
   mv jupyter-qtconsole jupyter-qtconsole-py2
 
   cd "$srcdir"
   install -d "$pkgdir/usr/share/jupyter/kernels/python2"
-  echo '{"display_name": "IPython 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"
+  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"
 }