Date: Thursday, February 13, 2020 @ 11:35:52
  Author: felixonmars
Revision: 570120

upgpkg: python-stestr 2.6.0-2: remove python2 sibling

Modified:
  python-stestr/trunk/PKGBUILD

----------+
 PKGBUILD |   52 ++++++++++------------------------------------------
 1 file changed, 10 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2020-02-13 11:33:56 UTC (rev 570119)
+++ PKGBUILD    2020-02-13 11:35:52 UTC (rev 570120)
@@ -2,68 +2,36 @@
 # Contributor: Simon Sapin <simon dot sapin at exyr dot org>
 # Contributor: Kyle Keen <keen...@gmail.com>
 
-pkgbase=python-stestr
-pkgname=(python-stestr python2-stestr)
+pkgname=python-stestr
 pkgver=2.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A test runner runner similar to testrepository"
 url="https://stestr.readthedocs.io/en/latest/";
 license=('Apache')
 arch=('any')
-makedepends=('python-future' 'python2-future' 'python-pbr' 'python2-pbr' 
'python-cliff'
-             'python2-cliff' 'python-subunit' 'python2-subunit' 
'python-fixtures' 'python2-fixtures'
-             'python-testtools' 'python2-testtools' 'python-yaml' 
'python2-yaml' 'python-voluptuous'
-             'python2-voluptuous')
-checkdepends=('python-hacking' 'python2-hacking' 'python-sphinx' 
'python2-sphinx' 'python-mock'
-              'python2-mock' 'python-subunit2sql' 'python2-subunit2sql' 
'python-coverage'
-              'python2-coverage' 'python-ddt' 'python2-ddt')
+depends=('python-future' 'python-cliff' 'python-pbr' 'python-subunit' 
'python-fixtures'
+         'python-testtools' 'python-yaml' 'python-voluptuous')
+checkdepends=('python-hacking' 'python-sphinx' 'python-mock' 
'python-subunit2sql' 'python-coverage'
+              'python-ddt')
 source=("https://pypi.io/packages/source/s/stestr/stestr-$pkgver.tar.gz";)
 
sha512sums=('687e8fb7bcf011e3d84d012cd7389accb8e81633ec069df4fb501d0457cdf6147b9820bf24cb49c63e6698d1b8494f50576a8f0dc9e99c36fc175cd9ce88b7bd')
 
-prepare() {
-  cp -a stestr-$pkgver{,-py2}
-}
-
 build() {
-  cd "$srcdir"/stestr-$pkgver
+  cd stestr-$pkgver
   python setup.py build
-
-  cd "$srcdir"/stestr-$pkgver-py2
-  python2 setup.py build
 }
 
 check() {
-  cd "$srcdir"/stestr-$pkgver
+  cd stestr-$pkgver
   python setup.py install --root="$PWD/tmp_install" --optimize=1
   (
     export PYTHONPATH="$PWD/tmp_install/usr/lib/python3.8/site-packages"
     export PATH="$PWD/tmp_install/usr/bin:$PATH"
-    stestr run || warning "Tests failed"
+    stestr run
   )
-
-  cd "$srcdir"/stestr-$pkgver-py2
-  python2 setup.py install --root="$PWD/tmp_install" --optimize=1
-  (
-    export PYTHONPATH="$PWD/tmp_install/usr/lib/python2.7/site-packages"
-    export PATH="$PWD/tmp_install/usr/bin:$PATH"
-    stestr run || warning "Tests failed"
-  )
 }
 
-package_python-stestr() {
-  depends=('python-future' 'python-cliff' 'python-pbr' 'python-subunit' 
'python-fixtures'
-           'python-testtools' 'python-yaml' 'python-voluptuous')
-
+package() {
   cd stestr-$pkgver
   python setup.py install --root="$pkgdir" --optimize=1
 }
-
-package_python2-stestr() {
-  depends=('python2-future' 'python2-cliff' 'python2-pbr' 'python2-subunit' 
'python2-fixtures'
-           'python2-testtools' 'python2-yaml' 'python2-voluptuous')
-
-  cd stestr-$pkgver-py2
-  python2 setup.py install --root="$pkgdir" --optimize=1
-
-  mv "$pkgdir"/usr/bin/stestr{,2}
-}

Reply via email to