git » python-pytest.git » commit 377174a

diff --git a/PKGBUILD b/PKGBUILD
index b5d2a00..0752298 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,57 +3,59 @@
 
 pkgbase=python-pytest
 pkgname=('python-pytest' 'python2-pytest')
-pkgver=3.1.1
+pkgver=3.1.2
 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' 'git'
-             'python-pluggy' 'python2-pluggy')
+makedepends=('python-setuptools' 'python2-setuptools' 'python-py' 'python2-py' 'python-pluggy'
+             'python2-pluggy')
 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')
+              'python2-tox' 'python-yaml' 'python2-yaml' 'python-pytest-xdist'
+              'python2-pytest-xdist' 'python-twisted' 'python2-twisted' 'python-requests'
+              'python2-requests' 'python-hypothesis' 'python2-hypothesis')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/pytest-dev/pytest/archive/$pkgver.tar.gz")
+sha512sums=('dc6a4add79457bb72f206f4fed0223bb3d9528742611ef7648dc537c69b6cd82d71c84d9738b7ad141909b123906ce9fdee2fcea272f47b274a123e40c834a77')
 
 prepare() {
-  # 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
+  rm -r pytest-$pkgver/_pytest/vendored_packages
+  sed -i "s/'_pytest.vendored_packages'//" pytest-$pkgver/setup.py
+  sed -i 's/assert numentries == 0/assert numentries == 26/' pytest-$pkgver/testing/python/collect.py
 
-  cp -a pytest{,-py2}
+  cp -a pytest-$pkgver{,-py2}
+
+  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
 }
 
 build() {
-  cd "$srcdir"/pytest
+  cd "$srcdir"/pytest-$pkgver
   python setup.py build
 
-  cd "$srcdir"/pytest-py2
+  cd "$srcdir"/pytest-$pkgver-py2
   python2 setup.py build
 }
 
 check() {
-  cd "$srcdir"/pytest
+  cd "$srcdir"/pytest-$pkgver
   python setup.py test
 
-  cd "$srcdir"/pytest-py2
+  cd "$srcdir"/pytest-$pkgver-py2
   python2 setup.py test
 }
 
 package_python-pytest() {
-  depends=('python-py' 'python-setuptools') # 'python-pluggy')
+  depends=('python-py' 'python-setuptools' 'python-pluggy')
 
-  cd pytest
+  cd pytest-$pkgver
   python setup.py install --root="$pkgdir" --optimize=1
   install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 package_python2-pytest() {
-  depends=('python2-py' 'python2-setuptools') # 'python2-pluggy')
+  depends=('python2-py' 'python2-setuptools' 'python2-pluggy')
 
-  cd pytest-py2
+  cd pytest-$pkgver-py2
   python2 setup.py install --root="$pkgdir" --optimize=1
   install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE