testtools uses the hatchling backend so: * merge the inc back into the recipe * drop setuptools * use the hatchling backend * add the needed vcs dependency * drop the now unneeded python3-pbr dependency
This means the submodules are included in packaging, fixing build failures and the verison in the wheel is no longer 0.0.0 Prior to this fix, testtools in buildtools tarball was completely broken. Signed-off-by: Richard Purdie <[email protected]> --- .../python/python-testtools.inc | 27 ------------------- .../python/python3-testtools_2.7.1.bb | 21 +++++++++++++-- 2 files changed, 19 insertions(+), 29 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-testtools.inc diff --git a/meta/recipes-devtools/python/python-testtools.inc b/meta/recipes-devtools/python/python-testtools.inc deleted file mode 100644 index e9dd97ec1c1..00000000000 --- a/meta/recipes-devtools/python/python-testtools.inc +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Extensions to the Python standard library unit testing framework" -HOMEPAGE = "https://pypi.org/project/testtools/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c9d3e8ba7141c83bfef190e0b9379a" - -inherit pypi - -SRC_URI[sha256sum] = "df6de96010e29ee21f637a147eabf30d50b25e3841dd1d68f93ee89ce77e366c" - -DEPENDS += " \ - python3-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python3-pbr-native \ - " - -RDEPENDS:${PN} += "\ - python3-doctest \ - python3-extras \ - python3-pbr \ - python3-six \ - " - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-devtools/python/python3-testtools_2.7.1.bb b/meta/recipes-devtools/python/python3-testtools_2.7.1.bb index 79e46a02de7..cc7e0556326 100644 --- a/meta/recipes-devtools/python/python3-testtools_2.7.1.bb +++ b/meta/recipes-devtools/python/python3-testtools_2.7.1.bb @@ -1,3 +1,20 @@ -inherit setuptools3 -require python-testtools.inc +SUMMARY = "Extensions to the Python standard library unit testing framework" +HOMEPAGE = "https://pypi.org/project/testtools/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c9d3e8ba7141c83bfef190e0b9379a" + +DEPENDS += "python3-hatch-vcs-native" + +inherit pypi python_hatchling + +SRC_URI[sha256sum] = "df6de96010e29ee21f637a147eabf30d50b25e3841dd1d68f93ee89ce77e366c" + +RDEPENDS:${PN} += "\ + python3-doctest \ + python3-extras \ + python3-six \ + " + +BBCLASSEXTEND = "nativesdk" -- 2.40.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#198194): https://lists.openembedded.org/g/openembedded-core/message/198194 Mute This Topic: https://lists.openembedded.org/mt/105498752/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
