git » python-pycurl.git » commit fc8fc67

now we have flaky, tests can pass.

author Felix Yan
2015-11-02 15:14:50 UTC
committer Felix Yan
2015-11-02 15:14:50 UTC
parent 906b2928f9636ebec564c15cc361ca34a206ae51

now we have flaky, tests can pass.

PKGBUILD +8 -7

diff --git a/PKGBUILD b/PKGBUILD
index 982ec64..eef122b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,13 @@
 _pypiname=pycurl
 pkgbase=python-$_pypiname
 pkgname=('python-pycurl' 'python2-pycurl')
-pkgver=7.19.5.1
-pkgrel=3
+pkgver=7.19.5.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://pycurl.sourceforge.net/"
 license=('LGPL' 'MIT')
 makedepends=('python' 'python2' 'curl' 'git')
-checkdepends=('python-bottle' 'python2-bottle' 'python-nose' 'python2-nose' 'vsftpd')
+checkdepends=('python-bottle' 'python2-bottle' 'python-nose' 'python2-nose' 'vsftpd' 'python-flaky' 'python2-flaky' 'python-pyflakes' 'python2-pyflakes')
 source=("git+https://github.com/pycurl/pycurl.git#tag=REL_${pkgver//./_}")
 sha1sums=('SKIP')
 
@@ -21,12 +21,13 @@ prepare() {
   cd "$srcdir/$_pypiname"
   find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python3|" {} +
     sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python-pycurl"/' setup.py
-  sed -i "s/nosetests/nosetests3/" Makefile
+  sed -e "s/nosetests/nosetests3/" -e "s/python/python3/" -i tests/run.sh
 
   cd "$srcdir/$_pypiname-py2"
   find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python2|" {} +
     sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python2-pycurl"/' setup.py
-  sed -i "s/nosetests/nosetests2/" Makefile
+  sed -e "s/nosetests/nosetests2/" -e "s/python/python2/" -i tests/run.sh
+  sed -e "s/pyflakes/pyflakes-python2/" -i Makefile
 }
 
 build() {
@@ -43,10 +44,10 @@ check() {
   export PYCURL_VSFTPD_PATH=vsftpd
 
   cd "$srcdir/$_pypiname"
-  PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.5:$PYTHONPATH" make test || warning "Tests failed"
+  PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.5:$PYTHONPATH" make test
 
   cd "$srcdir/$_pypiname-py2"
-  PYTHONPATH="$PWD/build/lib.linux-$CARCH-2.7:$PYTHONPATH" make test || warning "Tests failed"
+  PYTHONPATH="$PWD/build/lib.linux-$CARCH-2.7:$PYTHONPATH" make PYTHON=python2 NOSETESTS=nosetests2 test
 }
 
 package_python-pycurl() {