[arch-commits] Commit in python-openstackclient/repos/community-any (4 files)

[Felix Yan]

    Date: Wednesday, July 15, 2020 @ 08:36:00
  Author: felixonmars
Revision: 663858

archrelease: copy trunk to community-any

Added:
  python-openstackclient/repos/community-any/PKGBUILD
    (from rev 663857, python-openstackclient/trunk/PKGBUILD)
  python-openstackclient/repos/community-any/entry-point-compatibility.patch
    (from rev 663857, python-openstackclient/trunk/entry-point-compatibility.patch)
Deleted:
  python-openstackclient/repos/community-any/PKGBUILD
  python-openstackclient/repos/community-any/entry-point-compatibility.patch

---------------------------------+
 PKGBUILD                        |   73 +++++++++++++++++---------------------
 entry-point-compatibility.patch |   60 +++++++++++++++----------------
 2 files changed, 63 insertions(+), 70 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-15 08:35:44 UTC (rev 663857)
+++ PKGBUILD	2020-07-15 08:36:00 UTC (rev 663858)
@@ -1,40 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
-
-pkgname=python-openstackclient
-pkgver=5.3.0
-pkgrel=2
-pkgdesc="OpenStack Command-line Client"
-arch=('any')
-url="https://docs.openstack.org/python-openstackclient/latest/"
-license=('Apache')
-depends=('python-six' 'python-pbr' 'python-babel' 'python-cliff' 'python-keystoneclient'
-         'python-keystoneauth1' 'python-osc-lib' 'python-oslo-utils' 'python-oslo-i18n'
-         'python-openstacksdk' 'python-glanceclient' 'python-novaclient' 'python-cinderclient')
-checkdepends=('python-ddt' 'python-oslotest' 'python-requests-mock')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/openstack/python-openstackclient/archive/$pkgver.tar.gz"
-        entry-point-compatibility.patch)
-sha512sums=('b13f0e3186ffb6e3e234785b65c79e7d5a8e822d0d1c1d8421cdd33671a7ce3320f77b8f2d2cefe6e4a8eec132dd48d9e3690ae798bb90dc09be9706e1f881bc'
-            '6e4119dda5b36f2eb5e2b7f5f4af1e1b2885bed32676b9652eb1d2c0a992b67406f717ff7d57e80c63dde87b160f9680f1aeeac348344050f66629d886ab756f')
-
-export PBR_VERSION=$pkgver
-
-prepare() {
-  cd python-openstackclient-$pkgver
-  patch -p1 -i ../entry-point-compatibility.patch
-}
-
-build() {
-  cd python-openstackclient-$pkgver
-  python setup.py build
-}
-
-check() {
-  cd python-openstackclient-$pkgver
-  stestr run || warning "Tests failed: https://storyboard.openstack.org/#!/story/2003143"
-}
-
-package() {
-  cd python-openstackclient-$pkgver
-  python setup.py install --root="$pkgdir" --optimize=1
-}

Copied: python-openstackclient/repos/community-any/PKGBUILD (from rev 663857, python-openstackclient/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-15 08:36:00 UTC (rev 663858)
@@ -0,0 +1,33 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+
+pkgname=python-openstackclient
+pkgver=5.3.1
+pkgrel=1
+pkgdesc="OpenStack Command-line Client"
+arch=('any')
+url="https://docs.openstack.org/python-openstackclient/latest/"
+license=('Apache')
+depends=('python-six' 'python-pbr' 'python-babel' 'python-cliff' 'python-keystoneclient'
+         'python-keystoneauth1' 'python-osc-lib' 'python-oslo-utils' 'python-oslo-i18n'
+         'python-openstacksdk' 'python-glanceclient' 'python-novaclient' 'python-cinderclient')
+checkdepends=('python-ddt' 'python-oslotest' 'python-requests-mock')
+source=("https://github.com/openstack/python-openstackclient/archive/$pkgver/$pkgname-$pkgver.tar.gz")
+sha512sums=('52f964e96a9b1b2e0c31ccf5be2b66cf4d4ccf83cc6c8bc1e49afea0f6d90200065b174c57b0cd89c8c21f01229415dc494fc98bdae9845a1c9f63635bcf60f0')
+
+export PBR_VERSION=$pkgver
+
+build() {
+  cd python-openstackclient-$pkgver
+  python setup.py build
+}
+
+check() {
+  cd python-openstackclient-$pkgver
+  stestr run || warning "Tests failed: https://storyboard.openstack.org/#!/story/2003143"
+}
+
+package() {
+  cd python-openstackclient-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1
+}

Deleted: entry-point-compatibility.patch
===================================================================
--- entry-point-compatibility.patch	2020-07-15 08:35:44 UTC (rev 663857)
+++ entry-point-compatibility.patch	2020-07-15 08:36:00 UTC (rev 663858)
@@ -1,30 +0,0 @@
-commit 9d0d64df8b5569f02892b1fd8690043bea7bfde7
-Author: Felix Yan <felixonmars at archlinux.org>
-Date:   Tue Jul 14 01:02:00 2020 +0800
-
-    Fix compatibility issue in 5.3
-    
-    The offending entry point object looks like:
-    EntryPoint(name='compute', value='openstackclient.compute.client',
-    group='openstack.cli.base')
-    
-    Fixes https://storyboard.openstack.org/#!/story/2007917
-    
-    Change-Id: I0f3cc62e23efdc14203ce6645581d5ba5dbf7fa0
-
-diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
-index 66dc880e..36c3ce26 100644
---- a/openstackclient/common/clientmanager.py
-+++ b/openstackclient/common/clientmanager.py
-@@ -154,7 +154,10 @@ def get_plugin_modules(group):
-         try:
-             module_name = ep.entry_point.module_name
-         except AttributeError:
--            module_name = ep.entry_point.module
-+            try:
-+                module_name = ep.entry_point.module
-+            except AttributeError:
-+                module_name = ep.entry_point.value
- 
-         try:
-             module = importlib.import_module(module_name)

Copied: python-openstackclient/repos/community-any/entry-point-compatibility.patch (from rev 663857, python-openstackclient/trunk/entry-point-compatibility.patch)
===================================================================
--- entry-point-compatibility.patch	                        (rev 0)
+++ entry-point-compatibility.patch	2020-07-15 08:36:00 UTC (rev 663858)
@@ -0,0 +1,30 @@
+commit 9d0d64df8b5569f02892b1fd8690043bea7bfde7
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Tue Jul 14 01:02:00 2020 +0800
+
+    Fix compatibility issue in 5.3
+    
+    The offending entry point object looks like:
+    EntryPoint(name='compute', value='openstackclient.compute.client',
+    group='openstack.cli.base')
+    
+    Fixes https://storyboard.openstack.org/#!/story/2007917
+    
+    Change-Id: I0f3cc62e23efdc14203ce6645581d5ba5dbf7fa0
+
+diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
+index 66dc880e..36c3ce26 100644
+--- a/openstackclient/common/clientmanager.py
++++ b/openstackclient/common/clientmanager.py
+@@ -154,7 +154,10 @@ def get_plugin_modules(group):
+         try:
+             module_name = ep.entry_point.module_name
+         except AttributeError:
+-            module_name = ep.entry_point.module
++            try:
++                module_name = ep.entry_point.module
++            except AttributeError:
++                module_name = ep.entry_point.value
+ 
+         try:
+             module = importlib.import_module(module_name)