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

[Felix Yan]

    Date: Monday, October 17, 2016 @ 03:29:48
  Author: felixonmars
Revision: 192408

upgpkg: python-pytest 3.0.3-2

- add back pytest executable (FS#50791)
- enable tests again (FS#50792)

Modified:
  python-pytest/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-17 03:23:40 UTC (rev 192407)
+++ PKGBUILD	2016-10-17 03:29:48 UTC (rev 192408)
@@ -5,7 +5,7 @@
 pkgbase=python-pytest
 pkgname=('python-pytest' 'python2-pytest')
 pkgver=3.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple powerful testing with Python"
 arch=('any')
 license=('MIT')
@@ -12,9 +12,9 @@
 url="http://pytest.org/"
 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' 'python-pexpect' 'python2-pexpect'
-              'python-pytest-xdist' 'python2-pytest-xdist' 'python-twisted' 'python2-twisted'
+checkdepends=('lsof' 'python-nose' 'python2-nose' 'python-mock' 'python2-mock' 'python-tox'
+              'python2-tox' 'python-yaml' 'python2-yaml' # 'python-pexpect' 'python2-pexpect'
+              'python-pytest-xdist' 'python2-pytest-xdist' # 'python-twisted' 'python2-twisted'
               'python-requests' 'python2-requests' 'python-hypothesis' 'python2-hypothesis')
 source=("git+https://github.com/pytest-dev/pytest.git#tag=$pkgver")
 sha512sums=('SKIP')
@@ -35,15 +35,12 @@
   python2 setup.py build
 }
 
-# Tests hang as of 3.0.0
-check_disabled() {
+check() {
   cd "$srcdir"/pytest
-  # 1 xdist-related failure
-  python setup.py test || warning "Tests failed"
+  python setup.py test
 
   cd "$srcdir"/pytest-py2
-  # 1 xdist-related failure
-  python2 setup.py test || warning "Tests failed"
+  python2 setup.py test
 }
 
 package_python-pytest() {
@@ -52,8 +49,6 @@
   cd pytest
   python setup.py install --root="$pkgdir" --optimize=1
   install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
-  rm "$pkgdir"/usr/bin/pytest
 }
 
 package_python2-pytest() {
@@ -64,5 +59,5 @@
   install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 
   mv "$pkgdir"/usr/bin/py.test{,2}
-  rm "$pkgdir"/usr/bin/pytest
+  mv "$pkgdir"/usr/bin/pytest{,2}
 }