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

[Kyle Keen]

    Date: Friday, August 21, 2015 @ 19:24:15
  Author: kkeen
Revision: 138601

upgpkg: ipython 4.0.0-2

Modified:
  ipython/trunk/PKGBUILD

----------+
 PKGBUILD |   80 ++++++++++++++++++++++++++++---------------------------------
 1 file changed, 37 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-21 15:23:54 UTC (rev 138600)
+++ PKGBUILD	2015-08-21 17:24:15 UTC (rev 138601)
@@ -8,7 +8,7 @@
 pkgbase=ipython 
 pkgname=(ipython ipython2)
 pkgver=4.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An enhanced Interactive Python shell."
 arch=('any')
 url="http://ipython.org"
@@ -18,13 +18,12 @@
 optdepends=("python-nose: for IPython's test suite")
 install=ipython.install
 
-# qtconsole isn't released for 4 yet
-# qtconsole deps: python-pyqt4 python-sip python-pygments python-pyzmq
+# some of these will update rapidly, others never
+# so _vars will be phased in as new updates are released
+_ipykv=4.0.3
 
-#source=("http://archive.ipython.org/release/$pkgver/ipython-$pkgver.tar.gz")
-#source=("https://github.com/ipython/ipython/archive/rel-$pkgver.tar.gz")
 source=("https://pypi.python.org/packages/source/i/ipython/$pkgbase-$pkgver.tar.gz"
-        "ipykernel.tgz::https://github.com/ipython/ipykernel/archive/4.0.3.tar.gz"
+        "ipykernel.tgz::https://github.com/ipython/ipykernel/archive/$_ipykv.tar.gz"
         "https://pypi.python.org/packages/source/t/traitlets/traitlets-4.0.0.tar.gz"
         "https://pypi.python.org/packages/source/i/ipython_genutils/ipython_genutils-0.1.0.tar.gz"
         "https://pypi.python.org/packages/source/p/pickleshare/pickleshare-0.5.tar.gz"
@@ -56,7 +55,7 @@
 prepare() {
   cd "$srcdir"
   cp -r ipython-$pkgver        ipython2-$pkgver
-  cp -r ipykernel-4.0.3        python2-ipykernel-4.0.3
+  cp -r ipykernel-$_ipykv      python2-ipykernel-$_ipykv
   cp -r ipython_genutils-0.1.0 ipython2_genutils-0.1.0
   cp -r pickleshare-0.5        python2-pickleshare-0.5
   cp -r traitlets-4.0.0        python2-traitlets-4.0.0
@@ -76,38 +75,35 @@
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
   # TEMPORARY!
-  pushd "$srcdir/ipython_genutils-0.1.0"
+  cd "$srcdir/ipython_genutils-0.1.0"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "$srcdir/pickleshare-0.5"
+
+  cd "$srcdir/pickleshare-0.5"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "$srcdir/traitlets-4.0.0"
+
+  cd "$srcdir/traitlets-4.0.0"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "$srcdir/path.py-7.6"
+
+  cd "$srcdir/path.py-7.6"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "$srcdir/simplegeneric-0.8.1"
+
+  cd "$srcdir/simplegeneric-0.8.1"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "$srcdir/ipykernel-4.0.3"
+
+  cd "$srcdir/ipykernel-$_ipykv"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
 
+  cd "$srcdir/ipython-$pkgver"
   install -Dm644 docs/source/about/license_and_copyright.rst "$pkgdir/usr/share/licenses/ipython/LICENSE"
 
-  pushd "examples/IPython Kernel/"
+  cd "$srcdir/ipython-$pkgver/examples/IPython Kernel/"
   # FS#45120
   sed -i 's/gnome-netstatus-idle/ipython/' *.desktop
   install -Dm644 ipython.desktop "$pkgdir/usr/share/applications/ipython.desktop"
   #install -Dm644 ipython-qtconsole.desktop "$pkgdir/usr/share/applications/ipython-qtconsole.desktop"
-  popd
-  #pushd IPython/qt/console/resources/icon/
+
+  #cd $srcdir/ipython-$pkgver/IPython/qt/console/resources/icon/
   #install -Dm644 IPythonConsole.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/ipython.svg"
-  #popd
-
-
 }
 
 package_ipython2() {
@@ -122,43 +118,41 @@
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
   # TEMPORARY!
-  pushd "$srcdir/ipython2_genutils-0.1.0"
+  cd "$srcdir/ipython2_genutils-0.1.0"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "$srcdir/python2-pickleshare-0.5"
+
+  cd "$srcdir/python2-pickleshare-0.5"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "$srcdir/python2-traitlets-4.0.0"
+
+  cd "$srcdir/python2-traitlets-4.0.0"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "$srcdir/python2-path.py-7.6"
+
+  cd "$srcdir/python2-path.py-7.6"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "$srcdir/python2-simplegeneric-0.8.1"
+
+  cd "$srcdir/python2-simplegeneric-0.8.1"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
-  pushd "$srcdir/python2-ipykernel-4.0.3"
+
+  cd "$srcdir/python2-ipykernel-$_ipykv"
   #python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  popd
 
+  cd "$srcdir/ipython2-$pkgver"
   install -Dm644 docs/source/about/license_and_copyright.rst "$pkgdir/usr/share/licenses/ipython2/LICENSE"
 
   # hack to get around ipython collision
-  pushd "$pkgdir/usr/share/man/man1/"
+  cd "$pkgdir/usr/share/man/man1/"
   for i in *; do
     mv $i ${i/%.1/2.1}
   done
   find "$pkgdir/usr/bin/" -type f -regex '.*[^2]$' -delete
-  popd
 
-  pushd "examples/IPython Kernel/"
+  cd "$srcdir/ipython2-$pkgver/examples/IPython Kernel/"
   sed -i 's/ython/ython2/g' *.desktop
   sed -i 's/gnome-netstatus-idle/ipython2/' *.desktop
   install -Dm644 ipython.desktop "$pkgdir/usr/share/applications/ipython2.desktop"
   #install -Dm644 ipython-qtconsole.desktop "$pkgdir/usr/share/applications/ipython2-qtconsole.desktop"
-  popd
-  #pushd IPython/qt/console/resources/icon/
+
+  #cd "$pkgdir/usr/share/man/man1/IPython/qt/console/resources/icon/"
   #install -Dm644 IPythonConsole.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/ipython2.svg"
-  #popd
 }