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

[Kyle Keen]

    Date: Thursday, April 21, 2016 @ 17:26:14
  Author: kkeen
Revision: 171524

upgpkg: ipython 4.2.0-1

Modified:
  ipython/trunk/PKGBUILD

----------+
 PKGBUILD |   36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-21 15:06:08 UTC (rev 171523)
+++ PKGBUILD	2016-04-21 15:26:14 UTC (rev 171524)
@@ -7,8 +7,8 @@
 
 pkgbase=ipython
 pkgname=(ipython ipython2)
-pkgver=4.1.2
-pkgrel=2
+pkgver=4.2.0
+pkgrel=1
 pkgdesc="An enhanced Interactive Python shell."
 arch=('any')
 url="http://ipython.org"
@@ -20,22 +20,26 @@
 
 # some of these will update rapidly, others never
 # so _vars will be phased in as new updates are released
-_traitv=4.1.0
+_traitv=4.2.1
+_psharev=0.7.2
 
-source=("https://pypi.python.org/packages/source/i/ipython/$pkgbase-$pkgver.tar.gz"
+source=("ipython-$pkgver.tgz::https://github.com/ipython/ipython/archive/$pkgver.tar.gz"
         "https://pypi.python.org/packages/source/t/traitlets/traitlets-$_traitv.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"
+        "https://pypi.python.org/packages/source/p/pickleshare/pickleshare-$_psharev.tar.gz"
         "https://pypi.python.org/packages/source/s/simplegeneric/simplegeneric-0.8.1.zip"
+        "https://pypi.python.org/packages/source/b/backports.shutil_get_terminal_size/backports.shutil_get_terminal_size-1.0.0.tar.gz"
         "http://www.packal.org/sites/default/files/public/styles/icon_large/public/workflow-files/nkeimipynbworkflow/icon/icon.png")
-md5sums=('28c9ebd1abfb9b4a07cb87005f285edd'
-         '2ebf5e11a19f82f25395b4a793097080'
+md5sums=('9432d4758961501bf5f33adde08a9e6e'
+         'f9cc1ad00a793a65d7bc88d69ee65920'
          '9a8afbe0978adbcbfcb3b35b2d015a56'
-         '25337740507cb855ad58bfcf60f7710e'
+         '29d74cde0255546b6b2e1b48a0b31a54'
          'f9c1fab00fd981be588fc32759f474e3'
+         '03267762480bd86b50580dc19dff3c66'
          '2901d65f1b1fe354e72850085cd1c072')
 
 # With 4.0 many previously bundled external libraries are no longer bundled
+# Most are written/maintained/used only by the ipython project
 # Since there are so many and they are so small, they get re-bundled here
 # Break them out if any non-ipython package ends up needing these
 
@@ -46,6 +50,7 @@
 # (still required for now though, but drop at first chance)
 # pickleshare (depends on path.py)
 # simplegeneric (so old that it only comes in .zip and still refers to the cheeseshop)
+# shutil_get_terminal_size ?
 
 # confirm that an update does not break sage?
 
@@ -53,9 +58,13 @@
   cd "$srcdir"
   cp -r ipython-$pkgver        ipython2-$pkgver
   cp -r ipython_genutils-0.1.0 ipython2_genutils-0.1.0
-  cp -r pickleshare-0.5        python2-pickleshare-0.5
+  cp -r pickleshare-$_psharev  python2-pickleshare-$_psharev
   cp -r traitlets-$_traitv     python2-traitlets-$_traitv
   cp -r simplegeneric-0.8.1    python2-simplegeneric-0.8.1
+
+  # python 3.5 does not need a 3.3 backport hack
+  cd "$srcdir/ipython-$pkgver"
+  sed -i 's|backports.shutil_get_terminal_size|shutil|' IPython/utils/terminal.py
 }
 
 build() {
@@ -73,7 +82,7 @@
   cd "$srcdir/ipython_genutils-0.1.0"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  cd "$srcdir/pickleshare-0.5"
+  cd "$srcdir/pickleshare-$_psharev"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
   cd "$srcdir/traitlets-$_traitv"
@@ -99,7 +108,7 @@
 
 package_ipython2() {
   pkgdesc="An enhanced Interactive Python2 shell."
-  depends=('python2' 'python2-decorator' 'python2-pexpect' 'sqlite' 'python2-setuptools' 'python2-path')
+  depends=('python2' 'python2-decorator' 'python2-pexpect' 'sqlite' 'python2-setuptools' 'python2-path' 'python2-pathlib')
   optdepends=("wxpython: needed for ipython2 --gui=wx"
               "python2-nose: for IPython's test suite")
   # "wxpython: needed for ipython2 --gui=wx"   does this still work?
@@ -112,7 +121,7 @@
   cd "$srcdir/ipython2_genutils-0.1.0"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  cd "$srcdir/python2-pickleshare-0.5"
+  cd "$srcdir/python2-pickleshare-$_psharev"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
   cd "$srcdir/python2-traitlets-$_traitv"
@@ -121,6 +130,9 @@
   cd "$srcdir/python2-simplegeneric-0.8.1"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
+  cd "$srcdir/backports.shutil_get_terminal_size-1.0.0"
+  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
+
   cd "$srcdir/ipython2-$pkgver"
   install -Dm644 docs/source/about/license_and_copyright.rst "$pkgdir/usr/share/licenses/ipython2/LICENSE"