From bd3c9b2bb3247db1b5d159d032256621f334f959 Mon Sep 17 00:00:00 2001
From: zangrc <zangrc.fnst@cn.fujitsu.com>
Date: Tue, 20 Oct 2020 14:51:34 +0800
Subject: python3-saharaclient: upgrade 2.3.0 -> 3.2.1

Consolidate inc and bb files into a single bb file.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 .../python/python-saharaclient.inc                 | 28 --------------------
 .../python/python3-saharaclient_git.bb             | 30 +++++++++++++++++++++-
 2 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-saharaclient.inc

(limited to 'meta-openstack/recipes-devtools/python')

diff --git a/meta-openstack/recipes-devtools/python/python-saharaclient.inc b/meta-openstack/recipes-devtools/python/python-saharaclient.inc
deleted file mode 100644
index 91549ae..0000000
--- a/meta-openstack/recipes-devtools/python/python-saharaclient.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "CLI and python client library for OpenStack Sahara"
-HOMEPAGE = "https://launchpad.net/sahara"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-DEPENDS += " \
-        ${PYTHON_PN}-pip \
-        ${PYTHON_PN}-pbr \
-        "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
-        ${PYTHON_PN}-pbr-native \
-"
-
-RDEPENDS_${PN} += " \
-	${PYTHON_PN}-pbr \
-	"
-
-SRCNAME = "saharaclient"
-
-SRC_URI = "git://github.com/openstack/python-saharaclient.git;branch=master"
-
-PV = "2.3.0+git${SRCPV}"
-SRCREV = "3107b452467537f4eef3d9ecfb5e35d110d19662"
-S = "${WORKDIR}/git"
-
diff --git a/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb b/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb
index 806cd76..9ec4c56 100644
--- a/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb
@@ -1,2 +1,30 @@
-require python-saharaclient.inc
+DESCRIPTION = "CLI and python client library for OpenStack Sahara"
+HOMEPAGE = "https://launchpad.net/sahara"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
+
+DEPENDS += " \
+        ${PYTHON_PN}-pip \
+        ${PYTHON_PN}-pbr \
+        "
+
+# Satisfy setup.py 'setup_requires'
+DEPENDS += " \
+        ${PYTHON_PN}-pbr-native \
+"
+
+RDEPENDS_${PN} += " \
+	${PYTHON_PN}-pbr \
+	"
+
+SRCNAME = "saharaclient"
+
 inherit setuptools3
+
+SRC_URI = "git://github.com/openstack/python-saharaclient.git;branch=master"
+
+PV = "3.2.1+git${SRCPV}"
+SRCREV = "a9fee07108c432e20a3ca7760541d4fcb4f14811"
+S = "${WORKDIR}/git"
+
-- 
cgit v1.2.3-54-g00ecf