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

[Felix Yan]

    Date: Wednesday, May 23, 2018 @ 07:38:25
  Author: felixonmars
Revision: 328031

upgpkg: python-os-client-config 1.31.1-1

Modified:
  python-os-client-config/trunk/PKGBUILD

----------+
 PKGBUILD |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-23 07:37:52 UTC (rev 328030)
+++ PKGBUILD	2018-05-23 07:38:25 UTC (rev 328031)
@@ -3,20 +3,18 @@
 
 pkgbase=python-os-client-config
 pkgname=('python-os-client-config' 'python2-os-client-config')
-pkgver=1.29.0
+pkgver=1.31.1
 pkgrel=1
 arch=('any')
 pkgdesc='OpenStack Client Configuation Library'
 url='https://github.com/openstack/os-client-config'
 license=('Apache')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-yaml' 'python2-yaml'
-             'python-appdirs' 'python2-appdirs' 'python-keystoneauth1' 'python2-keystoneauth1'
-             'python-requestsexceptions' 'python2-requestsexceptions')
+makedepends=('python-setuptools' 'python2-setuptools' 'python-openstacksdk' 'python2-openstacksdk')
 checkdepends=('python-stestr' 'python2-stestr' 'python-oslotest' 'python2-oslotest'
               'python-jsonschema' 'python2-jsonschema' 'python-mock' 'python2-mock'
               'python-glanceclient' 'python2-glanceclient')
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/openstack/os-client-config/archive/$pkgver.tar.gz")
-sha512sums=('759a5c8da26a291346be9ee5ea304ce49372019f8b9db7ac06190e8d360cf9d493902879baa30d28e2b579257c781d9cd437941796244e95c6570a794fad539d')
+sha512sums=('35461f4a4006ffc57dda3822afa0b9949f5fd033bc1f2f06961b49f60e40e14b03ee19af282f0c2b225ae07dafa2255912bb0ab38127d8749bd3b857b5f75e48')
 
 prepare() {
   # FS#54781
@@ -23,6 +21,8 @@
   # https://bugs.launchpad.net/os-client-config/+bug/1707019
   sed -i "/^packages =/i package_data = os_client_config = *.json */*.json" os-client-config-$pkgver/setup.cfg
 
+  sed -i 's/assertItemsEqual/assertCountEqual/' os-client-config-$pkgver/os_client_config/tests/test_config.py
+
   cp -a os-client-config-$pkgver{,-py2}
 
   export PBR_VERSION=$pkgver
@@ -38,14 +38,14 @@
 
 check() {
   cd "$srcdir"/os-client-config-$pkgver
-  stestr run || warning "Tests failed"
+  stestr run
 
   cd "$srcdir"/os-client-config-$pkgver-py2
-  stestr2 run || warning "Tests failed"
+  stestr2 run
 }
 
 package_python-os-client-config() {
-  depends=('python-yaml' 'python-appdirs' 'python-keystoneauth1' 'python-requestsexceptions')
+  depends=('python-openstacksdk')
 
   cd os-client-config-$pkgver
   python setup.py install --root "$pkgdir" --optimize=1
@@ -52,7 +52,7 @@
 }
 
 package_python2-os-client-config() {
-  depends=('python2-yaml' 'python2-appdirs' 'python2-keystoneauth1' 'python2-requestsexceptions')
+  depends=('python2-openstacksdk')
 
   cd os-client-config-$pkgver-py2
   python2 setup.py install --root "$pkgdir" --optimize=1