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

[Felix Yan]

    Date: Thursday, February 13, 2020 @ 15:29:51
  Author: felixonmars
Revision: 570534

upgpkg: python-testrepository 0.0.20-6: remove python2 sibling

Modified:
  python-testrepository/trunk/PKGBUILD

----------+
 PKGBUILD |   55 ++++++++++++++++++++++---------------------------------
 1 file changed, 22 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-13 15:27:56 UTC (rev 570533)
+++ PKGBUILD	2020-02-13 15:29:51 UTC (rev 570534)
@@ -1,53 +1,42 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
-pkgbase=python-testrepository
-pkgname=('python-testrepository' 'python2-testrepository')
+pkgname=python-testrepository
 pkgver=0.0.20
-pkgrel=5
+pkgrel=6
 pkgdesc="A repository of test results."
 arch=('any')
 license=('Apache' 'BSD')
 url="https://launchpad.net/testrepository"
-makedepends=('python-setuptools' 'python2-setuptools' 'python-fixtures' 'python2-fixtures'
-             'python-testtools' 'python2-testtools' 'python-subunit' 'python2-subunit')
-checkdepends=('python-testresources' 'python2-testresources' 'python-pytz' 'python2-pytz'
-              'python-testscenarios' 'python2-testscenarios')
-source=("https://pypi.python.org/packages/source/t/testrepository/testrepository-$pkgver.tar.gz")
-sha512sums=('df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6')
+depends=('python-testtools' 'python-fixtures' 'python-subunit')
+makedepends=('python-setuptools')
+checkdepends=('python-testresources' 'python-pytz' 'python-testscenarios')
+source=("https://pypi.python.org/packages/source/t/testrepository/testrepository-$pkgver.tar.gz"
+        testrepository-py3-tests.patch::https://github.com/testing-cabal/testrepository/commit/d3d6cac4fd42f2067c0dd81be748853f81c348fc.patch
+        testrepository-new-testtools.patch::https://github.com/testing-cabal/testrepository/commit/8f8ab15fafdad6db850c84772323b32375b09285.patch
+        testrepository-new-testtools-2.patch::https://github.com/testing-cabal/testrepository/commit/e2f84ae6b2bcf89221613056d0c45dd308f46d62.patch)
+sha512sums=('df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6'
+            '0bbeafcd9ee399a47f1a6ec7249ce9412a6d154b2738899bab75b9593a0703bf297c9a6654e8c4131ccef6daf7c111ed3033e6e3263b5cace28f135bc9593b3e'
+            'b12926910a8f745515734bdc504b730341263d9d3ce44a598886b4e0aa0c9452a4b187e7926fb77e00837ce5f17ffdb6c3c84d53c06005e8caa29317bc42a62b'
+            '544141753d48cfcc5b973fc4ef2b469df0c85829f6ad324a194c1502d561460d26041c58c21a7afec40ebd3930b2742732c94e06563c81c5e4a26f09a2f9b9bc')
 
 prepare() {
-  cp -a testrepository-$pkgver{,-py2}
+  patch -d testrepository-$pkgver -p1 -i ../testrepository-py3-tests.patch
+  patch -d testrepository-$pkgver -p1 -i ../testrepository-new-testtools.patch
+  patch -d testrepository-$pkgver -p1 -i ../testrepository-new-testtools-2.patch
 }
 
 build() {
-  cd "$srcdir/testrepository-$pkgver"
+  cd testrepository-$pkgver
   python setup.py build
-
-  cd "$srcdir/testrepository-$pkgver-py2"
-  python2 setup.py build
 }
 
 check() {
-  cd "$srcdir/testrepository-$pkgver"
-  PYTHON=python python ./testr init
-  PYTHON=python python ./testr run --parallel || warning "Tests failed"
-
-  cd "$srcdir/testrepository-$pkgver-py2"
-  PYTHON=python2 python2 ./testr init
-  PYTHON=python2 python2 ./testr run --parallel || warning "Tests failed"
+  cd testrepository-$pkgver
+  python ./testr init
+  python ./testr run --parallel
 }
 
-package_python-testrepository() {
-  depends=('python-testtools' 'python-fixtures' 'python-subunit')
-
+package() {
   cd testrepository-$pkgver
-  python setup.py install --root="${pkgdir}" --optimize=1
+  python setup.py install --root="$pkgdir" --optimize=1
 }
-
-package_python2-testrepository() {
-  depends=('python2-testtools' 'python2-fixtures' 'python2-subunit')
-
-  cd testrepository-$pkgver-py2
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  mv "$pkgdir"/usr/bin/testr{,2}
-}