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

[Felix Yan]

    Date: Wednesday, September 16, 2015 @ 05:45:27
  Author: fyan
Revision: 246376

upgpkg: twisted 15.4.0-1

- upstream new release
- enabled more tests
- rename python 3 tool

Modified:
  twisted/trunk/PKGBUILD

----------+
 PKGBUILD |   35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-15 20:14:15 UTC (rev 246375)
+++ PKGBUILD	2015-09-16 03:45:27 UTC (rev 246376)
@@ -6,21 +6,24 @@
 
 pkgbase=twisted
 pkgname=(python-twisted python2-twisted)
-pkgver=15.3.0
+pkgver=15.4.0
 pkgrel=1
 pkgdesc="Asynchronous networking framework written in Python"
 arch=('i686' 'x86_64')
 url="http://twistedmatrix.com/"
 license=('MIT')
-makedepends=('python-crypto' 'python2-crypto' 'python-zope-interface' 'python2-zope-interface'
+makedepends=('python-crypto' 'python2-crypto' 'python-zope-interface' 'python2-zope-interface' 'git'
              'python-setuptools' 'python2-setuptools' 'python-service-identity' 'python2-service-identity')
-source=("http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2")
-sha1sums=('1932cc62ac038cce1624f3aa1c893bd83afe0f32')
+checkdepends=('subversion' 'python2-sphinx' 'pygtk' 'xorg-server-xvfb' 'tk' 'openssh'
+              'python-gobject' 'python2-gobject' 'python-gobject2' 'python2-gobject2'
+              'python2-gmpy2' 'python2-soappy')
+source=("git+https://github.com/twisted/twisted.git#tag=twisted-$pkgver")
+sha1sums=('SKIP')
 
 prepare() {
-  cp -a "Twisted-$pkgver"{,-py2}
+  cp -a "twisted"{,-py2}
 
-  cd "Twisted-$pkgver-py2"
+  cd "twisted-py2"
   sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \
     twisted/python/test/pullpipe.py \
     twisted/mail/test/pop3testserver.py \
@@ -28,19 +31,19 @@
 }
 
 build() {
-  cd "$srcdir/Twisted-$pkgver"
+  cd "$srcdir/twisted"
   python3 setup.py build
 
-  cd "$srcdir/Twisted-$pkgver-py2"
+  cd "$srcdir/twisted-py2"
   python2 setup.py build
 }
 
 check() {
-  cd "$srcdir/Twisted-$pkgver"
-  # LC_CTYPE=en_US.utf8 python bin/trial twisted
+  cd "$srcdir/twisted"
+  LC_CTYPE=en_US.utf8 xvfb-run python admin/run-python3-tests
 
-  cd "$srcdir/Twisted-$pkgver-py2"
-  LC_CTYPE=en_US.utf8 python2 bin/trial twisted || warning "Tests failed"
+  cd "$srcdir/twisted-py2"
+  LC_CTYPE=en_US.utf8 xvfb-run python2 bin/trial twisted || warning "Tests failed"
 }
 
 package_python-twisted() {
@@ -50,7 +53,7 @@
               'python-pyasn1: for using conch'
               'tk: for using tkconch')
 
-  cd "Twisted-$pkgver"
+  cd "twisted"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 
   # Wrong path, wrong!
@@ -57,6 +60,10 @@
   cp -a "$pkgdir"/usr/twisted/* "$pkgdir"/usr/lib/python3.4/site-packages/twisted/
   rm -r "$pkgdir"/usr/twisted
 
+  # twisted in python 3 supports only one command line tool for now.
+  # Let's rename the tools the other way round after the python 3 version supports all.
+  mv "$pkgdir/usr/bin/trial"{,3}
+
   install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
@@ -72,7 +79,7 @@
   conflicts=('twisted<14.0.0')
   replaces=('twisted<14.0.0')
 
-  cd "Twisted-$pkgver-py2"
+  cd "twisted-py2"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
   install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }