[Buildroot] [PATCH 1/2] package/pkg-python: fix flit-bootstrap python-installer dependencies

[Buildroot] [PATCH 1/2] package/pkg-python: fix flit-bootstrap python-installer dependencies

[James Hilliard]

We should not exclude the host-python-flit-core dependency when
building host-python-installer as it will be needed when migrating
host-python-installer to use flit-bootstrap.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/pkg-python.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/pkg-python.mk b/package/pkg-python.mk
index e9de5cb8d3..7aff3b745c 100644
--- a/package/pkg-python.mk
+++ b/package/pkg-python.mk
@@ -243,8 +243,9 @@ ifeq ($$($(2)_SETUP_TYPE),flit)
 $(2)_DEPENDENCIES += host-python-flit-core
 endif
 else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap)
+$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core)
 ifeq ($$(filter host-python-flit-core host-python-installer,$(1)),)
-$(2)_DEPENDENCIES += host-python-flit-core host-python-installer
+$(2)_DEPENDENCIES += host-python-installer
 endif
 endif # SETUP_TYPE
 
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/python-installer: migrate setup type to flit

[James Hilliard]

This package is moving to flit and will soon be dropping distutils
compatibility support.

We need to use flit-bootstrap as opposed to the normal flit setup
type since host-python-pypa-build depends on host-python-installer.

We need to add the src directory to the PYTHONPATH so that installer
can run from the src directory when installing itself.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/python-installer/python-installer.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk
index 862a251415..5bb14e315e 100644
--- a/package/python-installer/python-installer.mk
+++ b/package/python-installer/python-installer.mk
@@ -9,6 +9,7 @@ PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz
 PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0
 PYTHON_INSTALLER_LICENSE = MIT
 PYTHON_INSTALLER_LICENSE_FILES = LICENSE
-PYTHON_INSTALLER_SETUP_TYPE = distutils
+PYTHON_INSTALLER_SETUP_TYPE = flit-bootstrap
+HOST_PYTHON_INSTALLER_ENV = PYTHONPATH="$(@D)/src"
 
 $(eval $(host-python-package))
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/pkg-python: fix flit-bootstrap python-installer dependencies

[Arnout Vandecappelle]

On 30/04/2022 01:04, James Hilliard wrote:
> We should not exclude the host-python-flit-core dependency when
> building host-python-installer as it will be needed when migrating
> host-python-installer to use flit-bootstrap.
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>   package/pkg-python.mk | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/package/pkg-python.mk b/package/pkg-python.mk
> index e9de5cb8d3..7aff3b745c 100644
> --- a/package/pkg-python.mk
> +++ b/package/pkg-python.mk
> @@ -243,8 +243,9 @@ ifeq ($$($(2)_SETUP_TYPE),flit)
>   $(2)_DEPENDENCIES += host-python-flit-core
>   endif
>   else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap)
> +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core)

  No. The intention was to keep this simple, and not add any dependencies from 
the infra for the packages that would otherwise create a dependency cycle. So I 
removed this patch, and instead added the dependency explicitly in patch 2.

  Regards,
  Arnout

>   ifeq ($$(filter host-python-flit-core host-python-installer,$(1)),)
> -$(2)_DEPENDENCIES += host-python-flit-core host-python-installer
> +$(2)_DEPENDENCIES += host-python-installer
>   endif
>   endif # SETUP_TYPE
>   
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/python-installer: migrate setup type to flit

[Arnout Vandecappelle]

On 30/04/2022 01:04, James Hilliard wrote:
> This package is moving to flit and will soon be dropping distutils
> compatibility support.
> 
> We need to use flit-bootstrap as opposed to the normal flit setup
> type since host-python-pypa-build depends on host-python-installer.
> 
> We need to add the src directory to the PYTHONPATH so that installer
> can run from the src directory when installing itself.
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>

  Applied to master, with the explicit dependency, thanks.

  Regards,
  Arnout

> ---
>   package/python-installer/python-installer.mk | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk
> index 862a251415..5bb14e315e 100644
> --- a/package/python-installer/python-installer.mk
> +++ b/package/python-installer/python-installer.mk
> @@ -9,6 +9,7 @@ PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz
>   PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0
>   PYTHON_INSTALLER_LICENSE = MIT
>   PYTHON_INSTALLER_LICENSE_FILES = LICENSE
> -PYTHON_INSTALLER_SETUP_TYPE = distutils
> +PYTHON_INSTALLER_SETUP_TYPE = flit-bootstrap
> +HOST_PYTHON_INSTALLER_ENV = PYTHONPATH="$(@D)/src"
>   
>   $(eval $(host-python-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot