[arch-commits] Commit in ipython/repos/community-any (3 files)

Kyle Keen kkeen at archlinux.org
Mon Nov 10 10:21:38 UTC 2014


    Date: Monday, November 10, 2014 @ 11:21:37
  Author: kkeen
Revision: 122292

archrelease: copy trunk to community-any

Added:
  ipython/repos/community-any/PKGBUILD
    (from rev 122291, ipython/trunk/PKGBUILD)
  ipython/repos/community-any/pygments-monkeypatch.diff
    (from rev 122291, ipython/trunk/pygments-monkeypatch.diff)
Deleted:
  ipython/repos/community-any/PKGBUILD

---------------------------+
 PKGBUILD                  |  195 ++++++++++++++++++++++----------------------
 pygments-monkeypatch.diff |   22 ++++
 2 files changed, 123 insertions(+), 94 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-10 10:20:34 UTC (rev 122291)
+++ PKGBUILD	2014-11-10 10:21:37 UTC (rev 122292)
@@ -1,94 +0,0 @@
-# $Id$
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-# Contributor: PepeSmith
-# Contributor: Aron Asor <aronasorman at gmail.com>
-# Contributor: Chris Brannon <chris at the-brannons.com>
-# Contributor : Douglas Soares de Andrade <dsa at aur.archlinux.org>
-
-pkgbase=ipython 
-pkgname=(ipython ipython2)
-pkgver=2.3.0
-pkgrel=1
-pkgdesc="An enhanced Interactive Python shell."
-arch=('any')
-url="http://ipython.org"
-license=('BSD')
-depends=('python' 'sqlite' 'python-setuptools')
-makedepends=('python-setuptools' 'python2-setuptools' 'sqlite')
-optdepends=("wxpython: needed for ipythonx and ipython-wx"
-            "python-twisted: networking-related tasks"
-            "python-nose: if you want to run IPython's test suite"
-            "python-pyqt4: for ipython qtconsole"
-            "python-sip: for ipython qtconsole"
-            "python-pygments: for ipython qtconsole"
-            "python-pyzmq: for ipython notebook and ipython qtconcole"
-            "python-tornado: for ipython notebook"
-            "python-jinja: for ipython notebook"
-            "haskell-pandoc: ipython notebook conversion")
-#source=("http://archive.ipython.org/release/$pkgver/ipython-$pkgver.tar.gz")
-source=("https://pypi.python.org/packages/source/i/ipython/$pkgbase-$pkgver.tar.gz")
-md5sums=('222eecd3a8299c0119c56954c79e4d0f')
-
-build() {
-  cd "$srcdir"
-  cp -r ipython-$pkgver ipython2-$pkgver
-}
-
-package_ipython() {
-  provides=('ipython3')
-  replaces=('ipython3')
-  cd "$srcdir/ipython-$pkgver"
-
-  # see https://github.com/ipython/ipython/issues/2057
-  #export LC_ALL=en_US.UTF-8
-  python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  find "$pkgdir/" -name '*.pyc' -delete
-  find "$pkgdir/" -type d -empty -delete
-
-  install -Dm644 docs/source/about/license_and_copyright.rst "$pkgdir/usr/share/licenses/ipython/LICENSE"
-
-  cd "$srcdir/ipython-$pkgver/examples/IPython Kernel/"
-  install -Dm644 ipython.desktop "$pkgdir/usr/share/applications/ipython.desktop"
-  install -Dm644 ipython-qtconsole.desktop "$pkgdir/usr/share/applications/ipython-qtconsole.desktop"
-}
-
-package_ipython2() {
-  pkgdesc="An enhanced Interactive Python2 shell."
-  depends=('python2' 'sqlite' 'python2-setuptools')
-  optdepends=("wxpython: needed for ipythonx and ipython-wx"
-              "python2-twisted: networking-related tasks"
-              "python2-foolscap: for IPython's parallel computing features"
-              "python2-pexpect: for irunner"
-              "python2-nose: if you want to run IPython's test suite"
-              "python2-pyqt4: for ipython qtconsole"
-              "python2-sip: for ipython qtconsole"
-              "python2-pygments: for ipython qtconsole"
-              "python2-pyzmq: for ipython notebook and ipython qtconsole"
-              "python2-tornado: for ipython notebook"
-              "python2-jinja: for ipython notebook"
-              "haskell-pandoc: ipython notebook conversion")
-
-  cd "$srcdir/ipython2-$pkgver"
-
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
-  rm -rf "$pkgdir/usr/share/doc"
-  find "$pkgdir" -name '*.py' -print0 | xargs -0 \
-    sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \
-    -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
-  find "$pkgdir/" -name '*.pyc' -delete
-
-  install -Dm644 docs/source/about/license_and_copyright.rst "$pkgdir/usr/share/licenses/ipython2/LICENSE"
-
-  # hack to get around ipython collision
-  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
-
-  cd "$srcdir/ipython-$pkgver/examples/IPython Kernel/"
-  sed -i 's/ython/ython2/g' *.desktop
-  install -Dm644 ipython.desktop "$pkgdir/usr/share/applications/ipython2.desktop"
-  install -Dm644 ipython-qtconsole.desktop "$pkgdir/usr/share/applications/ipython2-qtconsole.desktop"
-}
-

Copied: ipython/repos/community-any/PKGBUILD (from rev 122291, ipython/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-11-10 10:21:37 UTC (rev 122292)
@@ -0,0 +1,101 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: PepeSmith
+# Contributor: Aron Asor <aronasorman at gmail.com>
+# Contributor: Chris Brannon <chris at the-brannons.com>
+# Contributor : Douglas Soares de Andrade <dsa at aur.archlinux.org>
+
+pkgbase=ipython 
+pkgname=(ipython ipython2)
+pkgver=2.3.0
+pkgrel=2
+pkgdesc="An enhanced Interactive Python shell."
+arch=('any')
+url="http://ipython.org"
+license=('BSD')
+depends=('python' 'sqlite' 'python-setuptools')
+makedepends=('python-setuptools' 'python2-setuptools' 'sqlite')
+optdepends=("wxpython: needed for ipythonx and ipython-wx"
+            "python-twisted: networking-related tasks"
+            "python-nose: if you want to run IPython's test suite"
+            "python-pyqt4: for ipython qtconsole"
+            "python-sip: for ipython qtconsole"
+            "python-pygments: for ipython qtconsole"
+            "python-pyzmq: for ipython notebook and ipython qtconcole"
+            "python-tornado: for ipython notebook"
+            "python-jinja: for ipython notebook"
+            "haskell-pandoc: ipython notebook conversion")
+#source=("http://archive.ipython.org/release/$pkgver/ipython-$pkgver.tar.gz")
+source=("https://pypi.python.org/packages/source/i/ipython/$pkgbase-$pkgver.tar.gz"
+        "pygments-monkeypatch.diff")
+md5sums=('222eecd3a8299c0119c56954c79e4d0f'
+         'a8e3ed58e2b3f4198534cbecd03a7ade')
+
+build() {
+  cd "$srcdir"
+  pushd ipython-$pkgver
+  # this is already in trunk and should only apply to 2.3.0
+  # https://github.com/ipython/ipython/issues/6877
+  patch -p1 -i ../pygments-monkeypatch.diff
+  popd
+  cp -r ipython-$pkgver ipython2-$pkgver
+}
+
+package_ipython() {
+  provides=('ipython3')
+  replaces=('ipython3')
+  cd "$srcdir/ipython-$pkgver"
+
+  # see https://github.com/ipython/ipython/issues/2057
+  #export LC_ALL=en_US.UTF-8
+  python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
+  find "$pkgdir/" -name '*.pyc' -delete
+  find "$pkgdir/" -type d -empty -delete
+
+  install -Dm644 docs/source/about/license_and_copyright.rst "$pkgdir/usr/share/licenses/ipython/LICENSE"
+
+  cd "$srcdir/ipython-$pkgver/examples/IPython Kernel/"
+  install -Dm644 ipython.desktop "$pkgdir/usr/share/applications/ipython.desktop"
+  install -Dm644 ipython-qtconsole.desktop "$pkgdir/usr/share/applications/ipython-qtconsole.desktop"
+}
+
+package_ipython2() {
+  pkgdesc="An enhanced Interactive Python2 shell."
+  depends=('python2' 'sqlite' 'python2-setuptools')
+  optdepends=("wxpython: needed for ipythonx and ipython-wx"
+              "python2-twisted: networking-related tasks"
+              "python2-foolscap: for IPython's parallel computing features"
+              "python2-pexpect: for irunner"
+              "python2-nose: if you want to run IPython's test suite"
+              "python2-pyqt4: for ipython qtconsole"
+              "python2-sip: for ipython qtconsole"
+              "python2-pygments: for ipython qtconsole"
+              "python2-pyzmq: for ipython notebook and ipython qtconsole"
+              "python2-tornado: for ipython notebook"
+              "python2-jinja: for ipython notebook"
+              "haskell-pandoc: ipython notebook conversion")
+
+  cd "$srcdir/ipython2-$pkgver"
+
+  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
+  rm -rf "$pkgdir/usr/share/doc"
+  find "$pkgdir" -name '*.py' -print0 | xargs -0 \
+    sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \
+    -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
+  find "$pkgdir/" -name '*.pyc' -delete
+
+  install -Dm644 docs/source/about/license_and_copyright.rst "$pkgdir/usr/share/licenses/ipython2/LICENSE"
+
+  # hack to get around ipython collision
+  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
+
+  cd "$srcdir/ipython-$pkgver/examples/IPython Kernel/"
+  sed -i 's/ython/ython2/g' *.desktop
+  install -Dm644 ipython.desktop "$pkgdir/usr/share/applications/ipython2.desktop"
+  install -Dm644 ipython-qtconsole.desktop "$pkgdir/usr/share/applications/ipython2-qtconsole.desktop"
+}
+

Copied: ipython/repos/community-any/pygments-monkeypatch.diff (from rev 122291, ipython/trunk/pygments-monkeypatch.diff)
===================================================================
--- pygments-monkeypatch.diff	                        (rev 0)
+++ pygments-monkeypatch.diff	2014-11-10 10:21:37 UTC (rev 122292)
@@ -0,0 +1,22 @@
+diff --git a/IPython/qt/console/pygments_highlighter.py b/IPython/qt/console/pygments_highlighter.py
+index 4044be7..402938f 100644
+--- a/IPython/qt/console/pygments_highlighter.py
++++ b/IPython/qt/console/pygments_highlighter.py
+@@ -24,11 +24,12 @@ def get_tokens_unprocessed(self, text, stack=('root',)):
+         for rexmatch, action, new_state in statetokens:
+             m = rexmatch(text, pos)
+             if m:
+-                if type(action) is _TokenType:
+-                    yield pos, action, m.group()
+-                else:
+-                    for item in action(self, m):
+-                        yield item
++                if action is not None:
++                    if type(action) is _TokenType:
++                        yield pos, action, m.group()
++                    else:
++                        for item in action(self, m):
++                            yield item
+                 pos = m.end()
+                 if new_state is not None:
+                     # state transition


More information about the arch-commits mailing list