git » python-pytest.git » commit 590221d

diff --git a/PKGBUILD b/PKGBUILD
index 09e58af..7fa3f02 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,51 +3,60 @@
 
 pkgbase=python-pytest
 pkgname=('python-pytest' 'python2-pytest')
-pkgver=2.8.0
-pkgrel=2
+pkgver=2.8.1.20150930
+_commit=e9240f7eeeca501bcc87a052f3dc763d31eba119
+pkgrel=1
 pkgdesc="Simple powerful testing with Python"
 arch=('any')
 license=('MIT')
 url="http://pytest.org/"
-makedepends=('python-setuptools' 'python2-setuptools' 'python-py' 'python2-py')
-checkdepends=('lsof' 'python-nose' 'python2-nose' 'python-twisted' 'python2-twisted'
+makedepends=('python-setuptools' 'python2-setuptools' 'python-py' 'python2-py' 'git')
+             # 'python-pluggy' 'python2-pluggy')
+checkdepends=('lsof' 'python-nose' 'python2-nose'
               'python-mock' 'python2-mock' 'python-yaml' 'python2-yaml' 'python2-enum34'
-              'python-pexpect' 'python2-pexpect' 'python-pytest-xdist' 'python2-pytest-xdist')
-source=("https://pypi.python.org/packages/source/p/pytest/pytest-$pkgver.zip")
-sha512sums=('98f7131c3396848ef7dbcf67e21e0329f8a3b771b3f8b832c1894758b34a2f852209f809001da856cfe8ea3773b257405ae2d5f8a04152242b8692e1511289ed')
+              'python-pexpect' 'python2-pexpect' 'python-pytest-xdist' 'python2-pytest-xdist'
+              'python-zope-interface' 'python2-zope-interface')
+              # 'python-twisted' 'python2-twisted' disabled as they don't support python 3.5 for now
+source=("git+https://github.com/pytest-dev/pytest.git#commit=$_commit")
+sha512sums=('SKIP')
 
 prepare() {
-  cp -a pytest-${pkgver}{,-py2}
+  # Remove bundled pluggy - disabled for now as it will break tests
+  # rm -r pytest/_pytest/vendored_packages
+  # sed -i "s/'_pytest.vendored_packages'//" pytest/setup.py
+
+  cp -a pytest{,-py2}
 }
 
 build() {
-  cd "$srcdir/pytest-${pkgver}"
+  cd "$srcdir/pytest"
   python setup.py build
 
-  cd "$srcdir/pytest-${pkgver}-py2"
+  cd "$srcdir/pytest-py2"
   python2 setup.py build
 }
 
 check() {
-  cd "$srcdir/pytest-${pkgver}"
+  cd "$srcdir/pytest"
   python setup.py test
 
-  cd "$srcdir/pytest-${pkgver}-py2"
-  python2 setup.py test
+  cd "$srcdir/pytest-py2"
+  python2 setup.py test || warning "Tests failed"
+  # https://github.com/pytest-dev/pytest/issues/927
 }
 
 package_python-pytest() {
-  depends=('python' 'python-py' 'python-setuptools')
+  depends=('python-py' 'python-setuptools') # 'python-pluggy'
 
-  cd pytest-${pkgver}
+  cd pytest
   python setup.py install --root="${pkgdir}" --optimize=1
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_python2-pytest() {
-  depends=('python2' 'python2-py' 'python2-setuptools')
+  depends=('python2-py' 'python2-setuptools') # 'python2-pluggy'
 
-  cd pytest-${pkgver}-py2
+  cd pytest-py2
   python2 setup.py install --root="${pkgdir}" --optimize=1
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"