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 7B3DA158041 for ; Tue, 26 Mar 2024 18:26:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B350BE2A63; Tue, 26 Mar 2024 18:25:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D951E2A5F for ; Tue, 26 Mar 2024 18:25:55 +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 2/7] distutils-r1.eclass: Run pdm.pep517.api via pdm-backend Date: Tue, 26 Mar 2024 19:25:40 +0100 Message-ID: <20240326182545.247160-2-mgorny@gentoo.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240326182545.247160-1-mgorny@gentoo.org> References: <20240326182545.247160-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: 1767c1be-3843-4ba0-a637-7a61a0b765df X-Archives-Hash: 83f2ae519b628e4ab1b96d04d6868427 Signed-off-by: Michał Górny --- eclass/distutils-r1.eclass | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index e4b17c433e5d..16d97501012b 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -124,8 +124,6 @@ esac # # - pbr - pbr backend # -# - pdm - pdm.pep517 backend -# # - pdm-backend - pdm.backend backend # # - poetry - poetry-core backend @@ -257,11 +255,6 @@ _distutils_set_globals() { >=dev-python/pbr-6.0.0[${PYTHON_USEDEP}] ' ;; - pdm) - bdep+=' - >=dev-python/pdm-pep517-1.1.4[${PYTHON_USEDEP}] - ' - ;; pdm-backend) bdep+=' >=dev-python/pdm-backend-2.1.8[${PYTHON_USEDEP}] @@ -1002,12 +995,6 @@ _distutils-r1_print_package_versions() { dev-python/wheel ) ;; - pdm) - packages+=( - dev-python/pdm-pep517 - dev-python/setuptools - ) - ;; pdm-backend) packages+=( dev-python/pdm-backend @@ -1214,12 +1201,9 @@ _distutils-r1_backend_to_key() { pbr.build) echo pbr ;; - pdm.backend) + pdm.backend|pdm.pep517.api) echo pdm-backend ;; - pdm.pep517.api) - echo pdm - ;; poetry.core.masonry.api|poetry.masonry.api) echo poetry ;; @@ -1280,6 +1264,9 @@ _distutils-r1_get_backend() { flit.buildapi) new_backend=flit_core.buildapi ;; + pdm.pep517.api) + new_backend=pdm.backend + ;; poetry.masonry.api) new_backend=poetry.core.masonry.api ;; -- 2.44.0