From 285b64586ccfee5e374b27142ea2af0b2093ec9a Mon Sep 17 00:00:00 2001
From: zhengruoqin <zhengrq.fnst@cn.fujitsu.com>
Date: Tue, 22 Sep 2020 10:26:16 +0800
Subject: python3-keystoneauth1: upgrade 3.18.0 -> 4.2.1

Consolidate inc and bb files into a single bb file.

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 .../python/python-keystoneauth1.inc                | 27 ----------------------
 .../python/python3-keystoneauth1_3.18.0.bb         |  2 --
 .../python/python3-keystoneauth1_4.2.1.bb          | 27 ++++++++++++++++++++++
 3 files changed, 27 insertions(+), 29 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-keystoneauth1.inc
 delete mode 100644 meta-openstack/recipes-devtools/python/python3-keystoneauth1_3.18.0.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python3-keystoneauth1_4.2.1.bb

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

diff --git a/meta-openstack/recipes-devtools/python/python-keystoneauth1.inc b/meta-openstack/recipes-devtools/python/python-keystoneauth1.inc
deleted file mode 100644
index bca6ce9..0000000
--- a/meta-openstack/recipes-devtools/python/python-keystoneauth1.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Authentication Library for OpenStack Identity"
-HOMEPAGE = "https://pypi.python.org/pypi/keystoneauth1"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=96f840d59b245a1c817fbcb901afc574"
-
-SRC_URI[md5sum] = "6104205044175fa8aac659582fdd0260"
-SRC_URI[sha256sum] = "3ae67c6542ed66a37cddcd26a35457c1ff5cd14b20f5490973273cf9eb555a52"
-
-inherit pypi
-
-DEPENDS += " \
-        ${PYTHON_PN}-pbr \
-        "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
-        ${PYTHON_PN}-pbr-native \
-        "
-
-RDEPENDS_${PN} += " \
-        ${PYTHON_PN}-pbr \
-        ${PYTHON_PN}-iso8601 \
-        ${PYTHON_PN}-requests \
-        ${PYTHON_PN}-six \
-        ${PYTHON_PN}-stevedore \
-        "
diff --git a/meta-openstack/recipes-devtools/python/python3-keystoneauth1_3.18.0.bb b/meta-openstack/recipes-devtools/python/python3-keystoneauth1_3.18.0.bb
deleted file mode 100644
index 75adf3d..0000000
--- a/meta-openstack/recipes-devtools/python/python3-keystoneauth1_3.18.0.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-inherit setuptools3
-require python-keystoneauth1.inc
diff --git a/meta-openstack/recipes-devtools/python/python3-keystoneauth1_4.2.1.bb b/meta-openstack/recipes-devtools/python/python3-keystoneauth1_4.2.1.bb
new file mode 100644
index 0000000..6c046d9
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python3-keystoneauth1_4.2.1.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Authentication Library for OpenStack Identity"
+HOMEPAGE = "https://pypi.python.org/pypi/keystoneauth1"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=96f840d59b245a1c817fbcb901afc574"
+
+SRC_URI[md5sum] = "3c65181cb3cf6a8690e1c65de030e3fb"
+SRC_URI[sha256sum] = "9496bfcc27eff3d05271e10aa64684b7c1fd12a4d96f58511f2286312d9c89a1"
+
+inherit setuptools3 pypi
+
+DEPENDS += " \
+        ${PYTHON_PN}-pbr \
+        "
+
+# Satisfy setup.py 'setup_requires'
+DEPENDS += " \
+        ${PYTHON_PN}-pbr-native \
+        "
+
+RDEPENDS_${PN} += " \
+        ${PYTHON_PN}-pbr \
+        ${PYTHON_PN}-iso8601 \
+        ${PYTHON_PN}-requests \
+        ${PYTHON_PN}-six \
+        ${PYTHON_PN}-stevedore \
+        "
-- 
cgit v1.2.3-54-g00ecf