| Message ID | 20250730160343.4053614-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [01/13] classes/python_pep517: centralise shared inherits | expand |
diff --git a/meta/classes-recipe/python_flit_core.bbclass b/meta/classes-recipe/python_flit_core.bbclass index c5480654f3b..cb40ab0faf4 100644 --- a/meta/classes-recipe/python_flit_core.bbclass +++ b/meta/classes-recipe/python_flit_core.bbclass @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -inherit python_pep517 python3native python3-dir setuptools3-base +inherit python_pep517 DEPENDS += "python3-flit-core-native" diff --git a/meta/classes-recipe/python_hatchling.bbclass b/meta/classes-recipe/python_hatchling.bbclass index b5a3c3feea5..6765ddbe8ce 100644 --- a/meta/classes-recipe/python_hatchling.bbclass +++ b/meta/classes-recipe/python_hatchling.bbclass @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -inherit python_pep517 python3native python3-dir setuptools3-base +inherit python_pep517 DEPENDS += "python3-hatchling-native" diff --git a/meta/classes-recipe/python_mesonpy.bbclass b/meta/classes-recipe/python_mesonpy.bbclass index 81c087c7c75..d62f2d4374b 100644 --- a/meta/classes-recipe/python_mesonpy.bbclass +++ b/meta/classes-recipe/python_mesonpy.bbclass @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -inherit meson setuptools3-base python3targetconfig python_pep517 +inherit meson python_pep517 # meson_do_qa_configure does the wrong thing here because # mesonpy runs "meson setup ..." in do_compile context. diff --git a/meta/classes-recipe/python_pep517.bbclass b/meta/classes-recipe/python_pep517.bbclass index e8cd1923ef2..880aadb2e23 100644 --- a/meta/classes-recipe/python_pep517.bbclass +++ b/meta/classes-recipe/python_pep517.bbclass @@ -10,6 +10,8 @@ # This class will build a wheel in do_compile, and use pypa/installer to install # it in do_install. +inherit python3native python3-dir setuptools3-base + DEPENDS:append = " python3-build-native python3-installer-native" # Where to execute the build process from diff --git a/meta/classes-recipe/python_poetry_core.bbclass b/meta/classes-recipe/python_poetry_core.bbclass index c7dc5d0382e..35a2f137cbe 100644 --- a/meta/classes-recipe/python_poetry_core.bbclass +++ b/meta/classes-recipe/python_poetry_core.bbclass @@ -4,6 +4,6 @@ # SPDX-License-Identifier: MIT # -inherit python_pep517 python3native setuptools3-base +inherit python_pep517 DEPENDS += "python3-poetry-core-native" diff --git a/meta/classes-recipe/python_setuptools_build_meta.bbclass b/meta/classes-recipe/python_setuptools_build_meta.bbclass index 4c84d1e8d0b..c7b12e53093 100644 --- a/meta/classes-recipe/python_setuptools_build_meta.bbclass +++ b/meta/classes-recipe/python_setuptools_build_meta.bbclass @@ -4,6 +4,6 @@ # SPDX-License-Identifier: MIT # -inherit setuptools3-base python_pep517 +inherit python_pep517 DEPENDS += "python3-setuptools-native python3-wheel-native"
For the build process to actually work some inherits are always needed: - python3native for the python that is actually running build. - setuptools3-base (badly named) defines how to build extensions and where to put modules. Instead of inheriting these in every class, inherit them once in the python_pep517 class. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/classes-recipe/python_flit_core.bbclass | 2 +- meta/classes-recipe/python_hatchling.bbclass | 2 +- meta/classes-recipe/python_mesonpy.bbclass | 2 +- meta/classes-recipe/python_pep517.bbclass | 2 ++ meta/classes-recipe/python_poetry_core.bbclass | 2 +- meta/classes-recipe/python_setuptools_build_meta.bbclass | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-)