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

Felix Yan felixonmars at archlinux.org
Tue Mar 19 17:30:36 UTC 2019


    Date: Tuesday, March 19, 2019 @ 17:30:34
  Author: felixonmars
Revision: 442777

upgpkg: python-cinderclient 4.1.0-2

remove python2 sibling

Modified:
  python-cinderclient/trunk/PKGBUILD

----------+
 PKGBUILD |   52 +++++++++++++---------------------------------------
 1 file changed, 13 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-19 17:25:14 UTC (rev 442776)
+++ PKGBUILD	2019-03-19 17:30:34 UTC (rev 442777)
@@ -1,62 +1,36 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 # Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
 
-pkgbase=python-cinderclient
-pkgname=(python-cinderclient python2-cinderclient)
+pkgname=python-cinderclient
 pkgver=4.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenStack Block Storage API Client Library"
 arch=('any')
 url="http://docs.openstack.org/developer/python-cinderclient"
 license=('Apache')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-pbr' 'python2-pbr' 'python-babel'
-             'python2-babel' 'python-prettytable' 'python2-prettytable' 'python-keystoneclient'
-             'python2-keystoneclient' 'python-requests' 'python2-requests' 'python-oslo-utils'
-             'python2-oslo-utils')
-checkdepends=('python-oslotest' 'python2-oslotest' 'python-requests-mock' 'python2-requests-mock'
-              'python-ddt' 'python2-ddt' 'python-stestr' 'python2-stestr')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/openstack/python-cinderclient/archive/$pkgver.tar.gz")
+depends=('python-six' 'python-pbr' 'python-babel' 'python-prettytable' 'python-keystoneclient'
+         'python-requests' 'python-oslo-utils')
+checkdepends=('python-oslotest' 'python-requests-mock' 'python-ddt')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/openstack/python-cinderclient/archive/$pkgver.tar.gz")
 sha512sums=('c436dbc6fb840a301d1b3f5461f5614759ee7a81923d00d71c8e60f12c7bee1523710c516a38da0b482eedd282b371db77c9ff9abad3d42bc29db22f1081a6bc')
 
+export PBR_VERSION=$pkgver
+
 prepare() {
   sed -i '/simplejson/d' python-cinderclient-$pkgver/requirements.txt
-  cp -a python-cinderclient-$pkgver{,-py2}
-
-  export PBR_VERSION=$pkgver
 }
 
 build() {
-  cd "$srcdir"/python-cinderclient-$pkgver
+  cd python-cinderclient-$pkgver
   python setup.py build
-
-  cd "$srcdir"/python-cinderclient-$pkgver-py2
-  python2 setup.py build
 }
 
 check() {
-  cd "$srcdir"/python-cinderclient-$pkgver
-  stestr run || warning "Tests failed"
-
-  cd "$srcdir"/python-cinderclient-$pkgver-py2
-  PYTHON=python2 stestr2 run
+  cd python-cinderclient-$pkgver
+  stestr run
 }
 
-package_python-cinderclient() {
-  depends=('python-six' 'python-pbr' 'python-babel' 'python-prettytable' 'python-keystoneclient'
-           'python-requests' 'python-oslo-utils')
-
-  cd "$srcdir"/python-cinderclient-$pkgver
+package() {
+  cd python-cinderclient-$pkgver
   python setup.py install --root="$pkgdir" --optimize=1
 }
-
-package_python2-cinderclient() {
-  depends=('python2-six' 'python2-pbr' 'python2-babel' 'python2-prettytable'
-           'python2-keystoneclient' 'python2-requests' 'python2-oslo-utils')
-
-  cd "$srcdir"/python-cinderclient-$pkgver-py2
-  python2 setup.py install --root="$pkgdir" --optimize=1
-
-  mv "$pkgdir"/usr/bin/cinder{,2}
-}
-
-# vim:set ts=2 sw=2 et:


More information about the arch-commits mailing list