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

[Felix Yan]

    Date: Thursday, February 13, 2020 @ 13:48:52
  Author: felixonmars
Revision: 570412

upgpkg: python-oslo-config 6.12.0-3: remove python2 sibling

Modified:
  python-oslo-config/trunk/PKGBUILD

----------+
 PKGBUILD |   36 ++++++++----------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-13 13:45:51 UTC (rev 570411)
+++ PKGBUILD	2020-02-13 13:48:52 UTC (rev 570412)
@@ -1,30 +1,23 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 # Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
 
-pkgbase=python-oslo-config
-pkgname=(python-oslo-config python2-oslo-config)
+pkgname=python-oslo-config
 pkgver=6.12.0
-pkgrel=2
+pkgrel=3
 pkgdesc="parsing command line arguments and .ini style configuration files"
 arch=('any')
 url="https://pypi.python.org/pypi/oslo.config/$pkgver"
 license=('Apache')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-netaddr' 'python2-netaddr'
-             'python-stevedore' 'python2-stevedore' 'python-debtcollector' 'python2-debtcollector'
-             'python-oslo-i18n' 'python2-oslo-i18n' 'python-rfc3986' 'python2-rfc3986'
-             'python-yaml' 'python2-yaml' 'python2-enum34')
+depends=('python-six' 'python-netaddr' 'python-stevedore' 'python-debtcollector'
+         'python-oslo-i18n' 'python-rfc3986' 'python-yaml')
+makedepends=('python-setuptools')
 checkdepends=('python-oslotest' 'python-sphinx' 'python-requests-mock' 'python-oslo-log')
 options=('!emptydirs')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/openstack/oslo.config/archive/$pkgver.tar.gz")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/openstack/oslo.config/archive/$pkgver.tar.gz")
 sha512sums=('8a7fd522c6535a2b5e0863a1c839dda28cecd246b1c245181b523d5ca2eff32f5e27bb3fbaac60aa415fe3572310c6357bc6bff37cd842b88ce78e563c9f5e76')
 
 export PBR_VERSION=$pkgver
 
-prepare() {
-  cp -a oslo.config-$pkgver{,-py2}
-  find oslo.config-$pkgver-py2 -name \*.py -exec sed -i '1s/python$/&2/' {} +
-}
-
 build() {
   cd oslo.config-$pkgver
   python setup.py build
@@ -35,22 +28,9 @@
   stestr run
 }
 
-package_python-oslo-config() {
-  depends=('python-six' 'python-netaddr' 'python-stevedore' 'python-debtcollector'
-           'python-oslo-i18n' 'python-rfc3986' 'python-yaml')
-
-  cd "$srcdir"/oslo.config-$pkgver
+package() {
+  cd oslo.config-$pkgver
   python setup.py install --root="$pkgdir/" --optimize=1
 }
 
-package_python2-oslo-config() {
-  depends=('python2-six' 'python2-netaddr' 'python2-stevedore' 'python2-debtcollector'
-           'python2-oslo-i18n' 'python2-rfc3986' 'python2-yaml' 'python2-enum34')
-
-  cd "$srcdir"/oslo.config-$pkgver-py2
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-  mv "$pkgdir"/usr/bin/oslo-config-generator{,2}
-  mv "$pkgdir"/usr/bin/oslo-config-validator{,2}
-}
-
 # vim:set ts=2 sw=2 et: