classes/python_pep517: centralise shared inherits

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>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes-recipe/python_flit_core.bbclass b/meta/classes-recipe/python_flit_core.bbclass
index c5480654f3b354b267c7b42d61e453711172b3e7..cb40ab0faf486775bc972ad4efadac9826a60de1 100644 (file)
--- 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 b5a3c3feea55e8353b6cb147cd537a5a3e5973d7..6765ddbe8ce07979a897131d03be5e801b99b488 100644 (file)
--- 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 37b231cef5382e9103e4820203dd0c85b7bbfedc..3613ea19c7676731c5a50409d4872dbc1858b67f 100644 (file)
--- 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 2c144d39b383edb0cffc102046249baa2acec39d..4935b2cbe928a53221f2bc6a3951d5fb63391a57 100644 (file)
--- 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 c7dc5d0382e1e896afb5c465b88924a5660caf00..35a2f137cbe7d9b3b3325d3959a1bd9a99926877 100644 (file)
--- 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 046b4ffb74f03490ec02e3bf0da857fa115ccdbb..f09f7e9a918ba08417136ff3cfa0a6d860dcd5e2 100644 (file)
--- a/meta/classes-recipe/python_setuptools_build_meta.bbclass
+++ b/meta/classes-recipe/python_setuptools_build_meta.bbclass
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-inherit setuptools3-base python_pep517
+inherit python_pep517
 
 DEPENDS += "python3-setuptools-native python3-wheel-native"