From 13fff861efce1e32bc19a375d81b2e36d9d394c4 Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@cn.fujitsu.com>
Date: Tue, 28 Jul 2020 08:44:55 +0800
Subject: python3-keystoneclient: Change python to python3

Version updated to 3.13.1

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 .../python-keystoneclient/keystone-api-check.sh    | 14 -----
 .../python/python-keystoneclient_git.bb            | 62 ---------------------
 .../python3-keystoneclient/keystone-api-check.sh   | 14 +++++
 .../python/python3-keystoneclient_git.bb           | 64 ++++++++++++++++++++++
 4 files changed, 78 insertions(+), 76 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-keystoneclient/keystone-api-check.sh
 delete mode 100644 meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python3-keystoneclient/keystone-api-check.sh
 create mode 100644 meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb

(limited to 'meta-openstack')

diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient/keystone-api-check.sh b/meta-openstack/recipes-devtools/python/python-keystoneclient/keystone-api-check.sh
deleted file mode 100644
index aba6d5f..0000000
--- a/meta-openstack/recipes-devtools/python/python-keystoneclient/keystone-api-check.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/bash
-
-CMD="keystone endpoint-list"
-
-data=$($CMD 2>&1)
-res=$?
-if [ ${res} -eq 127 ]; then
-    exit 0
-elif [ ${res} -ne 0 ]; then
-    echo "OpenStack \"keystone api\" failed: "
-    echo $data
-    exit $res
-fi
-exit 0
diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
deleted file mode 100644
index c7bfef4..0000000
--- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-DESCRIPTION = "Client library for OpenStack Identity API"
-HOMEPAGE = "https://github.com/openstack/python-keystoneclient"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4a4d0e932ffae1c0131528d30d419c55"
-
-SRCNAME = "keystoneclient"
-
-SRC_URI = "\
-	git://github.com/openstack/python-keystoneclient.git;branch=stable/pike \
-	file://keystone-api-check.sh \
-	"
-
-PV = "3.13.0+git${SRCPV}"
-SRCREV = "7ff05baa1fa56f152173651f16fc6fd181291292"
-S = "${WORKDIR}/git"
-
-inherit setuptools3 monitor
-
-FILES_${PN}-doc += "${datadir}/keystoneclient" 
-
-DEPENDS += " \
-        python-pip \
-        python-pbr \
-        "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
-        python-pbr-native \
-        "
-
-RDEPENDS_${PN} += " \
-        bash \
-        python-pbr \
-        python-debtcollector \
-        python-keystoneauth1 \
-        python-oslo.config \
-        python-oslo.i18n \
-        python-oslo.serialization \
-        python-oslo.utils \
-        python-positional \
-        python-requests \
-        python-six \
-        python-stevedore \
-        "
-
-do_install_append() {
-	cp -r ${S}/examples ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}
-}
-
-PACKAGES =+ " ${SRCNAME}-tests"
-
-FILES_${SRCNAME}-tests = "${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/examples \
-        "
-RDEPENDS_${SRCNAME}-tests += " \
-	python-httpretty \
-        bash \
-	"
-
-MONITOR_CHECKS_${PN} += "\
-	keystone-api-check.sh \
-"
diff --git a/meta-openstack/recipes-devtools/python/python3-keystoneclient/keystone-api-check.sh b/meta-openstack/recipes-devtools/python/python3-keystoneclient/keystone-api-check.sh
new file mode 100644
index 0000000..aba6d5f
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python3-keystoneclient/keystone-api-check.sh
@@ -0,0 +1,14 @@
+#! /bin/bash
+
+CMD="keystone endpoint-list"
+
+data=$($CMD 2>&1)
+res=$?
+if [ ${res} -eq 127 ]; then
+    exit 0
+elif [ ${res} -ne 0 ]; then
+    echo "OpenStack \"keystone api\" failed: "
+    echo $data
+    exit $res
+fi
+exit 0
diff --git a/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb
new file mode 100644
index 0000000..c8fe38a
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb
@@ -0,0 +1,64 @@
+DESCRIPTION = "Client library for OpenStack Identity API"
+HOMEPAGE = "https://github.com/openstack/python-keystoneclient"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4a4d0e932ffae1c0131528d30d419c55"
+
+SRCNAME = "keystoneclient"
+
+SRC_URI = "file://keystone-api-check.sh"
+
+SRC_URI = "\
+        git://github.com/openstack/python-keystoneclient.git;branch=stable/pike \
+        file://keystone-api-check.sh \
+        "
+
+PV = "4.1.0+git${SRCPV}"
+SRCREV = "7ff05baa1fa56f152173651f16fc6fd181291292"
+S = "${WORKDIR}/git"
+
+inherit setuptools3 monitor
+
+FILES_${PN}-doc += "${datadir}/keystoneclient" 
+
+DEPENDS += " \
+        python3-pip \
+        python3-pbr \
+        "
+
+# Satisfy setup.py 'setup_requires'
+DEPENDS += " \
+        python3-pbr-native \
+        "
+
+RDEPENDS_${PN} += " \
+        bash \
+        python3-pbr \
+        python3-debtcollector \
+        python3-keystoneauth1 \
+        python3-oslo.config \
+        python3-oslo.i18n \
+        python3-oslo.serialization \
+        python3-oslo.utils \
+        python3-positional \
+        python3-requests \
+        python3-six \
+        python3-stevedore \
+        "
+
+do_install_append() {
+	cp -r ${S}/examples ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}
+}
+
+PACKAGES =+ " ${SRCNAME}-tests"
+
+FILES_${SRCNAME}-tests = "${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/examples \
+        "
+RDEPENDS_${SRCNAME}-tests += " \
+	python3-httpretty \
+        bash \
+	"
+
+MONITOR_CHECKS_${PN} += "\
+	keystone-api-check.sh \
+"
-- 
cgit v1.2.3-54-g00ecf