[arch-commits] Commit in python2-pyface/trunk (PKGBUILD ipython_widget.patch)

2015-11-21 Thread Andrzej Giniewicz
Date: Saturday, November 21, 2015 @ 16:18:43
  Author: aginiewicz
Revision: 147321

upgpkg: python2-pyface 5.0.0-1

python2-pyface: new upstream release

Added:
  python2-pyface/trunk/ipython_widget.patch
Modified:
  python2-pyface/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 ipython_widget.patch |   19 +++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-21 14:26:16 UTC (rev 147320)
+++ PKGBUILD2015-11-21 15:18:43 UTC (rev 147321)
@@ -2,7 +2,7 @@
 # Maintainer: Andrzej Giniewicz 
 
 pkgname=python2-pyface
-pkgver=4.5.2
+pkgver=5.0.0
 pkgrel=1
 pkgdesc="Traits-capable windowing framework"
 arch=('any')
@@ -14,8 +14,10 @@
 'wxpython2.8: for wx backend')
 options=(!emptydirs)
 
-source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/pyface/archive/${pkgver}.tar.gz;)
-md5sums=('82caa9ea387192a76759176f2fc59d75')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/pyface/archive/${pkgver}.tar.gz;
+"ipython_widget.patch")
+md5sums=('74e0c8f8099d69bf6f18651b626648d8'
+ 'e2723b5e4191457de7584f0cddce7a4d')
 
 build() {
   cd "$srcdir"/pyface-$pkgver
@@ -24,6 +26,8 @@
   # (see https://github.com/enthought/pyface/issues/96)
   sed -e "s/^\(.*\)import wx$/\1import 
wxversion\n\1wxversion.select(\"2.8\")\n\1import wx/g" -i $(find . -name '*.py')
 
+  patch -p1 < ../ipython_widget.patch
+
   python2 setup.py build
 }
 

Added: ipython_widget.patch
===
--- ipython_widget.patch(rev 0)
+++ ipython_widget.patch2015-11-21 15:18:43 UTC (rev 147321)
@@ -0,0 +1,19 @@
+--- pyface-5.0.0/pyface/ipython_widget.py.orig 2015-11-21 16:13:42.171018433 
+0100
 pyface-5.0.0/pyface/ipython_widget.py  2015-11-21 16:14:03.557532935 
+0100
+@@ -13,6 +13,7 @@
+ 
#--
+ """ The implementation of an IPython shell. """
+ 
++from __future__ import absolute_import
+ 
+ # Import the toolkit specific version.
+ try:
+@@ -23,8 +24,5 @@
+ Could not load the Wx frontend for ipython.
+ You need to have ipython >= 0.9 installed to use the ipython widget.'''
+ 
+-
+-from __future__ import absolute_import
+-
+ from .toolkit import toolkit_object
+ IPythonWidget= toolkit_object('ipython_widget:IPythonWidget')


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

2015-09-25 Thread Andrzej Giniewicz
Date: Friday, September 25, 2015 @ 12:09:51
  Author: aginiewicz
Revision: 141590

upgpkg: python2-pyface 4.5.2-1

python2-pyface: new release

Modified:
  python2-pyface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-25 02:27:21 UTC (rev 141589)
+++ PKGBUILD2015-09-25 10:09:51 UTC (rev 141590)
@@ -2,7 +2,7 @@
 # Maintainer: Andrzej Giniewicz 
 
 pkgname=python2-pyface
-pkgver=4.5.1
+pkgver=4.5.2
 pkgrel=1
 pkgdesc="Traits-capable windowing framework"
 arch=('any')
@@ -15,7 +15,7 @@
 options=(!emptydirs)
 
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/pyface/archive/${pkgver}.tar.gz;)
-md5sums=('61d4adadccd570f3d854a04186efea92')
+md5sums=('82caa9ea387192a76759176f2fc59d75')
 
 build() {
   cd "$srcdir"/pyface-$pkgver


[arch-commits] Commit in python2-pyface/trunk (PKGBUILD pygments2.patch)

2015-07-28 Thread Andrzej Giniewicz
Date: Tuesday, July 28, 2015 @ 10:48:42
  Author: aginiewicz
Revision: 137542

upgpkg: python2-pyface 4.5.1-1

python2-pyface: new upstream release, patch no longer needed

Modified:
  python2-pyface/trunk/PKGBUILD
Deleted:
  python2-pyface/trunk/pygments2.patch

-+
 PKGBUILD|   15 ---
 pygments2.patch |   20 
 2 files changed, 4 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-28 08:43:07 UTC (rev 137541)
+++ PKGBUILD2015-07-28 08:48:42 UTC (rev 137542)
@@ -2,8 +2,8 @@
 # Maintainer: Andrzej Giniewicz ggi...@gmail.com
 
 pkgname=python2-pyface
-pkgver=4.5.0
-pkgrel=2
+pkgver=4.5.1
+pkgrel=1
 pkgdesc=Traits-capable windowing framework
 arch=('any')
 url=https://github.com/enthought/pyface;
@@ -14,16 +14,9 @@
 'wxpython2.8: for wx backend')
 options=(!emptydirs)
 
-source=($pkgname-$pkgver.tar.gz::https://github.com/enthought/pyface/archive/${pkgver}.tar.gz;
 pygments2.patch)
-md5sums=('05ea27821ed63a457bf5d95892ac0cf0'
- 'e874bda3e3871120c7c47bf0c632582f')
+source=($pkgname-$pkgver.tar.gz::https://github.com/enthought/pyface/archive/${pkgver}.tar.gz;)
+md5sums=('61d4adadccd570f3d854a04186efea92')
 
-prepare() {
-  cd $srcdir/pyface-$pkgver
-
-  patch -p0  ../pygments2.patch
-}
-
 build() {
   cd $srcdir/pyface-$pkgver
 

Deleted: pygments2.patch
===
--- pygments2.patch 2015-07-28 08:43:07 UTC (rev 137541)
+++ pygments2.patch 2015-07-28 08:48:42 UTC (rev 137542)
@@ -1,20 +0,0 @@
 pyface/ui/qt4/code_editor/pygments_highlighter.py.orig 2015-07-07 
21:18:51.174941435 +0200
-+++ pyface/ui/qt4/code_editor/pygments_highlighter.py  2015-07-07 
21:19:29.448031232 +0200
-@@ -33,11 +33,12 @@
- 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


[arch-commits] Commit in python2-pyface/trunk (PKGBUILD pygments2.patch)

2015-07-07 Thread Andrzej Giniewicz
Date: Tuesday, July 7, 2015 @ 21:22:12
  Author: aginiewicz
Revision: 136538

upgpkg: python2-pyface 4.5.0-2

See 
https://github.com/enthought/pyface/commit/a67056ab91fce031967a63be66b5650dd4ca142b

Added:
  python2-pyface/trunk/pygments2.patch
Modified:
  python2-pyface/trunk/PKGBUILD

-+
 PKGBUILD|   13 ++---
 pygments2.patch |   20 
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-07 18:52:59 UTC (rev 136537)
+++ PKGBUILD2015-07-07 19:22:12 UTC (rev 136538)
@@ -3,7 +3,7 @@
 
 pkgname=python2-pyface
 pkgver=4.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc=Traits-capable windowing framework
 arch=('any')
 url=https://github.com/enthought/pyface;
@@ -14,9 +14,16 @@
 'wxpython2.8: for wx backend')
 options=(!emptydirs)
 
-source=($pkgname-$pkgver.tar.gz::https://github.com/enthought/pyface/archive/${pkgver}.tar.gz;)
-md5sums=('05ea27821ed63a457bf5d95892ac0cf0')
+source=($pkgname-$pkgver.tar.gz::https://github.com/enthought/pyface/archive/${pkgver}.tar.gz;
 pygments2.patch)
+md5sums=('05ea27821ed63a457bf5d95892ac0cf0'
+ 'e874bda3e3871120c7c47bf0c632582f')
 
+prepare() {
+  cd $srcdir/pyface-$pkgver
+
+  patch -p0  ../pygments2.patch
+}
+
 build() {
   cd $srcdir/pyface-$pkgver
 

Added: pygments2.patch
===
--- pygments2.patch (rev 0)
+++ pygments2.patch 2015-07-07 19:22:12 UTC (rev 136538)
@@ -0,0 +1,20 @@
+--- pyface/ui/qt4/code_editor/pygments_highlighter.py.orig 2015-07-07 
21:18:51.174941435 +0200
 pyface/ui/qt4/code_editor/pygments_highlighter.py  2015-07-07 
21:19:29.448031232 +0200
+@@ -33,11 +33,12 @@
+ 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


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

2015-03-21 Thread Andrzej Giniewicz
Date: Saturday, March 21, 2015 @ 11:52:15
  Author: aginiewicz
Revision: 129675

upgpkg: python2-pyface 4.5.0-1

python2-pyface: new upstream release

Modified:
  python2-pyface/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-21 10:14:19 UTC (rev 129674)
+++ PKGBUILD2015-03-21 10:52:15 UTC (rev 129675)
@@ -2,8 +2,8 @@
 # Maintainer: Andrzej Giniewicz ggi...@gmail.com
 
 pkgname=python2-pyface
-pkgver=4.4.0
-pkgrel=2
+pkgver=4.5.0
+pkgrel=1
 pkgdesc=Traits-capable windowing framework
 arch=('any')
 url=https://github.com/enthought/pyface;
@@ -10,17 +10,18 @@
 license=('BSD')
 depends=('python2-traits')
 makedepends=('python2-setuptools')
-optdepends=('python2-pyqt: for Qt backend'
+optdepends=('python2-pyqt4: for Qt backend'
 'wxpython2.8: for wx backend')
 options=(!emptydirs)
 
 
source=($pkgname-$pkgver.tar.gz::https://github.com/enthought/pyface/archive/${pkgver}.tar.gz;)
-md5sums=('4639b4242c2e3219dadb0d740e8af338')
+md5sums=('05ea27821ed63a457bf5d95892ac0cf0')
 
 build() {
   cd $srcdir/pyface-$pkgver
 
   # force selection of wxpython 2.8
+  # (see https://github.com/enthought/pyface/issues/96)
   sed -e s/^\(.*\)import wx$/\1import 
wxversion\n\1wxversion.select(\2.8\)\n\1import wx/g -i $(find . -name '*.py')
 
   python2 setup.py build


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

2014-01-31 Thread Andrzej Giniewicz
Date: Friday, January 31, 2014 @ 13:26:53
  Author: aginiewicz
Revision: 105088

upgpkg: python2-pyface 4.4.0-2

force python2-pyface to wxpython 2.8 instead of 3.0

Modified:
  python2-pyface/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-31 12:10:31 UTC (rev 105087)
+++ PKGBUILD2014-01-31 12:26:53 UTC (rev 105088)
@@ -3,7 +3,7 @@
 
 pkgname=python2-pyface
 pkgver=4.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc=Traits-capable windowing framework
 arch=('any')
 url=https://github.com/enthought/pyface;
@@ -11,7 +11,7 @@
 depends=('python2-traits')
 makedepends=('python2-setuptools')
 optdepends=('python2-pyqt: for Qt backend'
-'wxpython: for wx backend')
+'wxpython2.8: for wx backend')
 options=(!emptydirs)
 
 
source=($pkgname-$pkgver.tar.gz::https://github.com/enthought/pyface/archive/${pkgver}.tar.gz;)
@@ -20,6 +20,9 @@
 build() {
   cd $srcdir/pyface-$pkgver
 
+  # force selection of wxpython 2.8
+  sed -e s/^\(.*\)import wx$/\1import 
wxversion\n\1wxversion.select(\2.8\)\n\1import wx/g -i $(find . -name '*.py')
+
   python2 setup.py build
 }
 



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

2014-01-30 Thread Andrzej Giniewicz
Date: Thursday, January 30, 2014 @ 11:38:00
  Author: aginiewicz
Revision: 105026

upgpkg: python2-pyface 4.4.0-1

python2-pyface: update to new version

Modified:
  python2-pyface/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2014-01-30 10:34:22 UTC (rev 105025)
+++ PKGBUILD2014-01-30 10:38:00 UTC (rev 105026)
@@ -2,8 +2,8 @@
 # Maintainer: Andrzej Giniewicz ggi...@gmail.com
 
 pkgname=python2-pyface
-pkgver=4.3.0
-pkgrel=2
+pkgver=4.4.0
+pkgrel=1
 pkgdesc=Traits-capable windowing framework
 arch=('any')
 url=https://github.com/enthought/pyface;
@@ -15,7 +15,7 @@
 options=(!emptydirs)
 
 
source=($pkgname-$pkgver.tar.gz::https://github.com/enthought/pyface/archive/${pkgver}.tar.gz;)
-md5sums=('0ebc97074dc8d7170c03048108055759')
+md5sums=('4639b4242c2e3219dadb0d740e8af338')
 
 build() {
   cd $srcdir/pyface-$pkgver



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

2013-08-19 Thread Ángel Velásquez
Date: Monday, August 19, 2013 @ 12:24:36
  Author: angvp
Revision: 96020

upgpkg: python2-pyface 4.3.0-2

Rebuild against setuptools

Modified:
  python2-pyface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-19 10:23:03 UTC (rev 96019)
+++ PKGBUILD2013-08-19 10:24:36 UTC (rev 96020)
@@ -3,13 +3,13 @@
 
 pkgname=python2-pyface
 pkgver=4.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc=Traits-capable windowing framework
 arch=('any')
 url=https://github.com/enthought/pyface;
 license=('BSD')
 depends=('python2-traits')
-makedepends=('python2-distribute')
+makedepends=('python2-setuptools')
 optdepends=('python2-pyqt: for Qt backend'
 'wxpython: for wx backend')
 options=(!emptydirs)



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

2013-04-14 Thread Andrzej Giniewicz
Date: Sunday, April 14, 2013 @ 21:41:26
  Author: aginiewicz
Revision: 88229

upgpkg: python2-pyface 4.3.0-1

new release

Modified:
  python2-pyface/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-04-14 19:37:35 UTC (rev 88228)
+++ PKGBUILD2013-04-14 19:41:26 UTC (rev 88229)
@@ -2,12 +2,11 @@
 # Maintainer: Andrzej Giniewicz ggi...@gmail.com
 
 pkgname=python2-pyface
-pkgver=4.2.0
-_githubtag=1656f42
-pkgrel=2
+pkgver=4.3.0
+pkgrel=1
 pkgdesc=Traits-capable windowing framework
 arch=('any')
-url=http://code.enthought.com/projects/traits_ui/;
+url=https://github.com/enthought/pyface;
 license=('BSD')
 depends=('python2-traits')
 makedepends=('python2-distribute')
@@ -15,17 +14,17 @@
 'wxpython: for wx backend')
 options=(!emptydirs)
 
-source=($pkgname-$pkgver.tar.gz::https://github.com/enthought/pyface/tarball/${pkgver};)
-md5sums=('02d27c19b0c96ece69574622ef28a354')
+source=($pkgname-$pkgver.tar.gz::https://github.com/enthought/pyface/archive/${pkgver}.tar.gz;)
+md5sums=('0ebc97074dc8d7170c03048108055759')
 
 build() {
-  cd $srcdir/enthought-pyface-${_githubtag}
+  cd $srcdir/pyface-$pkgver
 
   python2 setup.py build
 }
 
 package() {
-  cd $srcdir/enthought-pyface-${_githubtag}
+  cd $srcdir/pyface-$pkgver
 
   python2 setup.py install --root=$pkgdir/ --optimize=1