1. Forum
  2. Usenet
  3. LINUX.GENTOO.DEV

  • [gentoo-dev] [PATCH 0/7] distutils-r1.eclass: mesonpy option passing su

    From =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?@21:1/5 to All on Fri Nov 25 18:10:02 2022
    Hi,

    The highlight of this patchset is support for passing options that was introduced in >=dev-python/meson-python-0.11.0.

    For transition, the eclass only uses option passing if 0.11.0 or newer
    is installed. Ebuilds that need to pass DISTUTILS_ARGS (i.e. scipy)
    need to explicitly BDEPEND on it. Once this version goes stable, we'll
    update the minimal version in eclass' BDEPEND and make it unconditional.

    We're also adding a new get_NINJAOPTS function that returns appropriate
    options to pass to ninja, separately from eninja helper.

    Finally, the usual cleanup: bumping minimal versions. I've also noticed
    that we didn't clean up <dev-python/gpep517-9 support when bumping
    the dep.

    The new ebuild for dev-python/scipy is included. See the *9999 part
    of the patches for the changes.

    --
    Best regards,
    Michał Górny


    Michał Górny (7):
    ninja-utils.eclass: Split get_NINJAOPTS out
    distutils-r1.eclass: Pass options to meson-python backend
    dev-python/scipy: Pass -Dblas, -Dlapack via DISTUTILS_ARGS
    distutils-r1.eclass: Bump min dep versions to newest stable
    distutils-r1.eclass: Print versions of common hatch plugins
    distutils-r1.eclass: Remove support for gpep517 < 9
    python-utils-r1.eclass: Bump min Python versions

    dev-python/scipy/scipy-1.9.3-r1.ebuild | 109 ++++++++++++++++++++++
    dev-python/scipy/scipy-1.9.9999.ebuild | 11 ++-
    eclass/distutils-r1.eclass | 119 +++++++++++++------------
    eclass/ninja-utils.eclass | 15 +++-
    eclass/python-utils-r1.eclass | 14 +--
    5 files changed, 196 insertions(+), 72 deletions(-)
    create mode 100644 dev-python/scipy/scipy-1.9.3-r1.ebuild

    --
    2.38.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?@21:1/5 to All on Fri Nov 25 18:10:02 2022
    Signed-off-by: Michał Górny <mgorny@gentoo.org>
    ---
    eclass/distutils-r1.eclass | 50 +++++++++++++++++++++++++++++---------
    1 file changed, 39 insertions(+), 11 deletions(-)

    diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
    index 4cc117dfbd54..3ac06a458483 100644
    --- a/eclass/distutils-r1.eclass
    +++ b/eclass/distutils-r1.eclass
    @@ -178,7 +178,7 @@ esac
    if [[ ! ${_DISTUTILS_R1} ]]; then

    [[ ${EAPI} == 6 ]] && inherit eutils xdg-utils
    -inherit multibuild multiprocessing toolchain-funcs
    +inherit multibuild multiprocessing ninja-utils toolchain-funcs

    if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
    inherit python-r1
    @@ -1319,9 +1319,34 @@ distutils_pep517_install() {
    fi

    local config_settings=
    - if [[ -n ${DISTUTILS_ARGS[@]} ]]; then
    - case ${DISTUTILS_USE_PEP517} in
    - setuptools)
    + case ${DISTUTILS_USE_PEP517} in
    + meson-python)
    + # TODO: remove the condition once we BDEP on >=0.11
    + if has_version -b ">=dev-python/meson-python-0.11"; then
    + local -x NINJAOPTS=$(get_NINJAOPTS)
    + config_setting
  • From =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?@21:1/5 to All on Fri Nov 25 18:10:02 2022
    Signed-off-by: Michał Górny <mgorny@gentoo.org>
    ---
    eclass/distutils-r1.eclass | 30 +++++++++++++++---------------
    1 file changed, 15 insertions(+), 15 deletions(-)

    diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
    index 3ac06a458483..551e8f68ef99 100644
    --- a/eclass/distutils-r1.eclass
    +++ b/eclass/distutils-r1.eclass
    @@ -207,7 +207,7 @@ _distutils_set_globals() {
    case ${DISTUTILS_USE_PEP517} in
    flit)
    bdep+='
    - >=dev-python/flit_core-3.7.1[${PYTHON_USEDEP}]
    + >=dev-python/flit_core-3.8.0[${PYTHON_USEDEP}]
    '
    ;;
    flit_scm)
    @@ -217,7 +217,7 @@ _distutils_set_globals() {
    ;;
    hatchling)
    bdep+='
    - >=dev-python/hatchling-1.8.1[${PYTHON_USEDEP}]
    + >=dev-python/hatchling-1.11.1[${PYTHON_USEDEP}]
    '
    ;;
    jupyter)
    @@ -227,7 +227,7 @@ _distutils_set_globals() {
    ;;
    maturin)
    bdep+='
    - >=dev-util/maturin-0.13.2[${PYTHON_USEDEP}]
    + >=dev-util/maturin-0.13.7[${PYTHON_USEDEP}]
    '
    ;;
    no)
    @@ -236,33 +236,33 @@ _distutils