From 328c1bdf8b17995602a80b5b78c4098b40f74165 Mon Sep 17 00:00:00 2001
From: Nathan Hartman <hnathan918@gmail.com>
Date: Thu, 13 Feb 2020 14:48:14 -0500
Subject: tox: Add python3 version

Signed-off-by: Nathan Hartman <nathan.hartman@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 .../recipes-devtools/python/python-tox.inc         | 29 ++++++++++++++++++++
 .../recipes-devtools/python/python-tox_1.9.2.bb    | 32 ----------------------
 .../recipes-devtools/python/python3-tox_3.14.3.bb  |  5 ++++
 3 files changed, 34 insertions(+), 32 deletions(-)
 create mode 100644 meta-openstack/recipes-devtools/python/python-tox.inc
 delete mode 100644 meta-openstack/recipes-devtools/python/python-tox_1.9.2.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python3-tox_3.14.3.bb

diff --git a/meta-openstack/recipes-devtools/python/python-tox.inc b/meta-openstack/recipes-devtools/python/python-tox.inc
new file mode 100644
index 0000000..66b1355
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-tox.inc
@@ -0,0 +1,29 @@
+DESCRIPTION = "virtualenv-based automation of test activities"
+HOMEPAGE = "http://tox.testrun.org"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f24505dfbdd8c22c61de6383f2e74bf9"
+
+inherit pypi
+
+DEPENDS += " \
+        ${PYTHON_PN}-pip \
+        "
+
+RDEPENDS_${PN} += " \
+        ${PYTHON_PN}-virtualenv \
+        ${PYTHON_PN}-py \
+        ${PYTHON_PN}-pytest \
+        "
+
+do_install_append() {
+
+    install -d ${D}/${sysconfdir}/${SRCNAME}
+    cp ${S}/tox.ini    ${D}/${sysconfdir}/${SRCNAME}
+    cp ${S}/setup.py   ${D}/${sysconfdir}/${SRCNAME}
+    cp ${S}/README.md ${D}/${sysconfdir}/${SRCNAME}
+
+    ln -s ${PYTHON_SITEPACKAGES_DIR}/tox ${D}/${sysconfdir}/${SRCNAME}/tox
+}
+
+FILES_${PN} += "${sysconfdir}/${SRCNAME}/*"
diff --git a/meta-openstack/recipes-devtools/python/python-tox_1.9.2.bb b/meta-openstack/recipes-devtools/python/python-tox_1.9.2.bb
deleted file mode 100644
index 8184fb5..0000000
--- a/meta-openstack/recipes-devtools/python/python-tox_1.9.2.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "virtualenv-based automation of test activities"
-HOMEPAGE = "http://tox.testrun.org"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2d0fc2c2c954dc4d41043e67d4a8d8e7"
-
-SRC_URI[md5sum] = "f4db4d6a82d6a651e457ba55ef370258"
-SRC_URI[sha256sum] = "3125a15da7381f59f835a25bd259a84acb7a69858c81e386c50027bd842bb91b"
-
-inherit setuptools3 pypi
-
-DEPENDS += " \
-        python-pip \
-        "
-
-RDEPENDS_${PN} += " \
-        python-virtualenv \
-        python-py \
-        python-pytest \
-        "
-
-do_install_append() {
-
-    install -d ${D}/${sysconfdir}/${SRCNAME}
-    cp ${S}/tox.ini    ${D}/${sysconfdir}/${SRCNAME}
-    cp ${S}/setup.py   ${D}/${sysconfdir}/${SRCNAME}
-    cp ${S}/README.rst ${D}/${sysconfdir}/${SRCNAME}
-
-    ln -s ${PYTHON_SITEPACKAGES_DIR}/tox ${D}/${sysconfdir}/${SRCNAME}/tox
-}
-
-FILES_${PN} += "${sysconfdir}/${SRCNAME}/*"
diff --git a/meta-openstack/recipes-devtools/python/python3-tox_3.14.3.bb b/meta-openstack/recipes-devtools/python/python3-tox_3.14.3.bb
new file mode 100644
index 0000000..678413a
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python3-tox_3.14.3.bb
@@ -0,0 +1,5 @@
+inherit setuptools3
+require python-tox.inc
+
+SRC_URI[md5sum] = "8b695d482786dd51643e10953bbd8c89"
+SRC_URI[sha256sum] = "06ba73b149bf838d5cd25dc30c2dd2671ae5b2757cf98e5c41a35fe449f131b3"
-- 
cgit v1.2.3-54-g00ecf