python_pep517: move PEP517_SOURCE_PATH to python_pep517

Message ID 20220311171206.41094-1-ross.burton@arm.com
State Accepted, archived
Commit 69944121f49f613568bf0c62ae6b3b47af195dbe
Headers show
Series python_pep517: move PEP517_SOURCE_PATH to python_pep517 | expand

Commit Message

Ross Burton March 11, 2022, 5:12 p.m. UTC
Now we have the start of a PEP-517 base class, the PEP517_SOURCE_PATH
variable can be defined in there instead of the classes that use it.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/classes/flit_core.bbclass             | 3 ---
 meta/classes/python_pep517.bbclass         | 3 +++
 meta/classes/setuptools_build_meta.bbclass | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

Comments

Khem Raj March 12, 2022, 4:40 p.m. UTC | #1
seeing this

https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/1517

On Fri, Mar 11, 2022 at 9:12 AM Ross Burton <ross@burtonini.com> wrote:
>
> Now we have the start of a PEP-517 base class, the PEP517_SOURCE_PATH
> variable can be defined in there instead of the classes that use it.
>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta/classes/flit_core.bbclass             | 3 ---
>  meta/classes/python_pep517.bbclass         | 3 +++
>  meta/classes/setuptools_build_meta.bbclass | 3 ---
>  3 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes/flit_core.bbclass b/meta/classes/flit_core.bbclass
> index 1ef8ce9429..5a602f54ab 100644
> --- a/meta/classes/flit_core.bbclass
> +++ b/meta/classes/flit_core.bbclass
> @@ -6,9 +6,6 @@ flit_core_do_configure () {
>      :
>  }
>
> -# Where to execute the build process from
> -PEP517_SOURCE_PATH ?= "${S}"
> -
>  # TODO: ideally this uses pypa/build
>  flit_core_do_compile () {
>      cd ${PEP517_SOURCE_PATH}
> diff --git a/meta/classes/python_pep517.bbclass b/meta/classes/python_pep517.bbclass
> index 76660e70f8..756333bcf2 100644
> --- a/meta/classes/python_pep517.bbclass
> +++ b/meta/classes/python_pep517.bbclass
> @@ -3,6 +3,9 @@
>
>  DEPENDS:append = " python3-pip-native"
>
> +# Where to execute the build process from
> +PEP517_SOURCE_PATH ?= "${S}"
> +
>  # The directory where wheels should be written too. Build classes
>  # will ideally [cleandirs] this but we don't do that here in case
>  # a recipe wants to install prebuilt wheels.
> diff --git a/meta/classes/setuptools_build_meta.bbclass b/meta/classes/setuptools_build_meta.bbclass
> index 424be85608..8791a2965f 100644
> --- a/meta/classes/setuptools_build_meta.bbclass
> +++ b/meta/classes/setuptools_build_meta.bbclass
> @@ -2,9 +2,6 @@ inherit setuptools3-base python_pep517
>
>  DEPENDS += "python3-setuptools-native python3-wheel-native"
>
> -# Where to execute the build process from
> -PEP517_SOURCE_PATH ?= "${S}"
> -
>  setuptools_build_meta_do_configure () {
>      :
>  }
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#163067): https://lists.openembedded.org/g/openembedded-core/message/163067
> Mute This Topic: https://lists.openembedded.org/mt/89715331/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Ross Burton March 12, 2022, 8:06 p.m. UTC | #2
Sorry, I should have sent the meta-oe fix, but I know it's not easy to
say "only merge this patch when these in other layers have merged", so
I tend to wait and then post.

The patch you sent was only half of the fix, I just posted a patch to oe-devel.

Ross

On Sat, 12 Mar 2022 at 16:41, Khem Raj <raj.khem@gmail.com> wrote:
>
> seeing this
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/1517
>
> On Fri, Mar 11, 2022 at 9:12 AM Ross Burton <ross@burtonini.com> wrote:
> >
> > Now we have the start of a PEP-517 base class, the PEP517_SOURCE_PATH
> > variable can be defined in there instead of the classes that use it.
> >
> > Signed-off-by: Ross Burton <ross.burton@arm.com>
> > ---
> >  meta/classes/flit_core.bbclass             | 3 ---
> >  meta/classes/python_pep517.bbclass         | 3 +++
> >  meta/classes/setuptools_build_meta.bbclass | 3 ---
> >  3 files changed, 3 insertions(+), 6 deletions(-)
> >
> > diff --git a/meta/classes/flit_core.bbclass b/meta/classes/flit_core.bbclass
> > index 1ef8ce9429..5a602f54ab 100644
> > --- a/meta/classes/flit_core.bbclass
> > +++ b/meta/classes/flit_core.bbclass
> > @@ -6,9 +6,6 @@ flit_core_do_configure () {
> >      :
> >  }
> >
> > -# Where to execute the build process from
> > -PEP517_SOURCE_PATH ?= "${S}"
> > -
> >  # TODO: ideally this uses pypa/build
> >  flit_core_do_compile () {
> >      cd ${PEP517_SOURCE_PATH}
> > diff --git a/meta/classes/python_pep517.bbclass b/meta/classes/python_pep517.bbclass
> > index 76660e70f8..756333bcf2 100644
> > --- a/meta/classes/python_pep517.bbclass
> > +++ b/meta/classes/python_pep517.bbclass
> > @@ -3,6 +3,9 @@
> >
> >  DEPENDS:append = " python3-pip-native"
> >
> > +# Where to execute the build process from
> > +PEP517_SOURCE_PATH ?= "${S}"
> > +
> >  # The directory where wheels should be written too. Build classes
> >  # will ideally [cleandirs] this but we don't do that here in case
> >  # a recipe wants to install prebuilt wheels.
> > diff --git a/meta/classes/setuptools_build_meta.bbclass b/meta/classes/setuptools_build_meta.bbclass
> > index 424be85608..8791a2965f 100644
> > --- a/meta/classes/setuptools_build_meta.bbclass
> > +++ b/meta/classes/setuptools_build_meta.bbclass
> > @@ -2,9 +2,6 @@ inherit setuptools3-base python_pep517
> >
> >  DEPENDS += "python3-setuptools-native python3-wheel-native"
> >
> > -# Where to execute the build process from
> > -PEP517_SOURCE_PATH ?= "${S}"
> > -
> >  setuptools_build_meta_do_configure () {
> >      :
> >  }
> > --
> > 2.25.1
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#163067): https://lists.openembedded.org/g/openembedded-core/message/163067
> > Mute This Topic: https://lists.openembedded.org/mt/89715331/1997914
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >

Patch

diff --git a/meta/classes/flit_core.bbclass b/meta/classes/flit_core.bbclass
index 1ef8ce9429..5a602f54ab 100644
--- a/meta/classes/flit_core.bbclass
+++ b/meta/classes/flit_core.bbclass
@@ -6,9 +6,6 @@  flit_core_do_configure () {
     :
 }
 
-# Where to execute the build process from
-PEP517_SOURCE_PATH ?= "${S}"
-
 # TODO: ideally this uses pypa/build
 flit_core_do_compile () {
     cd ${PEP517_SOURCE_PATH}
diff --git a/meta/classes/python_pep517.bbclass b/meta/classes/python_pep517.bbclass
index 76660e70f8..756333bcf2 100644
--- a/meta/classes/python_pep517.bbclass
+++ b/meta/classes/python_pep517.bbclass
@@ -3,6 +3,9 @@ 
 
 DEPENDS:append = " python3-pip-native"
 
+# Where to execute the build process from
+PEP517_SOURCE_PATH ?= "${S}"
+
 # The directory where wheels should be written too. Build classes
 # will ideally [cleandirs] this but we don't do that here in case
 # a recipe wants to install prebuilt wheels.
diff --git a/meta/classes/setuptools_build_meta.bbclass b/meta/classes/setuptools_build_meta.bbclass
index 424be85608..8791a2965f 100644
--- a/meta/classes/setuptools_build_meta.bbclass
+++ b/meta/classes/setuptools_build_meta.bbclass
@@ -2,9 +2,6 @@  inherit setuptools3-base python_pep517
 
 DEPENDS += "python3-setuptools-native python3-wheel-native"
 
-# Where to execute the build process from
-PEP517_SOURCE_PATH ?= "${S}"
-
 setuptools_build_meta_do_configure () {
     :
 }