4 files changed, 23 insertions, 9 deletions

diff --git a/meta-python/recipes-devtools/python/python-astroid.inc b/meta-python/recipes-devtools/python/python-astroid.inc
index 4cb1a3c4b6..971aaf47d9 100644
--- a/meta-python/recipes-devtools/python/python-astroid.inc
+++ b/meta-python/recipes-devtools/python/python-astroid.inc
@@ -4,11 +4,18 @@ SECTION = "devel/python"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-SRC_URI[md5sum] = "6f65e4ea8290ec032320460905afb828"
-SRC_URI[sha256sum] = "492c2a2044adbf6a84a671b7522e9295ad2f6a7c781b899014308db25312dd35"
+SRC_URI[md5sum] = "6f8f60b316218455726958f08c6e17f1"
+SRC_URI[sha256sum] = "71dadba2110008e2c03f9fde662ddd2053db3c0489d0e03c94e828a0399edd4f"
 
 inherit pypi
 
+PACKAGES =+ "${PN}-tests"
+
+FILES_${PN}-tests += " \
+    ${PYTHON_SITEPACKAGES_DIR}/astroid/test* \
+    ${PYTHON_SITEPACKAGES_DIR}/astroid/__pycache__/test* \
+"
+
 RDEPENDS_${PN}_class-target += "\
     ${PYTHON_PN}-distutils \
     ${PYTHON_PN}-lazy-object-proxy \
@@ -18,3 +25,8 @@ RDEPENDS_${PN}_class-target += "\
     ${PYTHON_PN}-re \
     ${PYTHON_PN}-setuptools \
 "
+
+RDEPENDS_${PN}-tests_class-target += "\
+    ${PYTHON_PN}-unittest \
+    ${PYTHON_PN}-xml \
+"
diff --git a/meta-python/recipes-devtools/python/python-astroid_1.5.3.bb b/meta-python/recipes-devtools/python/python-astroid_1.5.3.bb
deleted file mode 100644
index f7a0a5e736..0000000000
--- a/meta-python/recipes-devtools/python/python-astroid_1.5.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-inherit setuptools
-require python-astroid.inc
-
-RDEPENDS_${PN}_class-target += "${PYTHON_PN}-enum34 \
-                                ${PYTHON_PN}-importlib \
-                                ${PYTHON_PN}-singledispatch \
-                               "
diff --git a/meta-python/recipes-devtools/python/python-astroid_1.6.0.bb b/meta-python/recipes-devtools/python/python-astroid_1.6.0.bb
new file mode 100644
index 0000000000..3ced19a09d
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-astroid_1.6.0.bb
@@ -0,0 +1,9 @@
+inherit setuptools
+require python-astroid.inc
+
+RDEPENDS_${PN}_class-target += " \
+    ${PYTHON_PN}-enum34 \
+    ${PYTHON_PN}-backports-functools-lru-cache \
+    ${PYTHON_PN}-importlib \
+    ${PYTHON_PN}-singledispatch \
+"
diff --git a/meta-python/recipes-devtools/python/python3-astroid_1.5.3.bb b/meta-python/recipes-devtools/python/python3-astroid_1.6.0.bb
index 6e32c288f2..6e32c288f2 100644
--- a/meta-python/recipes-devtools/python/python3-astroid_1.5.3.bb
+++ b/meta-python/recipes-devtools/python/python3-astroid_1.6.0.bb