Date: Tuesday, May 7, 2019 @ 19:40:50 Author: felixonmars Revision: 462458
upgpkg: python-osc-lib 1.12.1-2 remove python2 sibling Modified: python-osc-lib/trunk/PKGBUILD ----------+ PKGBUILD | 52 ++++++++++++++-------------------------------------- 1 file changed, 14 insertions(+), 38 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-05-07 19:40:28 UTC (rev 462457) +++ PKGBUILD 2019-05-07 19:40:50 UTC (rev 462458) @@ -1,23 +1,19 @@ # Maintainer: Felix Yan <[email protected]> # Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> -pkgbase=python-osc-lib -pkgname=(python-osc-lib python2-osc-lib) +pkgname=python-osc-lib pkgver=1.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="OpenStackClient Library" arch=('any') url="https://docs.openstack.org/osc-lib/latest/"; license=('Apache') -makedepends=('git' 'python-setuptools' 'python2-setuptools' 'python-pbr' 'python2-pbr' - 'python-babel' 'python2-babel' 'python-cliff' 'python2-cliff' - 'python-keystoneauth1' 'python2-keystoneauth1' 'python-os-client-config' - 'python2-os-client-config' 'python-oslo-i18n' 'python2-oslo-i18n' 'python-oslo-utils' - 'python2-oslo-utils' 'python-simplejson' 'python2-simplejson' 'python-stevedore' - 'python2-stevedore' 'python-openstacksdk' 'python2-openstacksdk') -checkdepends=('python-oslotest' 'python2-oslotest' 'python-requests-mock' - 'python2-requests-mock' 'python-testrepository' 'python2-testrepository') -source=("$pkgbase-$pkgver.tar.gz::https://github.com/openstack/osc-lib/archive/$pkgver.tar.gz";) +depends=('python-six' 'python-pbr' 'python-babel' 'python-cliff' 'python-keystoneauth1' + 'python-os-client-config' 'python-oslo-i18n' 'python-oslo-utils' 'python-stevedore' + 'python-simplejson' 'python-openstacksdk') +makedepends=('python-setuptools') +checkdepends=('python-oslotest' 'python-requests-mock') +source=("$pkgname-$pkgver.tar.gz::https://github.com/openstack/osc-lib/archive/$pkgver.tar.gz";) sha512sums=('211d5f67f732e7f541b7542fe116a6653b9871c5b3b20f31d24f4768fd32629944e9eb8b7d7f636942e10eb106397178aca7fff1dc97e9d05c6e3c29c7007a6c') export PBR_VERSION=$pkgver @@ -25,41 +21,21 @@ prepare() { # https://storyboard.openstack.org/#!/story/2003142 sed -i 's/issubclass/isinstance/' osc-lib-$pkgver/osc_lib/utils/__init__.py - cp -a osc-lib-$pkgver{,-py2} + + sed -i 's/assertItemsEqual/assertCountEqual/' osc-lib-$pkgver/osc_lib/tests/cli/*.py } build() { - cd "$srcdir"/osc-lib-$pkgver + cd osc-lib-$pkgver python setup.py build - - cd "$srcdir"/osc-lib-$pkgver-py2 - python2 setup.py build } check() { - cd "$srcdir"/osc-lib-$pkgver - stestr run || warning "Tests failed" - - cd "$srcdir"/osc-lib-$pkgver-py2 - PYTHON=python2 stestr2 run || warning "Tests failed" + cd osc-lib-$pkgver + stestr run } -package_python-osc-lib() { - depends=('python-six' 'python-pbr' 'python-babel' 'python-cliff' 'python-keystoneauth1' - 'python-os-client-config' 'python-oslo-i18n' 'python-oslo-utils' 'python-stevedore' - 'python-simplejson' 'python-openstacksdk') - +package() { cd osc-lib-$pkgver python setup.py install --root="$pkgdir" --optimize=1 } - -package_python2-osc-lib() { - depends=('python2-six' 'python2-pbr' 'python2-babel' 'python2-cliff' 'python2-keystoneauth1' - 'python2-os-client-config' 'python2-oslo-i18n' 'python2-oslo-utils' 'python2-stevedore' - 'python2-simplejson' 'python2-openstacksdk') - - cd osc-lib-$pkgver-py2 - python2 setup.py install --root="$pkgdir" --optimize=1 -} - -# vim:set ts=2 sw=2 et:
