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

2020-11-12 Thread Felix Yan via arch-commits 
Date: Thursday, November 12, 2020 @ 10:22:47
  Author: felixonmars
Revision: 751540

upgpkg: python-wxpython 4.0.7.2-5: Python 3.9 rebuild

Modified:
  python-wxpython/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-12 10:21:57 UTC (rev 751539)
+++ PKGBUILD2020-11-12 10:22:47 UTC (rev 751540)
@@ -7,7 +7,7 @@
 pkgver=4.0.7.2
 _pkgver="${pkgver%.*}"
 _post="${pkgver##*.}"
-pkgrel=4
+pkgrel=5
 pkgdesc='Cross-platform GUI toolkit'
 arch=('x86_64')
 license=('custom:wxWindows')

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

2020-11-10 Thread Eli Schwartz via arch-commits 
Date: Wednesday, November 11, 2020 @ 02:47:22
  Author: eschwartz
Revision: 749946

upgpkg: python-wxpython 4.0.7.2-4: python 3.9 rebuild

Modified:
  python-wxpython/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-11 02:34:09 UTC (rev 749945)
+++ PKGBUILD2020-11-11 02:47:22 UTC (rev 749946)
@@ -7,7 +7,7 @@
 pkgver=4.0.7.2
 _pkgver="${pkgver%.*}"
 _post="${pkgver##*.}"
-pkgrel=3
+pkgrel=4
 pkgdesc='Cross-platform GUI toolkit'
 arch=('x86_64')
 license=('custom:wxWindows')

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

2020-11-10 Thread Eli Schwartz via arch-commits 
Date: Wednesday, November 11, 2020 @ 02:28:31
  Author: eschwartz
Revision: 749942

upgpkg: python-wxpython 4.0.7.2-3: remove unneeded pathlib2 makedep, fix tests

pathlib2 is never used, on python3 it uses pathlib and on python2 it vendors
pathlib2 for the build. We only care about the former.


Tests are bonkers, the builtin test runner reports pytest output but
unconditionally return success, make this explicit by the PKGBUILD pattern
|| echo "warning goes here"

Also the tests never ran due to passing pytest --boxed, but this needed
pytest-xdist and is now a no-op, because the behavior is now in pytest-forked
as --forked. Nevertheless, it makes for clearer errors if we get segfaults, so
reimplement this properly.

Modified:
  python-wxpython/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2020-11-11 02:08:20 UTC (rev 749941)
+++ PKGBUILD2020-11-11 02:28:31 UTC (rev 749942)
@@ -7,7 +7,7 @@
 pkgver=4.0.7.2
 _pkgver="${pkgver%.*}"
 _post="${pkgver##*.}"
-pkgrel=2
+pkgrel=3
 pkgdesc='Cross-platform GUI toolkit'
 arch=('x86_64')
 license=('custom:wxWindows')
@@ -14,8 +14,8 @@
 url='https://www.wxpython.org'
 depends=('wxgtk3' 'python-six')
 optdepends=('python-pypubsub: Alternative to the deprecated wx.lib.pubsub API')
-makedepends=('mesa' 'glu' 'webkit2gtk' 'python-pathlib2' 'python-requests' 
'python-setuptools')
-checkdepends=('xorg-server-xvfb' 'python-pytest' 'python-numpy')
+makedepends=('mesa' 'glu' 'webkit2gtk' 'python-requests' 'python-setuptools')
+checkdepends=('xorg-server-xvfb' 'python-pytest-forked' 'python-numpy')
 
source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-$_pkgver.post$_post.tar.gz";)
 
sha512sums=('7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4')
 
@@ -32,7 +32,8 @@
 check() {
   cd "$_pkgname-$_pkgver.post$_post"
 
-  xvfb-run python build.py test
+  # there are segfaulting tests so --forked ensures we get sensible results
+  PYTHONPATH=$PWD xvfb-run pytest --forked unittests || echo "==> WARNING: 
tests usually fail randomly"
 }
 
 package() {

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

2020-02-03 Thread Morten Linderud via arch-commits 
Date: Monday, February 3, 2020 @ 21:40:29
  Author: foxboron
Revision: 561999

upgpkg: python-wxpython 4.0.7.2-1

Modified:
  python-wxpython/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2020-02-03 21:32:40 UTC (rev 561998)
+++ PKGBUILD2020-02-03 21:40:29 UTC (rev 561999)
@@ -4,7 +4,9 @@
 
 pkgname=python-wxpython
 _pkgname=wxPython
-pkgver=4.0.7
+pkgver=4.0.7.2
+_pkgver="${pkgver%.*}"
+_post="${pkgver##*.}"
 pkgrel=1
 pkgdesc='Cross-platform GUI toolkit'
 arch=('x86_64')
@@ -14,27 +16,27 @@
 optdepends=('python-pypubsub: Alternative to the deprecated wx.lib.pubsub API')
 makedepends=('mesa' 'glu' 'webkit2gtk' 'python-pathlib2' 'python-requests' 
'python-setuptools')
 checkdepends=('xorg-server-xvfb' 'python-pytest' 'python-numpy')
-source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-$pkgver.post2.tar.gz";)
+source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-$_pkgver.post$_post.tar.gz";)
 
sha512sums=('7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4')
 
 prepare() {
-  sed -i "s|WX_CONFIG = 'wx-config'|WX_CONFIG = 'wx-config-gtk3'|" 
$_pkgname-$pkgver.post2/build.py
+  sed -i "s|WX_CONFIG = 'wx-config'|WX_CONFIG = 'wx-config-gtk3'|" 
$_pkgname-$_pkgver.post$_post/build.py
 }
 
 build() {
-  cd "$_pkgname-$pkgver.post2"
+  cd "$_pkgname-$_pkgver.post$_post"
 
   python build.py build --use_syswx --release
 }
 
 check() {
-  cd "$_pkgname-$pkgver.post2"
+  cd "$_pkgname-$_pkgver.post$_post"
 
   xvfb-run python build.py test
 }
 
 package() {
-  cd "$_pkgname-$pkgver.post2"
+  cd "$_pkgname-$_pkgver.post$_post"
 
   python build.py install --destdir="$pkgdir"

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

2019-11-21 Thread Morten Linderud via arch-commits 
Date: Thursday, November 21, 2019 @ 22:38:02
  Author: foxboron
Revision: 531437

upgpkg: python-wxpython 4.0.7-1

Modified:
  python-wxpython/trunk/PKGBUILD

--+
 PKGBUILD |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-21 22:37:15 UTC (rev 531436)
+++ PKGBUILD2019-11-21 22:38:02 UTC (rev 531437)
@@ -1,10 +1,11 @@
 # Maintainer: Filipe Laíns (FFY00) 
+# Maintainer: Morten Linderud 
 # Contributor: Eric Bélanger 
 
 pkgname=python-wxpython
 _pkgname=wxPython
-pkgver=4.0.6
-pkgrel=3
+pkgver=4.0.7
+pkgrel=1
 pkgdesc='Cross-platform GUI toolkit'
 arch=('x86_64')
 license=('custom:wxWindows')
@@ -13,27 +14,27 @@
 optdepends=('python-pypubsub: Alternative to the deprecated wx.lib.pubsub API')
 makedepends=('mesa' 'glu' 'webkit2gtk' 'python-pathlib2' 'python-requests' 
'python-setuptools')
 checkdepends=('xorg-server-xvfb' 'python-pytest' 'python-numpy')
-source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-$pkgver.tar.gz";)
-sha512sums=('bfe799e1a0987cb57f2e31199cdb522471aaa08bb3b642fdf4130f4219b81487d4b6252f7a8afd3af7cdaeef2e992cecfc581e97d8b42307a4e0a8c9009db301')
+source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-$pkgver.post2.tar.gz";)
+sha512sums=('7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4')
 
 prepare() {
-  sed -i "s|WX_CONFIG = 'wx-config'|WX_CONFIG = 'wx-config-gtk3'|" 
$_pkgname-$pkgver/build.py
+  sed -i "s|WX_CONFIG = 'wx-config'|WX_CONFIG = 'wx-config-gtk3'|" 
$_pkgname-$pkgver.post2/build.py
 }
 
 build() {
-  cd $_pkgname-$pkgver
+  cd "$_pkgname-$pkgver.post2"
 
   python build.py build --use_syswx --release
 }
 
 check() {
-  cd $_pkgname-$pkgver
+  cd "$_pkgname-$pkgver.post2"
 
   xvfb-run python build.py test
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd "$_pkgname-$pkgver.post2"
 
   python build.py install --destdir="$pkgdir"

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

2019-11-03 Thread Evangelos Foutras via arch-commits 
Date: Sunday, November 3, 2019 @ 21:37:14
  Author: foutrelis
Revision: 522703

Python 3.8 rebuild

Modified:
  python-wxpython/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-03 21:29:58 UTC (rev 522702)
+++ PKGBUILD2019-11-03 21:37:14 UTC (rev 522703)
@@ -4,7 +4,7 @@
 pkgname=python-wxpython
 _pkgname=wxPython
 pkgver=4.0.6
-pkgrel=2
+pkgrel=3
 pkgdesc='Cross-platform GUI toolkit'
 arch=('x86_64')
 license=('custom:wxWindows')

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

2019-10-25 Thread Felix Yan via arch-commits 
Date: Saturday, October 26, 2019 @ 06:49:26
  Author: felixonmars
Revision: 520321

Python 3.8 rebuild

Modified:
  python-wxpython/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-26 06:48:31 UTC (rev 520320)
+++ PKGBUILD2019-10-26 06:49:26 UTC (rev 520321)
@@ -4,7 +4,7 @@
 pkgname=python-wxpython
 _pkgname=wxPython
 pkgver=4.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Cross-platform GUI toolkit'
 arch=('x86_64')
 license=('custom:wxWindows')

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

2019-06-02 Thread Morten Linderud via arch-commits 
Date: Sunday, June 2, 2019 @ 14:08:25
  Author: foxboron
Revision: 476612

upgpkg: python-wxpython 4.0.6-1

Modified:
  python-wxpython/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-06-02 13:50:22 UTC (rev 476611)
+++ PKGBUILD2019-06-02 14:08:25 UTC (rev 476612)
@@ -3,8 +3,8 @@
 
 pkgname=python-wxpython
 _pkgname=wxPython
-pkgver=4.0.5
-pkgrel=3
+pkgver=4.0.6
+pkgrel=1
 pkgdesc='Cross-platform GUI toolkit'
 arch=('x86_64')
 license=('custom:wxWindows')
@@ -14,7 +14,7 @@
 makedepends=('mesa' 'glu' 'webkit2gtk' 'python-pathlib2' 'python-requests' 
'python-setuptools')
 checkdepends=('xorg-server-xvfb' 'python-pytest' 'python-numpy')
 
source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-$pkgver.tar.gz";)
-sha512sums=('9ae419b243da061b467428872d36d6e996c23844ffd040b525014dae0821b8507911854af89056680aaf7207755ded79ce51322a4582c14e11aff5fbdf2f8ed8')
+sha512sums=('bfe799e1a0987cb57f2e31199cdb522471aaa08bb3b642fdf4130f4219b81487d4b6252f7a8afd3af7cdaeef2e992cecfc581e97d8b42307a4e0a8c9009db301')
 
 prepare() {
   sed -i "s|WX_CONFIG = 'wx-config'|WX_CONFIG = 'wx-config-gtk3'|" 
$_pkgname-$pkgver/build.py

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

2019-05-22 Thread Filipe Laíns via arch-commits 
Date: Wednesday, May 22, 2019 @ 19:47:05
  Author: ffy00
Revision: 468667

upgpkg: python-wxpython 4.0.5-3

- Fix wrong permissions for serveral files

(sorry, I am really stupid)

Modified:
  python-wxpython/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-05-22 19:13:22 UTC (rev 468666)
+++ PKGBUILD2019-05-22 19:47:05 UTC (rev 468667)
@@ -1,10 +1,11 @@
-# Maintainer: Eric Bélanger 
+# Maintainer: Filipe Laíns (FFY00) 
+# Contributor: Eric Bélanger 
 
 pkgname=python-wxpython
 _pkgname=wxPython
 pkgver=4.0.5
-pkgrel=2
-pkgdesc='Phoenix wxWidgets GUI toolkit for Python'
+pkgrel=3
+pkgdesc='Cross-platform GUI toolkit'
 arch=('x86_64')
 license=('custom:wxWindows')
 url='https://www.wxpython.org'
@@ -37,6 +38,6 @@
   python build.py install --destdir="$pkgdir"
 
   install -Dm 644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
-#  find "$pkgdir/usr/lib" -type f | xargs chmod 644
+  find "$pkgdir/usr/lib" -type f | xargs chmod 644
 }

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

2019-05-22 Thread Filipe Laíns via arch-commits 
Date: Wednesday, May 22, 2019 @ 17:15:25
  Author: ffy00
Revision: 468612

upgpkg: python-wxpython 4.0.5-2

- Remove wrong dependency (python-sphinx)

Documentation is not being generated as it is only avaliable if we are using 
the wxWidgets backend. We are using GTK.

Modified:
  python-wxpython/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-05-22 17:08:16 UTC (rev 468611)
+++ PKGBUILD2019-05-22 17:15:25 UTC (rev 468612)
@@ -3,16 +3,16 @@
 pkgname=python-wxpython
 _pkgname=wxPython
 pkgver=4.0.5
-pkgrel=1
-pkgdesc="Phoenix wxWidgets GUI toolkit for Python"
+pkgrel=2
+pkgdesc='Phoenix wxWidgets GUI toolkit for Python'
 arch=('x86_64')
 license=('custom:wxWindows')
-url="https://www.wxpython.org";
-depends=('wxgtk3' 'python-six' 'python-sphinx')
+url='https://www.wxpython.org'
+depends=('wxgtk3' 'python-six')
 optdepends=('python-pypubsub: Alternative to the deprecated wx.lib.pubsub API')
 makedepends=('mesa' 'glu' 'webkit2gtk' 'python-pathlib2' 'python-requests' 
'python-setuptools')
 checkdepends=('xorg-server-xvfb' 'python-pytest' 'python-numpy')
-source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-${pkgver}.tar.gz";)
+source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-$pkgver.tar.gz";)
 
sha512sums=('9ae419b243da061b467428872d36d6e996c23844ffd040b525014dae0821b8507911854af89056680aaf7207755ded79ce51322a4582c14e11aff5fbdf2f8ed8')
 
 prepare() {
@@ -37,6 +37,6 @@
   python build.py install --destdir="$pkgdir"
 
   install -Dm 644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
-  find "$pkgdir/usr/lib" -type f | xargs chmod 644
+#  find "$pkgdir/usr/lib" -type f | xargs chmod 644
 }

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

2019-05-21 Thread Filipe Laíns via arch-commits 
Date: Tuesday, May 21, 2019 @ 09:03:52
  Author: ffy00
Revision: 468174

upgpkg: python-wxpython 4.0.5-1

Modified:
  python-wxpython/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-05-21 09:00:29 UTC (rev 468173)
+++ PKGBUILD2019-05-21 09:03:52 UTC (rev 468174)
@@ -2,17 +2,18 @@
 
 pkgname=python-wxpython
 _pkgname=wxPython
-pkgver=4.0.4
-pkgrel=5
+pkgver=4.0.5
+pkgrel=1
 pkgdesc="Phoenix wxWidgets GUI toolkit for Python"
 arch=('x86_64')
 license=('custom:wxWindows')
 url="https://www.wxpython.org";
-depends=('wxgtk3' 'python-setuptools' 'python-six' 'python-pypubsub')
-makedepends=('mesa' 'glu' 'webkit2gtk')
+depends=('wxgtk3' 'python-six' 'python-sphinx')
+optdepends=('python-pypubsub: Alternative to the deprecated wx.lib.pubsub API')
+makedepends=('mesa' 'glu' 'webkit2gtk' 'python-pathlib2' 'python-requests' 
'python-setuptools')
 checkdepends=('xorg-server-xvfb' 'python-pytest' 'python-numpy')
 
source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-${pkgver}.tar.gz";)
-sha512sums=('48895f191150c63c253eb4136b78ff7803b6df566ca92b9fcf3c3fff3c893a57ff52a51b331333cf2200a053b8d0ea7facb39d7bfb581a78e009a24c31437cae')
+sha512sums=('9ae419b243da061b467428872d36d6e996c23844ffd040b525014dae0821b8507911854af89056680aaf7207755ded79ce51322a4582c14e11aff5fbdf2f8ed8')
 
 prepare() {
   sed -i "s|WX_CONFIG = 'wx-config'|WX_CONFIG = 'wx-config-gtk3'|" 
$_pkgname-$pkgver/build.py

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

2019-01-06 Thread Morten Linderud via arch-commits 
Date: Sunday, January 6, 2019 @ 22:41:57
  Author: foxboron
Revision: 420777

upgpkg: python-wxpython 4.0.4-5

Modified:
  python-wxpython/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-01-06 22:20:48 UTC (rev 420776)
+++ PKGBUILD2019-01-06 22:41:57 UTC (rev 420777)
@@ -2,7 +2,7 @@
 
 pkgname=python-wxpython
 _pkgname=wxPython
-pkgver=4.0.3
+pkgver=4.0.4
 pkgrel=5
 pkgdesc="Phoenix wxWidgets GUI toolkit for Python"
 arch=('x86_64')
@@ -12,7 +12,7 @@
 makedepends=('mesa' 'glu' 'webkit2gtk')
 checkdepends=('xorg-server-xvfb' 'python-pytest' 'python-numpy')
 
source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-${pkgver}.tar.gz";)
-sha512sums=('911dd98d15b0cbc2551f1b22a21fdae4450656ca59cc93216b7c6a8a00e399b929b78484637992d78cecffb098b8d8dc408c24795549827e2f90ce42740c3bf9')
+sha512sums=('48895f191150c63c253eb4136b78ff7803b6df566ca92b9fcf3c3fff3c893a57ff52a51b331333cf2200a053b8d0ea7facb39d7bfb581a78e009a24c31437cae')
 
 prepare() {
   sed -i "s|WX_CONFIG = 'wx-config'|WX_CONFIG = 'wx-config-gtk3'|" 
$_pkgname-$pkgver/build.py

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

2018-11-18 Thread Filipe Laíns via arch-commits 
Date: Sunday, November 18, 2018 @ 16:20:06
  Author: ffy00
Revision: 408720

upgpkg: python-wxpython 4.0.3-5

Modified:
  python-wxpython/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2018-11-18 15:45:03 UTC (rev 408719)
+++ PKGBUILD2018-11-18 16:20:06 UTC (rev 408720)
@@ -3,14 +3,14 @@
 pkgname=python-wxpython
 _pkgname=wxPython
 pkgver=4.0.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Phoenix wxWidgets GUI toolkit for Python"
 arch=('x86_64')
 license=('custom:wxWindows')
 url="https://www.wxpython.org";
-depends=('wxgtk3' 'python-setuptools' 'python-six')
+depends=('wxgtk3' 'python-setuptools' 'python-six' 'python-pypubsub')
 makedepends=('mesa' 'glu' 'webkit2gtk')
-checkdepends=('xorg-server-xvfb' 'python-pytest' 'python-numpy' 
'python-pypubsub')
+checkdepends=('xorg-server-xvfb' 'python-pytest' 'python-numpy')
 
source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-${pkgver}.tar.gz";)
 
sha512sums=('911dd98d15b0cbc2551f1b22a21fdae4450656ca59cc93216b7c6a8a00e399b929b78484637992d78cecffb098b8d8dc408c24795549827e2f90ce42740c3bf9')
 
@@ -38,3 +38,4 @@
   install -Dm 644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
   find "$pkgdir/usr/lib" -type f | xargs chmod 644
 }
+

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

2018-09-04 Thread Filipe Laíns via arch-commits 
Date: Tuesday, September 4, 2018 @ 13:57:14
  Author: ffy00
Revision: 376675

Small cleanup again.

Modified:
  python-wxpython/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-04 13:51:46 UTC (rev 376674)
+++ PKGBUILD2018-09-04 13:57:14 UTC (rev 376675)
@@ -22,20 +22,12 @@
 build() {
   cd $_pkgname-$pkgver
 
-  python build.py build --use_syswx --release -v
+  python build.py build --use_syswx --release
 }
 
 check() {
   cd $_pkgname-$pkgver
 
-#  pythonpaths=("$PWD"/build/lib.linux-$CARCH-3*)
-
-  # test_vlbox.py:test_vlbox4 hangs
-  # test_utils.py:test_utilsSomeOtherStuff segfaults but only when run with 
all other tests...
-  # still failures but the package works...
-#  PYTHONPATH="${pythonpaths[0]}" xvfb-run python -m pytest unittests/ -k 'not 
test_utilsSomeOtherStuff and not test_vlbox4 \
-#  and not test_webview1 and not test_webview2 and not test_webview3' || 
warning "tests failed"
-#  PYTHONPATH="${pythonpaths[0]}" xvfb-run python -m pytest 
unittests/test_utils.py -k 'test_utilsSomeOtherStuff'
   xvfb-run python build.py test
 }

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

2018-09-04 Thread Filipe Laíns via arch-commits 
Date: Tuesday, September 4, 2018 @ 13:47:47
  Author: ffy00
Revision: 376669

Resolve conflicts with wxgtk3.

Fixes FS#59880

Modified:
  python-wxpython/trunk/PKGBUILD

--+
 PKGBUILD |   35 ---
 1 file changed, 20 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-04 13:47:07 UTC (rev 376668)
+++ PKGBUILD2018-09-04 13:47:47 UTC (rev 376669)
@@ -4,7 +4,7 @@
 pkgname=python-wxpython
 _pkgname=wxPython
 pkgver=4.0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Phoenix wxWidgets GUI toolkit for Python"
 arch=('x86_64')
 license=('custom:wxWindows')
@@ -15,30 +15,35 @@
 
source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-${pkgver}.tar.gz";)
 
sha512sums=('911dd98d15b0cbc2551f1b22a21fdae4450656ca59cc93216b7c6a8a00e399b929b78484637992d78cecffb098b8d8dc408c24795549827e2f90ce42740c3bf9')
 
+prepare() {
+  sed -i "s|WX_CONFIG = 'wx-config'|WX_CONFIG = 'wx-config-gtk3'|" 
$_pkgname-$pkgver/build.py
+}
+
 build() {
-cd $_pkgname-$pkgver
+  cd $_pkgname-$pkgver
 
-python setup.py build
+  python build.py build --use_syswx --release -v
 }
 
 check() {
-cd $_pkgname-$pkgver
+  cd $_pkgname-$pkgver
 
-pythonpaths=("$PWD"/build/lib.linux-$CARCH-3*)
+#  pythonpaths=("$PWD"/build/lib.linux-$CARCH-3*)
 
-# test_vlbox.py:test_vlbox4 hangs
-# test_utils.py:test_utilsSomeOtherStuff segfaults but only when run with 
all other tests...
-# still failures but the package works...
-PYTHONPATH="${pythonpaths[0]}" xvfb-run python -m pytest unittests/ -k 
'not test_utilsSomeOtherStuff and not test_vlbox4 \
-and not test_webview1 and not test_webview2 and not test_webview3' || 
warning "tests failed"
-PYTHONPATH="${pythonpaths[0]}" xvfb-run python -m pytest 
unittests/test_utils.py -k 'test_utilsSomeOtherStuff'
+  # test_vlbox.py:test_vlbox4 hangs
+  # test_utils.py:test_utilsSomeOtherStuff segfaults but only when run with 
all other tests...
+  # still failures but the package works...
+#  PYTHONPATH="${pythonpaths[0]}" xvfb-run python -m pytest unittests/ -k 'not 
test_utilsSomeOtherStuff and not test_vlbox4 \
+#  and not test_webview1 and not test_webview2 and not test_webview3' || 
warning "tests failed"
+#  PYTHONPATH="${pythonpaths[0]}" xvfb-run python -m pytest 
unittests/test_utils.py -k 'test_utilsSomeOtherStuff'
+  xvfb-run python build.py test
 }
 
 package() {
-cd $_pkgname-$pkgver
+  cd $_pkgname-$pkgver
 
-python setup.py install --root="$pkgdir" --skip-build --optimize=1
+  python build.py install --destdir="$pkgdir"
 
-install -Dm 644 LICENSE.txt 
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
-find "$pkgdir/usr/lib" -type f | xargs chmod 644
+  install -Dm 644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
+  find "$pkgdir/usr/lib" -type f | xargs chmod 644
 }

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

2018-08-17 Thread Filipe Laíns via arch-commits 
Date: Friday, August 17, 2018 @ 20:20:11
  Author: ffy00
Revision: 372561

small cleanup

Modified:
  python-wxpython/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-17 20:13:20 UTC (rev 372560)
+++ PKGBUILD2018-08-17 20:20:11 UTC (rev 372561)
@@ -37,7 +37,7 @@
 package() {
 cd $_pkgname-$pkgver
 
-python3 setup.py install --root="$pkgdir" --skip-build --optimize=1
+python setup.py install --root="$pkgdir" --skip-build --optimize=1
 
 install -Dm 644 LICENSE.txt 
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
 find "$pkgdir/usr/lib" -type f | xargs chmod 644

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

2018-08-17 Thread Filipe Laíns via arch-commits 
Date: Friday, August 17, 2018 @ 20:13:10
  Author: ffy00
Revision: 372559

upgpkg: python-wxpython 4.0.3-3

Modified:
  python-wxpython/trunk/PKGBUILD

--+
 PKGBUILD |   36 ++--
 1 file changed, 14 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-17 20:02:10 UTC (rev 372558)
+++ PKGBUILD2018-08-17 20:13:10 UTC (rev 372559)
@@ -2,7 +2,8 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=python-wxpython
-pkgver=4.0.1
+_pkgname=wxPython
+pkgver=4.0.3
 pkgrel=3
 pkgdesc="Phoenix wxWidgets GUI toolkit for Python"
 arch=('x86_64')
@@ -10,29 +11,18 @@
 url="https://www.wxpython.org";
 depends=('wxgtk3' 'python-setuptools' 'python-six')
 makedepends=('mesa' 'glu' 'webkit2gtk')
-checkdepends=('xorg-server-xvfb' 'python-pytest' 'python-numpy')
-source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-${pkgver}.tar.gz";
-"use-waf-2.0.8.patch"
-"https://wxpython.org/Phoenix/tools/waf-2.0.8.bz2";)
-sha256sums=('f8f2ac1a75368b9b103259addc77f4e3dfe729c6d70aa1fd0b7e9c5b6075c710'
-'e88c92a4ad7fa8e692ffd816dc20b897c4e5b7fc60dd167226298b3b14280f66'
-'6cf9cc2a7d96aa6389de0e2636b31dbc8b508f18ef9ba278199c2b048003f384')
+checkdepends=('xorg-server-xvfb' 'python-pytest' 'python-numpy' 
'python-pypubsub')
+source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-${pkgver}.tar.gz";)
+sha512sums=('911dd98d15b0cbc2551f1b22a21fdae4450656ca59cc93216b7c6a8a00e399b929b78484637992d78cecffb098b8d8dc408c24795549827e2f90ce42740c3bf9')
 
-prepare() {
-cd wxPython-${pkgver}
+build() {
+cd $_pkgname-$pkgver
 
-# use python 3.7 compatible waf
-patch -p1 -i ../use-waf-2.0.8.patch
-ln -sf "${srcdir}/waf-2.0.8" bin/
+python setup.py build
 }
 
-build() {
-cd wxPython-${pkgver}
-python3 setup.py build
-}
-
 check() {
-cd wxPython-${pkgver}
+cd $_pkgname-$pkgver
 
 pythonpaths=("$PWD"/build/lib.linux-$CARCH-3*)
 
@@ -45,8 +35,10 @@
 }
 
 package() {
-cd wxPython-${pkgver}
-python3 setup.py install --root="${pkgdir}" --optimize=1
-install -Dm644 LICENSE.txt 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.txt
+cd $_pkgname-$pkgver
+
+python3 setup.py install --root="$pkgdir" --skip-build --optimize=1
+
+install -Dm 644 LICENSE.txt 
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
 find "$pkgdir/usr/lib" -type f | xargs chmod 644
 }

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

2018-08-13 Thread Eli Schwartz via arch-commits 
Date: Monday, August 13, 2018 @ 18:37:22
  Author: eschwartz
Revision: 371320

Fix duplicate source line

Modified:
  python-wxpython/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-13 18:22:57 UTC (rev 371319)
+++ PKGBUILD2018-08-13 18:37:22 UTC (rev 371320)
@@ -11,7 +11,6 @@
 depends=('wxgtk3' 'python-setuptools' 'python-six')
 makedepends=('mesa' 'glu' 'webkit2gtk')
 checkdepends=('xorg-server-xvfb' 'python-pytest' 'python-numpy')
-source=("https://github.com/wxWidgets/Phoenix/releases/download/wxPython-${pkgver}/wxPython-${pkgver}.tar.gz";)
 
source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-${pkgver}.tar.gz";
 "use-waf-2.0.8.patch"
 "https://wxpython.org/Phoenix/tools/waf-2.0.8.bz2";)

[arch-commits] Commit in python-wxpython/trunk (PKGBUILD use-waf-2.0.8.patch)

2018-07-26 Thread Eli Schwartz via arch-commits 
Date: Thursday, July 26, 2018 @ 22:50:05
  Author: eschwartz
Revision: 363657

upgpkg: python-wxpython 4.0.1-3

python 3.7 rebuild

add testsuite and ignore errors; the errors are the same on both python 3.6 and
python 3.7 so it is presumably okay on python 3.7

Added:
  python-wxpython/trunk/use-waf-2.0.8.patch
Modified:
  python-wxpython/trunk/PKGBUILD

-+
 PKGBUILD|   31 ++-
 use-waf-2.0.8.patch |  101 ++
 2 files changed, 130 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-26 22:40:14 UTC (rev 363656)
+++ PKGBUILD2018-07-26 22:50:05 UTC (rev 363657)
@@ -3,7 +3,7 @@
 
 pkgname=python-wxpython
 pkgver=4.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Phoenix wxWidgets GUI toolkit for Python"
 arch=('x86_64')
 license=('custom:wxWindows')
@@ -10,14 +10,41 @@
 url="https://www.wxpython.org";
 depends=('wxgtk3' 'python-setuptools' 'python-six')
 makedepends=('mesa' 'glu' 'webkit2gtk')
+checkdepends=('xorg-server-xvfb' 'python-pytest' 'python-numpy')
 
source=("https://github.com/wxWidgets/Phoenix/releases/download/wxPython-${pkgver}/wxPython-${pkgver}.tar.gz";)
-sha256sums=('f8f2ac1a75368b9b103259addc77f4e3dfe729c6d70aa1fd0b7e9c5b6075c710')
+source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-${pkgver}.tar.gz";
+"use-waf-2.0.8.patch"
+"https://wxpython.org/Phoenix/tools/waf-2.0.8.bz2";)
+sha256sums=('f8f2ac1a75368b9b103259addc77f4e3dfe729c6d70aa1fd0b7e9c5b6075c710'
+'e88c92a4ad7fa8e692ffd816dc20b897c4e5b7fc60dd167226298b3b14280f66'
+'6cf9cc2a7d96aa6389de0e2636b31dbc8b508f18ef9ba278199c2b048003f384')
 
+prepare() {
+cd wxPython-${pkgver}
+
+# use python 3.7 compatible waf
+patch -p1 -i ../use-waf-2.0.8.patch
+ln -sf "${srcdir}/waf-2.0.8" bin/
+}
+
 build() {
 cd wxPython-${pkgver}
 python3 setup.py build
 }
 
+check() {
+cd wxPython-${pkgver}
+
+pythonpaths=("$PWD"/build/lib.linux-$CARCH-3*)
+
+# test_vlbox.py:test_vlbox4 hangs
+# test_utils.py:test_utilsSomeOtherStuff segfaults but only when run with 
all other tests...
+# still failures but the package works...
+PYTHONPATH="${pythonpaths[0]}" xvfb-run python -m pytest unittests/ -k 
'not test_utilsSomeOtherStuff and not test_vlbox4 \
+and not test_webview1 and not test_webview2 and not test_webview3' || 
warning "tests failed"
+PYTHONPATH="${pythonpaths[0]}" xvfb-run python -m pytest 
unittests/test_utils.py -k 'test_utilsSomeOtherStuff'
+}
+
 package() {
 cd wxPython-${pkgver}
 python3 setup.py install --root="${pkgdir}" --optimize=1

Added: use-waf-2.0.8.patch
===
--- use-waf-2.0.8.patch (rev 0)
+++ use-waf-2.0.8.patch 2018-07-26 22:50:05 UTC (rev 363657)
@@ -0,0 +1,101 @@
+From 1eb0f5aad704c07de45e5092dde04c8051e421ae Mon Sep 17 00:00:00 2001
+From: Robin Dunn 
+Date: Sat, 5 May 2018 21:03:30 -0700
+Subject: [PATCH 1/2] Update waf to version 2.0.7
+
+---
+ build.py | 4 ++--
+ wscript  | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/build.py b/build.py
+index 41ed39ac..a56d3e22 100755
+--- a/build.py
 b/build.py
+@@ -83,8 +83,8 @@ sipMD5 = {
+ 'linux64'  : 'b349127a4d46452936e4181d96b12c2d',
+ }
+ 
+-wafCurrentVersion = '1.7.15-p1'
+-wafMD5 = 'e44003373c965f4221bbdc4c9b846128'
++wafCurrentVersion = '2.0.7'
++wafMD5 = '48ac1250bcccd0674cf461937875ce9a'
+ 
+ doxygenCurrentVersion = '1.8.8'
+ doxygenMD5 = {
+diff --git a/wscript b/wscript
+index d051ebbc..c4bc96fd 100644
+--- a/wscript
 b/wscript
+@@ -30,7 +30,7 @@ def options(opt):
+ if isWindows:
+ opt.load('msvc')
+ else:
+-opt.load('compiler_cc compiler_cxx')
++opt.load('compiler_c compiler_cxx')
+ opt.load('python')
+ 
+ opt.add_option('--debug', dest='debug', action='store_true', 
default=False,
+@@ -78,7 +78,7 @@ def configure(conf):
+ conf.env['MSVC_TARGETS'] = [conf.options.msvc_arch]
+ conf.load('msvc')
+ else:
+-conf.load('compiler_cc compiler_cxx')
++conf.load('compiler_c compiler_cxx')
+ 
+ if conf.options.python:
+ conf.env.PYTHON = conf.options.python
+-- 
+2.18.0
+
+
+From bbcd9a029d42b5c66e122676bcdc8d7149415388 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz 
+Date: Thu, 26 Jul 2018 19:33:31 +
+Subject: [PATCH 2/2] Manually backport update waf to 2.0.8
+
+- e0cde8741295d08b599f39f33a2a95eef5fd5b87
+- b910acaef120cce61508fc57eab07bb0286a29ec
+- e1679ca2016a5160e12513e0c3c2d37030e431af
+---
+ build.py | 4 ++--
+ wscript  | 8 
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/build.py b/build.py
+index a56d3e22..67aa813d 100755
+--- a/build.py
 b/build.py
+@@ -83,8 +83,8 @@ sipMD5 = {
+ 'linux64'  : 'b349127a4d46452936e4181d96b12c2d',
+ }
+

[arch-commits] Commit in python-wxpython/trunk (PKGBUILD unbundle-sip.patch)

2018-04-10 Thread Balló György via arch-commits 
Date: Tuesday, April 10, 2018 @ 09:58:03
  Author: bgyorgy
Revision: 315552

upgpkg: python-wxpython 4.0.1-2

Don't try to unbundle SIP, it doesn't work (FS#58156)

Modified:
  python-wxpython/trunk/PKGBUILD
Deleted:
  python-wxpython/trunk/unbundle-sip.patch

+
 PKGBUILD   |   19 
 unbundle-sip.patch |   58 ---
 2 files changed, 5 insertions(+), 72 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-10 09:57:26 UTC (rev 315551)
+++ PKGBUILD2018-04-10 09:58:03 UTC (rev 315552)
@@ -3,25 +3,16 @@
 
 pkgname=python-wxpython
 pkgver=4.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Phoenix wxWidgets GUI toolkit for Python"
 arch=('x86_64')
 license=('custom:wxWindows')
 url="https://www.wxpython.org";
-depends=('wxgtk3' 'python-setuptools' 'python-sip' 'python-six')
-makedepends=('mesa' 'glu')
-source=("https://github.com/wxWidgets/Phoenix/releases/download/wxPython-${pkgver}/wxPython-${pkgver}.tar.gz";
-"unbundle-sip.patch")
-sha256sums=('f8f2ac1a75368b9b103259addc77f4e3dfe729c6d70aa1fd0b7e9c5b6075c710'
-'060badc5667993cd4120c8779f812d892d9a46816287b622af02756bb330cc9f')
+depends=('wxgtk3' 'python-setuptools' 'python-six')
+makedepends=('mesa' 'glu' 'webkit2gtk')
+source=("https://github.com/wxWidgets/Phoenix/releases/download/wxPython-${pkgver}/wxPython-${pkgver}.tar.gz";)
+sha256sums=('f8f2ac1a75368b9b103259addc77f4e3dfe729c6d70aa1fd0b7e9c5b6075c710')
 
-prepare() {
-cd wxPython-${pkgver}
-patch -Np1 -i ../unbundle-sip.patch
-find -name '*.py' | xargs sed -i 's/wx.siplib/sip/'
-rm -rf sip
-}
-
 build() {
 cd wxPython-${pkgver}
 python3 setup.py build

Deleted: unbundle-sip.patch
===
--- unbundle-sip.patch  2018-04-10 09:57:26 UTC (rev 315551)
+++ unbundle-sip.patch  2018-04-10 09:58:03 UTC (rev 315552)
@@ -1,58 +0,0 @@
-diff --git a/wscript b/wscript
 a/wscript
-+++ b/wscript
-@@ -95,8 +95,8 @@
- conf.env.debug = conf.options.debug
- conf.env.msvc_relwithdebug = conf.options.msvc_relwithdebug
- 
--# Ensure that the headers in siplib and Phoenix's src dir can be found
--conf.env.INCLUDES_WXPY = ['sip/siplib', 'src']
-+# Ensure that the headers in Phoenix's src dir can be found
-+conf.env.INCLUDES_WXPY = ['src']
- 
- if isWindows:
- # Windows/MSVC specific stuff
-@@ -505,26 +505,6 @@
- copy_file(name, cfg.PKGDIR, update=1, verbose=1)
- 
- 
--# Create the build tasks for each of our extension modules.
--addRelwithdebugFlags(bld, 'siplib')
--siplib = bld(
--features = 'c cxx cshlib cxxshlib pyext',
--target   = makeTargetName(bld, 'siplib'),
--source   = ['sip/siplib/apiversions.c',
--'sip/siplib/array.c',
--'sip/siplib/bool.cpp',
--'sip/siplib/descriptors.c',
--'sip/siplib/int_convertors.c',
--'sip/siplib/objmap.c',
--'sip/siplib/qtlib.c',
--'sip/siplib/siplib.c',
--'sip/siplib/threads.c',
--'sip/siplib/voidptr.c',
--],
--uselib   = 'siplib WX WXPY',
--)
--makeExtCopyRule(bld, 'siplib')
--
- # Add build rules for each of our ETG generated extension modules
- makeETGRule(bld, 'etg/_core.py',   '_core',  'WX')
- makeETGRule(bld, 'etg/_adv.py','_adv',   'WXADV')
-@@ -613,14 +593,14 @@
- 
- # Make extension module build rules using info gleaned from an ETG script
- def makeETGRule(bld, etgScript, moduleName, libFlags):
--from buildtools.config   import loadETG, getEtgSipCppFiles
-+from buildtools.config   import loadETG
- 
- addRelwithdebugFlags(bld, moduleName)
- rc = ['src/wxc.rc'] if isWindows else []
- etg = loadETG(etgScript)
- bld(features='c cxx cxxshlib pyext',
- target=makeTargetName(bld, moduleName),
--source=getEtgSipCppFiles(etg) + rc,
-+source=rc,
- uselib='{} {} WXPY'.format(moduleName, libFlags),
- )
- makeExtCopyRule(bld, moduleName)