From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5237915806E for ; Fri, 2 Jun 2023 14:00:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60BF6E092A; Fri, 2 Jun 2023 13:59:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10753E0924 for ; Fri, 2 Jun 2023 13:59:39 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 3/7] distutils-r1.eclass: Remove support for old maturin Date: Fri, 2 Jun 2023 15:58:25 +0200 Message-ID: <20230602135930.144301-4-mgorny@gentoo.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230602135930.144301-1-mgorny@gentoo.org> References: <20230602135930.144301-1-mgorny@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 5dc1a121-3db0-48e4-ab09-82b60107871a X-Archives-Hash: 79c9763b0bdd99581cce0153855ecba7 Signed-off-by: Michał Górny --- eclass/distutils-r1.eclass | 44 +++++++++++++------------------------- 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index f3325d5bd8f4..12ed6e77b969 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -230,7 +230,7 @@ _distutils_set_globals() { ;; maturin) bdep+=' - >=dev-util/maturin-0.14.17[${PYTHON_USEDEP}] + >=dev-util/maturin-1.0.1[${PYTHON_USEDEP}] ' ;; no) @@ -1331,26 +1331,21 @@ distutils_pep517_install() { local config_settings= case ${DISTUTILS_USE_PEP517} in maturin) - # ebuild's DISTUTILS_ARGS are currently ignored if <1.0.0, ebuilds - # should set the dependency if used until this can be cleaned up - # (reminder to cleanup the old MATURIN_PEP517_ARGS block too) - if has_version -b '>=dev-util/maturin-1.0.0'; then - # `maturin pep517 build-wheel --help` for options - local maturin_args=( - "${DISTUTILS_ARGS[@]}" - --jobs="$(makeopts_jobs)" - --skip-auditwheel # see bug #831171 - $(in_iuse debug && usex debug '--profile=dev' '') - ) + # `maturin pep517 build-wheel --help` for options + local maturin_args=( + "${DISTUTILS_ARGS[@]}" + --jobs="$(makeopts_jobs)" + --skip-auditwheel # see bug #831171 + $(in_iuse debug && usex debug '--profile=dev' '') + ) - config_settings=$( - "${EPYTHON}" - "${maturin_args[@]}" <<-EOF || die - import json - import sys - print(json.dumps({"build-args": sys.argv[1:]})) - EOF - ) - fi + config_settings=$( + "${EPYTHON}" - "${maturin_args[@]}" <<-EOF || die + import json + import sys + print(json.dumps({"build-args": sys.argv[1:]})) + EOF + ) ;; meson-python) local -x NINJAOPTS=$(get_NINJAOPTS) @@ -1526,15 +1521,6 @@ distutils-r1_python_compile() { esetup.py build -j "${jobs}" "${@}" fi ;; - maturin) - if has_version -b '