python-nose: python3-nose should be default

We have nose recipes for both Py2 and Py3, but they both want to ship the
unversioned nosetest binary.  As Py2 is approaching EOL, remove the unversioned
binary from python-nose (leaving nosetest-2.7) instead of renaming the binary to
nosetest3 in python3-nose.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/python/python-nose_1.3.7.bb b/meta/recipes-devtools/python/python-nose_1.3.7.bb
index 6d69d2d62e2d86c1d0fdc99d1495d6f093a410e7..fab609df901579ed96d4af40518275d5802b7375 100644 (file)
--- a/meta/recipes-devtools/python/python-nose_1.3.7.bb
+++ b/meta/recipes-devtools/python/python-nose_1.3.7.bb
@@ -1,2 +1,6 @@
 inherit setuptools
 require python-nose.inc
+
+do_install_append() {
+    rm ${D}${bindir}/nosetests
+}

diff --git a/meta/recipes-devtools/python/python3-nose_1.3.7.bb b/meta/recipes-devtools/python/python3-nose_1.3.7.bb
index 8bc1f49835e0f0f3aac41f75c631365a6f158022..13dbf96179aab4a2427ee6867896ef5b3ba6f29e 100644 (file)
--- a/meta/recipes-devtools/python/python3-nose_1.3.7.bb
+++ b/meta/recipes-devtools/python/python3-nose_1.3.7.bb
@@ -1,6 +1,2 @@
 inherit setuptools3
 require python-nose.inc
-
-do_install_append() {
-    mv ${D}${bindir}/nosetests ${D}${bindir}/nosetests3
-}