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

[Antonio Rojas via arch-commits]

    Date: Saturday, November 9, 2019 @ 19:41:31
  Author: arojas
Revision: 524872

Drop python2

Modified:
  python-daiquiri/trunk/PKGBUILD

----------+
 PKGBUILD |   33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2019-11-09 19:38:39 UTC (rev 524871)
+++ PKGBUILD    2019-11-09 19:41:31 UTC (rev 524872)
@@ -1,7 +1,6 @@
 # Maintainer: Felix Yan <felixonm...@archlinux.org>
 
-pkgbase=python-daiquiri
-pkgname=('python-daiquiri' 'python2-daiquiri')
+pkgname=python-daiquiri
 pkgver=1.6.0
 pkgrel=3
 pkgdesc='Library to configure Python logging easily'
@@ -8,15 +7,14 @@
 arch=('any')
 license=('Apache')
 url='https://github.com/jd/daiquiri'
-makedepends=('python-pbr' 'python2-pbr')
-checkdepends=('python-testrepository' 'python2-testrepository' 
'python-testtools'
-              'python2-testtools' 'python-json-logger' 'python2-json-logger')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/jd/daiquiri/archive/$pkgver.tar.gz";)
+depends=('python')
+optdepends=('python-json-logger: For JSON support')
+makedepends=('python-pbr')
+checkdepends=('python-testrepository' 'python-testtools' 'python-json-logger')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/jd/daiquiri/archive/$pkgver.tar.gz";)
 
sha512sums=('29eb2aa70267042703307ad7776ad022620f08f9edd23b0be97e4afde1c2efa6193a928d04dfdf410220bceec4bc2a3288a614a1a7259df891751488d62bf629')
 
 prepare() {
-  cp -a daiquiri-$pkgver{,-py2}
-
   export PBR_VERSION=$pkgver
 }
 
@@ -23,33 +21,16 @@
 build() {
   cd "$srcdir"/daiquiri-$pkgver
   python setup.py build
-
-  cd "$srcdir"/daiquiri-$pkgver-py2
-  python2 setup.py build
 }
 
 check() {
   cd "$srcdir"/daiquiri-$pkgver
   python setup.py testr
-
-  cd "$srcdir"/daiquiri-$pkgver-py2
-  python2 setup.py testr
 }
 
-package_python-daiquiri() {
-  depends=('python')
-  optdepends=('python-json-logger: For JSON support')
-
+package() {
   cd daiquiri-$pkgver
   python setup.py install --root="$pkgdir" --optimize=1
 }
 
-package_python2-daiquiri() {
-  depends=('python2')
-  optdepends=('python2-json-logger: For JSON support')
-
-  cd daiquiri-$pkgver-py2
-  python2 setup.py install --root="$pkgdir" --optimize=1
-}
-
 # vim:set ts=2 sw=2 et: