From 3088635dfe063b924d1aa52e72501e5a09ae836d Mon Sep 17 00:00:00 2001
From: Mark Asselstine <mark.asselstine@windriver.com>
Date: Wed, 4 Apr 2018 16:02:50 -0400
Subject: python-networkx: uprev to v1.11

We are unable to use the v2.0 found in meta-python (v2.0 is excluded
in the python-pypowervm requirements.txt). So uprev our
python-networkx to an acceptable version for all related packages and
force its use via PREFERRED_VERSION.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-openstack/conf/layer.conf                       |  1 +
 .../recipes-devtools/python/python-networkx_1.11.bb  | 20 ++++++++++++++++++++
 .../recipes-devtools/python/python-networkx_1.9.1.bb | 20 --------------------
 3 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 meta-openstack/recipes-devtools/python/python-networkx_1.11.bb
 delete mode 100644 meta-openstack/recipes-devtools/python/python-networkx_1.9.1.bb

diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
index 838e7b0..c5884c5 100644
--- a/meta-openstack/conf/layer.conf
+++ b/meta-openstack/conf/layer.conf
@@ -22,4 +22,5 @@ PREFERRED_VERSION_python-requests = "2.13.0"
 PREFERRED_VERSION_python-eventlet = "0.20.0"
 PREFERRED_VERSION_python-warlock = "1.2.0"
 PREFERRED_VERSION_python-jsonschema = "2.6.0"
+PREFERRED_VERSION_python-networkx = "1.11"
 LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/meta-openstack/recipes-devtools/python/python-networkx_1.11.bb b/meta-openstack/recipes-devtools/python/python-networkx_1.11.bb
new file mode 100644
index 0000000..f187663
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-networkx_1.11.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Python package for creating and manipulating graphs and networks"
+HOMEPAGE = "http://networkx.lanl.gov/"
+SECTION = "devel/python"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=925586ea588eb990de840dc71ea3752f"
+
+SRC_URI[md5sum] = "6ef584a879e9163013e9a762e1cf7cd1"
+SRC_URI[sha256sum] = "0d0e70e10dfb47601cbb3425a00e03e2a2e97477be6f80638fef91d54dd1e4b8"
+
+inherit setuptools pypi
+
+# DEPENDS_default: python-pip
+
+DEPENDS += " \
+        python-pip \
+        "
+
+RDEPENDS_${PN} += " \
+        python-decorator \
+        "
diff --git a/meta-openstack/recipes-devtools/python/python-networkx_1.9.1.bb b/meta-openstack/recipes-devtools/python/python-networkx_1.9.1.bb
deleted file mode 100644
index e1828b7..0000000
--- a/meta-openstack/recipes-devtools/python/python-networkx_1.9.1.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Python package for creating and manipulating graphs and networks"
-HOMEPAGE = "http://networkx.lanl.gov/"
-SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6bd2e3b81103dff983b4b2d7d3217cf5"
-
-SRC_URI[md5sum] = "a2d9ee8427c5636426f319968e0af9f2"
-SRC_URI[sha256sum] = "6380eb38d0b5770d7e50813c8a48ff7c373b2187b4220339c1adce803df01c59"
-
-inherit setuptools pypi
-
-# DEPENDS_default: python-pip
-
-DEPENDS += " \
-        python-pip \
-        "
-
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
-        "
-- 
cgit v1.2.3-54-g00ecf