2 files changed, 11 insertions, 14 deletions
diff --git a/meta-python/recipes-devtools/python/python-pytest-tempdir.inc b/meta-python/recipes-devtools/python/python-pytest-tempdir.inc
deleted file mode 100644
index cf355a364d..0000000000
--- a/meta-python/recipes-devtools/python/python-pytest-tempdir.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "Adds support for a predictable and repeatable temporary directory."
-HOMEPAGE = "https://github.com/saltstack/pytest-tempdir"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9872c3a37cc9baf79a464cd168282be5"
-SRC_URI[md5sum] = "79b997d418fb85c2529ab50cd4333689"
-SRC_URI[sha256sum] = "e7d91813a9aa991db87dacdef8cfd3f1657632d731d56d06238c5ffb63ab36d8"
-inherit pypi
diff --git a/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb b/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb
index 02e8215636..7a48fd520f 100644
--- a/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb
+++ b/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb
@@ -1,7 +1,14 @@
-require python-pytest-tempdir.inc
+DESCRIPTION = "Adds support for a predictable and repeatable temporary directory."
+HOMEPAGE = "https://github.com/saltstack/pytest-tempdir"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9872c3a37cc9baf79a464cd168282be5"
-inherit setuptools3
+SRC_URI[md5sum] = "79b997d418fb85c2529ab50cd4333689"
+SRC_URI[sha256sum] = "e7d91813a9aa991db87dacdef8cfd3f1657632d731d56d06238c5ffb63ab36d8"
+inherit pypi setuptools3
 RDEPENDS_${PN} += " \
-    python3-pytest \
+    ${PYTHON_PN}-pytest \
-    "
+"

diff --git a/meta-python/recipes-devtools/python/python-pytest-tempdir.inc b/meta-python/recipes-devtools/python/python-pytest-tempdir.inc deleted file mode 100644 index cf355a364d..0000000000 --- a/meta-python/recipes-devtools/python/python-pytest-tempdir.inc +++ /dev/null
@@ -1,10 +0,0 @@
1	DESCRIPTION = "Adds support for a predictable and repeatable temporary directory."
2	HOMEPAGE = "https://github.com/saltstack/pytest-tempdir"
3	SECTION = "devel/python"
4	LICENSE = "Apache-2.0"
5	LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9872c3a37cc9baf79a464cd168282be5"
6
7	SRC_URI[md5sum] = "79b997d418fb85c2529ab50cd4333689"
8	SRC_URI[sha256sum] = "e7d91813a9aa991db87dacdef8cfd3f1657632d731d56d06238c5ffb63ab36d8"
9
10	inherit pypi


diff --git a/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb b/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb index 02e8215636..7a48fd520f 100644 --- a/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb +++ b/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb
@@ -1,7 +1,14 @@
1	require python-pytest-tempdir.inc	1	DESCRIPTION = "Adds support for a predictable and repeatable temporary directory."
		2	HOMEPAGE = "https://github.com/saltstack/pytest-tempdir"
		3	SECTION = "devel/python"
		4	LICENSE = "Apache-2.0"
		5	LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9872c3a37cc9baf79a464cd168282be5"
2		6
3	inherit setuptools3	7	SRC_URI[md5sum] = "79b997d418fb85c2529ab50cd4333689"
		8	SRC_URI[sha256sum] = "e7d91813a9aa991db87dacdef8cfd3f1657632d731d56d06238c5ffb63ab36d8"
		9
		10	inherit pypi setuptools3
4		11
5	RDEPENDS_${PN} += " \	12	RDEPENDS_${PN} += " \
6	python3-pytest \	13	${PYTHON_PN}-pytest \
7	"	14	"