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

[Felix Yan]

    Date: Thursday, February 13, 2020 @ 13:31:21
  Author: felixonmars
Revision: 570328

upgpkg: python-oslo-log 4.0.0-3: remove python2 sibling

Modified:
  python-oslo-log/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-13 13:31:21 UTC (rev 570327)
+++ PKGBUILD	2020-02-13 13:31:21 UTC (rev 570328)
@@ -1,23 +1,20 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 # Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
 
-pkgbase=python-oslo-log
-pkgname=(python-oslo-log python2-oslo-log)
+pkgname=python-oslo-log
 pkgver=4.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Oslo Logging Library"
 arch=('any')
 url="https://pypi.python.org/pypi/oslo.log/$pkgver"
 license=('Apache')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-pbr' 'python2-pbr' 'python-oslo-config'
-             'python2-oslo-config' 'python-oslo-context' 'python2-oslo-context' 'python-oslo-i18n'
-             'python2-oslo-i18n' 'python-oslo-utils' 'python2-oslo-utils' 'python-oslo-serialization'
-             'python2-oslo-serialization' 'python-debtcollector' 'python2-debtcollector'
-             'python-pyinotify' 'python2-pyinotify' 'python-dateutil' 'python2-dateutil'
-             'python-monotonic' 'python2-monotonic')
+depends=('python-six' 'python-pbr' 'python-oslo-config' 'python-oslo-context' 'python-oslo-i18n'
+         'python-oslo-utils' 'python-oslo-serialization' 'python-debtcollector' 'python-pyinotify'
+         'python-dateutil' 'python-monotonic')
+makedepends=('python-setuptools')
 checkdepends=('python-mock' 'python-oslotest')
 options=('!emptydirs')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/openstack/oslo.log/archive/$pkgver.tar.gz")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/openstack/oslo.log/archive/$pkgver.tar.gz")
 sha512sums=('aaa937632aedeb00262880a9729a15e07c533becf02f5666408d4b238f813dbd2f1c323aa04e026622b71e06555d6a5472b0f87d572026baa9774d77820a2fab')
 
 export PBR_VERSION=$pkgver
@@ -24,15 +21,11 @@
 
 prepare() {
   sed -i 's/unittest2/unittest/g' oslo.log-$pkgver/oslo_log/tests/unit/*.py
-  cp -a oslo.log-$pkgver{,-py2}
 }
 
 build() {
-  cd "$srcdir"/oslo.log-$pkgver
+  cd oslo.log-$pkgver
   python setup.py build
-
-  cd "$srcdir"/oslo.log-$pkgver-py2
-  python2 setup.py build
 }
 
 check() {
@@ -40,24 +33,9 @@
   stestr run
 }
 
-package_python-oslo-log() {
-  depends=('python-six' 'python-pbr' 'python-oslo-config' 'python-oslo-context' 'python-oslo-i18n'
-           'python-oslo-utils' 'python-oslo-serialization' 'python-debtcollector' 'python-pyinotify'
-           'python-dateutil' 'python-monotonic')
-
-  cd "$srcdir"/oslo.log-$pkgver
+package() {
+  cd oslo.log-$pkgver
   python setup.py install --root="$pkgdir" --optimize=1
 }
 
-package_python2-oslo-log() {
-  depends=('python2-six' 'python2-pbr' 'python2-oslo-config' 'python2-oslo-context' 'python2-oslo-i18n'
-           'python2-oslo-utils' 'python2-oslo-serialization' 'python2-debtcollector' 'python2-pyinotify'
-           'python2-dateutil' 'python2-monotonic')
-
-  cd "$srcdir"/oslo.log-$pkgver-py2
-  python2 setup.py install --root="$pkgdir" --optimize=1
-
-  mv "$pkgdir"/usr/bin/convert-json{,2}
-}
-
 # vim:set ts=2 sw=2 et: