[arch-commits] Commit in python-os-client-config/repos/community-any (2 files)

Felix Yan felixonmars at archlinux.org
Wed May 23 07:38:56 UTC 2018


    Date: Wednesday, May 23, 2018 @ 07:38:55
  Author: felixonmars
Revision: 328032

archrelease: copy trunk to community-any

Added:
  python-os-client-config/repos/community-any/PKGBUILD
    (from rev 328031, python-os-client-config/trunk/PKGBUILD)
Deleted:
  python-os-client-config/repos/community-any/PKGBUILD

----------+
 PKGBUILD |  118 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-23 07:38:25 UTC (rev 328031)
+++ PKGBUILD	2018-05-23 07:38:55 UTC (rev 328032)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgbase=python-os-client-config
-pkgname=('python-os-client-config' 'python2-os-client-config')
-pkgver=1.29.0
-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')
-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')
-
-prepare() {
-  # FS#54781
-  # 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
-
-  cp -a os-client-config-$pkgver{,-py2}
-
-  export PBR_VERSION=$pkgver
-}
-
-build() {
-  cd "$srcdir"/os-client-config-$pkgver
-  python setup.py build
-
-  cd "$srcdir"/os-client-config-$pkgver-py2
-  python2 setup.py build
-}
-
-check() {
-  cd "$srcdir"/os-client-config-$pkgver
-  stestr run || warning "Tests failed"
-
-  cd "$srcdir"/os-client-config-$pkgver-py2
-  stestr2 run || warning "Tests failed"
-}
-
-package_python-os-client-config() {
-  depends=('python-yaml' 'python-appdirs' 'python-keystoneauth1' 'python-requestsexceptions')
-
-  cd os-client-config-$pkgver
-  python setup.py install --root "$pkgdir" --optimize=1
-}
-
-package_python2-os-client-config() {
-  depends=('python2-yaml' 'python2-appdirs' 'python2-keystoneauth1' 'python2-requestsexceptions')
-
-  cd os-client-config-$pkgver-py2
-  python2 setup.py install --root "$pkgdir" --optimize=1
-}

Copied: python-os-client-config/repos/community-any/PKGBUILD (from rev 328031, python-os-client-config/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-05-23 07:38:55 UTC (rev 328032)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgbase=python-os-client-config
+pkgname=('python-os-client-config' 'python2-os-client-config')
+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-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=('35461f4a4006ffc57dda3822afa0b9949f5fd033bc1f2f06961b49f60e40e14b03ee19af282f0c2b225ae07dafa2255912bb0ab38127d8749bd3b857b5f75e48')
+
+prepare() {
+  # FS#54781
+  # 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
+}
+
+build() {
+  cd "$srcdir"/os-client-config-$pkgver
+  python setup.py build
+
+  cd "$srcdir"/os-client-config-$pkgver-py2
+  python2 setup.py build
+}
+
+check() {
+  cd "$srcdir"/os-client-config-$pkgver
+  stestr run
+
+  cd "$srcdir"/os-client-config-$pkgver-py2
+  stestr2 run
+}
+
+package_python-os-client-config() {
+  depends=('python-openstacksdk')
+
+  cd os-client-config-$pkgver
+  python setup.py install --root "$pkgdir" --optimize=1
+}
+
+package_python2-os-client-config() {
+  depends=('python2-openstacksdk')
+
+  cd os-client-config-$pkgver-py2
+  python2 setup.py install --root "$pkgdir" --optimize=1
+}



More information about the arch-commits mailing list