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

[Felix Yan]

    Date: Friday, November 18, 2016 @ 07:58:35
  Author: felixonmars
Revision: 281043

upgpkg: twisted 16.5.0-1

Modified:
  twisted/trunk/PKGBUILD

----------+
 PKGBUILD |   39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-18 07:49:02 UTC (rev 281042)
+++ PKGBUILD	2016-11-18 07:58:35 UTC (rev 281043)
@@ -6,17 +6,20 @@
 
 pkgbase=twisted
 pkgname=(python-twisted python2-twisted)
-pkgver=16.4.1
+pkgver=16.5.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' 'git'
-             'python-setuptools' 'python2-setuptools' 'python-service-identity' 'python2-service-identity')
+makedepends=('python-zope-interface' 'python2-zope-interface' 'git'
+             'python-setuptools' 'python2-setuptools' 'python-service-identity'
+             'python2-service-identity' 'python-incremental' 'python2-incremental'
+             'python-constantly' 'python2-constantly')
 checkdepends=('subversion' 'python2-sphinx' 'pygtk' 'xorg-server-xvfb' 'tk' 'openssh'
               'python-gobject' 'python2-gobject' 'python-gobject2' 'python2-gobject2'
-              'python2-gmpy2' 'python2-soappy' 'python-subunit' 'python2-subunit')
+              'python2-soappy' 'python-subunit' 'python2-subunit' 'python-h2' 'python2-h2'
+              'python-service-identity' 'python2-service-identity' 'python-crypto' 'python2-crypto')
 source=("git+https://github.com/twisted/twisted.git#tag=twisted-$pkgver")
 sha1sums=('SKIP')
 
@@ -23,11 +26,9 @@
 prepare() {
   cp -a twisted{,-py2}
 
-  cd twisted-py2
   sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \
-    twisted/python/test/pullpipe.py \
-    twisted/mail/test/pop3testserver.py \
-    twisted/trial/test/scripttest.py
+    twisted-py2/src/twisted/mail/test/pop3testserver.py \
+    twisted-py2/src/twisted/trial/test/scripttest.py
 }
 
 build() {
@@ -39,18 +40,22 @@
 }
 
 check() {
+  export LC_CTYPE=en_US.UTF-8
+
   cd "$srcdir"/twisted
-  LC_CTYPE=en_US.utf8 xvfb-run python admin/run-python3-tests || warning "Tests failed"
+  PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.5:$PYTHONPATH" xvfb-run python -m twisted.trial twisted || warning "Tests failed"
 
   cd "$srcdir"/twisted-py2
-  LC_CTYPE=en_US.utf8 xvfb-run python2 bin/trial twisted || warning "Tests failed"
+  PYTHONPATH="$PWD/build/lib.linux-$CARCH-2.7:$PYTHONPATH" xvfb-run python2 -m twisted.trial twisted || warning "Tests failed"
 }
 
 package_python-twisted() {
-  depends=('python-crypto' 'python-zope-interface')
-  optdepends=('python-pyopenssl'
+  depends=('python-zope-interface' 'python-incremental' 'python-constantly')
+  optdepends=('python-pyopenssl: for TLS client hostname verification'
               'python-service-identity: for TLS client hostname verification'
-              'python-pyasn1: for using conch'
+              'python-idna: for TLS client hostname verification'
+              'python-cryptography: for using conch'
+              'python-h2: for http2 support'
               'tk: for using tkconch')
 
   cd twisted
@@ -66,11 +71,13 @@
 }
 
 package_python2-twisted() {
-  depends=('python2-crypto' 'python2-zope-interface')
-  optdepends=('python2-pyopenssl'
+  depends=('python2-zope-interface' 'python2-incremental' 'python2-constantly')
+  optdepends=('python2-pyopenssl: for TLS client hostname verification'
               'python2-service-identity: for TLS client hostname verification'
+              'python2-idna: for TLS client hostname verification'
+              'python2-cryptography: for using conch'
+              'python2-h2: for http2 support'
               'python2-soappy: for twisted.web.soap'
-              'python2-pyasn1: for using conch'
               'pygtk: for using manhole'
               'tk: for using tkconch')
   provides=("twisted=$pkgver")