[arch-commits] Commit in python-heatclient/repos/community-any (3 files)

[Felix Yan]

    Date: Thursday, January 27, 2022 @ 08:39:36
  Author: felixonmars
Revision: 1116212

archrelease: copy trunk to community-any

Added:
  python-heatclient/repos/community-any/PKGBUILD
    (from rev 1116211, python-heatclient/trunk/PKGBUILD)
Deleted:
  python-heatclient/repos/community-any/PKGBUILD
  python-heatclient/repos/community-any/python310.patch

-----------------+
 PKGBUILD        |   73 ++++++++++++++++++++++++------------------------------
 python310.patch |   16 -----------
 2 files changed, 33 insertions(+), 56 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-27 08:39:27 UTC (rev 1116211)
+++ PKGBUILD	2022-01-27 08:39:36 UTC (rev 1116212)
@@ -1,40 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
-
-pkgname=python-heatclient
-pkgver=2.4.0
-pkgrel=2
-pkgdesc="OpenStack Orchestration API Client Library"
-arch=('any')
-url="https://docs.openstack.org/python-heatclient/latest/"
-license=('Apache')
-depends=('python-babel' 'python-pbr' 'python-cliff' 'python-iso8601' 'python-osc-lib'
-         'python-prettytable' 'python-oslo-i18n' 'python-oslo-serialization' 'python-oslo-utils'
-         'python-keystoneauth1' 'python-swiftclient' 'python-yaml' 'python-requests' 'python-six')
-checkdepends=('python-stestr' 'python-testscenarios' 'python-requests-mock')
-source=("https://github.com/openstack/python-heatclient/archive/$pkgver/$pkgname-$pkgver.tar.gz"
-        python310.patch)
-sha512sums=('1c6e64dd7d799d0ea7c29fbb36959c9e61cce620535b9952d05bf74cef48ded34465e7c3ab1fb1aefe60104c8cdf837047a68af6560fc37cf5a924962b9a8b99'
-            '54b651d540235e83f1a7ef96c62f11c842564dbb522c6fe4ec9e5dfb42e965317d99d70bd1d6b2068b9a33159de4f40958f1b61a9439026f808e6fd9c70bd168')
-
-export PBR_VERSION=$pkgver
-
-prepare() {
-  cd python-heatclient-$pkgver
-  patch -Np1 -i ../python310.patch
-}
-
-build() {
-  cd python-heatclient-$pkgver
-  python setup.py build
-}
-
-check() {
-  cd python-heatclient-$pkgver
-  stestr run
-}
-
-package() {
-  cd python-heatclient-$pkgver
-  python setup.py install --root="$pkgdir" --optimize=1
-}

Copied: python-heatclient/repos/community-any/PKGBUILD (from rev 1116211, python-heatclient/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-01-27 08:39:36 UTC (rev 1116212)
@@ -0,0 +1,33 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+
+pkgname=python-heatclient
+pkgver=2.5.0
+pkgrel=1
+pkgdesc="OpenStack Orchestration API Client Library"
+arch=('any')
+url="https://docs.openstack.org/python-heatclient/latest/"
+license=('Apache')
+depends=('python-babel' 'python-pbr' 'python-cliff' 'python-iso8601' 'python-osc-lib'
+         'python-prettytable' 'python-oslo-i18n' 'python-oslo-serialization' 'python-oslo-utils'
+         'python-keystoneauth1' 'python-swiftclient' 'python-yaml' 'python-requests' 'python-six')
+checkdepends=('python-stestr' 'python-testscenarios' 'python-requests-mock')
+source=("https://github.com/openstack/python-heatclient/archive/$pkgver/$pkgname-$pkgver.tar.gz")
+sha512sums=('c60ad8cdca9349e5d135ac3a39365588dcb7a64a77684a85c4497cc8db103ff1b9e5077ed9c67688db89c7c4d336912898b826fb9272c1ea94fb2b07b6e0e2ab')
+
+export PBR_VERSION=$pkgver
+
+build() {
+  cd python-heatclient-$pkgver
+  python setup.py build
+}
+
+check() {
+  cd python-heatclient-$pkgver
+  stestr run
+}
+
+package() {
+  cd python-heatclient-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1
+}

Deleted: python310.patch
===================================================================
--- python310.patch	2022-01-27 08:39:27 UTC (rev 1116211)
+++ python310.patch	2022-01-27 08:39:36 UTC (rev 1116212)
@@ -1,16 +0,0 @@
-diff -upr python-heatclient-2.4.0.orig/heatclient/common/template_utils.py python-heatclient-2.4.0/heatclient/common/template_utils.py
---- python-heatclient-2.4.0.orig/heatclient/common/template_utils.py	2021-07-06 15:24:33.000000000 +0300
-+++ python-heatclient-2.4.0/heatclient/common/template_utils.py	2021-12-07 00:15:41.635946307 +0200
-@@ -203,10 +203,10 @@ def deep_update(old, new):
-         old = {}
- 
-     for k, v in new.items():
--        if isinstance(v, collections.Mapping):
-+        if isinstance(v, collections.abc.Mapping):
-             r = deep_update(old.get(k, {}), v)
-             old[k] = r
--        elif v is None and isinstance(old.get(k), collections.Mapping):
-+        elif v is None and isinstance(old.get(k), collections.abc.Mapping):
-             # Don't override empty data, to work around yaml syntax issue
-             pass
-         else: