This series adds support for setuptools as distutils will be
deprecated in python 3.12.

Not done for this series:
  - Andrew suggested simplifying the code in m4/python_devel.m4[0] and
    this is not done yet.

[0] https://lore.kernel.org/xen-devel/fdf87d82-aa3c-fd2e-6271-848f1a806fb2@citrix.com/

Changes since v2:
  - These containers used for gitlab ci were missing setuptools in the
    previous series and now they have it:
    * alpine/3.18-arm64v8
    * opensuse-tumbleweed
    * debian/bookworm-i386
    * debian/bookworm-arm64v8
  - These containers used for gitlab ci are being kept without
    setuptools to test installations that don't have it:
    * centos/7
    * debian/stretch
    * ubuntu/trusty
    * ubuntu/xenial
    * ubuntu/bionic
  - Fix commit messages that talked about removing distutils support
    as we are keeping it.
  - Add my Signed-off-by to all commits
  - Clarify in the readme that python's minimum version is 2.7.
  - Fold the changes to the ./configure script into the patch that
    changes `m4/python_devel.m4`.  Create ./configure using autoconf
    2.69.

Changes since v1:
  - Update all containers to have setuptools, as python 3.12
    deprecates distutils in favour of setuptools
  - Keep python2's support by falling back to distutils if setuptools
    is not installed
  - Drop the commit about raising the baseline requirement for python,
    as we keep supporting python2

v1: https://lore.kernel.org/xen-devel/20230316171634.320626-1-marmarek@invisiblethingslab.com/
v2: https://lore.kernel.org/xen-devel/cover.1694450145.git.javi.merino@cloud.com/

Javi Merino (2):
  automation: add python3's setuptools to containers
  README: update to remove old note about the build system's python
    expectation

Marek Marczykowski-Górecki (2):
  tools: convert setup.py to use setuptools
  tools: don't use distutils in configure nor Makefile

 README                                        | 11 +---
 .../build/alpine/3.18-arm64v8.dockerfile      |  1 +
 automation/build/alpine/3.18.dockerfile       |  1 +
 automation/build/archlinux/current.dockerfile |  1 +
 .../build/debian/bookworm-arm64v8.dockerfile  |  1 +
 .../build/debian/bookworm-i386.dockerfile     |  1 +
 automation/build/debian/bookworm.dockerfile   |  1 +
 .../build/suse/opensuse-leap.dockerfile       |  1 +
 .../build/suse/opensuse-tumbleweed.dockerfile |  1 +
 automation/build/ubuntu/focal.dockerfile      |  1 +
 m4/python_devel.m4                            | 28 +++++-----
 tools/configure                               | 52 +++++++------------
 tools/libs/stat/Makefile                      |  4 +-
 tools/pygrub/setup.py                         |  7 ++-
 tools/python/setup.py                         |  7 ++-
 15 files changed, 57 insertions(+), 61 deletions(-)

-- 
2.42.0

On 19/09/2023 7:30 am, Javi Merino wrote:
> This series adds support for setuptools as distutils will be
> deprecated in python 3.12.
>
> Not done for this series:
>   - Andrew suggested simplifying the code in m4/python_devel.m4[0] and
>     this is not done yet.
>
> [0] https://lore.kernel.org/xen-devel/fdf87d82-aa3c-fd2e-6271-848f1a806fb2@citrix.com/
>
> Changes since v2:
>   - These containers used for gitlab ci were missing setuptools in the
>     previous series and now they have it:
>     * alpine/3.18-arm64v8
>     * opensuse-tumbleweed
>     * debian/bookworm-i386
>     * debian/bookworm-arm64v8
>   - These containers used for gitlab ci are being kept without
>     setuptools to test installations that don't have it:
>     * centos/7
>     * debian/stretch
>     * ubuntu/trusty
>     * ubuntu/xenial
>     * ubuntu/bionic
>   - Fix commit messages that talked about removing distutils support
>     as we are keeping it.
>   - Add my Signed-off-by to all commits
>   - Clarify in the readme that python's minimum version is 2.7.
>   - Fold the changes to the ./configure script into the patch that
>     changes `m4/python_devel.m4`.  Create ./configure using autoconf
>     2.69.
>
> Changes since v1:
>   - Update all containers to have setuptools, as python 3.12
>     deprecates distutils in favour of setuptools
>   - Keep python2's support by falling back to distutils if setuptools
>     is not installed
>   - Drop the commit about raising the baseline requirement for python,
>     as we keep supporting python2
>
> v1: https://lore.kernel.org/xen-devel/20230316171634.320626-1-marmarek@invisiblethingslab.com/
> v2: https://lore.kernel.org/xen-devel/cover.1694450145.git.javi.merino@cloud.com/
>
> Javi Merino (2):
>   automation: add python3's setuptools to containers
>   README: update to remove old note about the build system's python
>     expectation
>
> Marek Marczykowski-Górecki (2):
>   tools: convert setup.py to use setuptools
>   tools: don't use distutils in configure nor Makefile

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

I'll rebuild the containers and regenerate autoconf.

On Wed, 20 Sep 2023, Andrew Cooper wrote:
> On 19/09/2023 7:30 am, Javi Merino wrote:
> > This series adds support for setuptools as distutils will be
> > deprecated in python 3.12.
> >
> > Not done for this series:
> >   - Andrew suggested simplifying the code in m4/python_devel.m4[0] and
> >     this is not done yet.
> >
> > [0] https://lore.kernel.org/xen-devel/fdf87d82-aa3c-fd2e-6271-848f1a806fb2@citrix.com/
> >
> > Changes since v2:
> >   - These containers used for gitlab ci were missing setuptools in the
> >     previous series and now they have it:
> >     * alpine/3.18-arm64v8
> >     * opensuse-tumbleweed
> >     * debian/bookworm-i386
> >     * debian/bookworm-arm64v8
> >   - These containers used for gitlab ci are being kept without
> >     setuptools to test installations that don't have it:
> >     * centos/7
> >     * debian/stretch
> >     * ubuntu/trusty
> >     * ubuntu/xenial
> >     * ubuntu/bionic
> >   - Fix commit messages that talked about removing distutils support
> >     as we are keeping it.
> >   - Add my Signed-off-by to all commits
> >   - Clarify in the readme that python's minimum version is 2.7.
> >   - Fold the changes to the ./configure script into the patch that
> >     changes `m4/python_devel.m4`.  Create ./configure using autoconf
> >     2.69.
> >
> > Changes since v1:
> >   - Update all containers to have setuptools, as python 3.12
> >     deprecates distutils in favour of setuptools
> >   - Keep python2's support by falling back to distutils if setuptools
> >     is not installed
> >   - Drop the commit about raising the baseline requirement for python,
> >     as we keep supporting python2
> >
> > v1: https://lore.kernel.org/xen-devel/20230316171634.320626-1-marmarek@invisiblethingslab.com/
> > v2: https://lore.kernel.org/xen-devel/cover.1694450145.git.javi.merino@cloud.com/
> >
> > Javi Merino (2):
> >   automation: add python3's setuptools to containers
> >   README: update to remove old note about the build system's python
> >     expectation
> >
> > Marek Marczykowski-Górecki (2):
> >   tools: convert setup.py to use setuptools
> >   tools: don't use distutils in configure nor Makefile
> 
> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
> 
> I'll rebuild the containers and regenerate autoconf.

Thanks Andrew, go ahead