From patchwork Sat Oct 22 22:20:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 43852 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 242E727BBEA; Mon, 24 Oct 2022 02:48:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C7EB527BBE9 for ; Mon, 24 Oct 2022 02:48:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omjuq-0002DW-Qd for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 18:58:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1omMtX-0004nE-Af for guix-patches@gnu.org; Sat, 22 Oct 2022 18:23:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1omMtX-000620-3X for guix-patches@gnu.org; Sat, 22 Oct 2022 18:23:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omMtW-000258-VC for guix-patches@gnu.org; Sat, 22 Oct 2022 18:23:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58587] [PATCH v3 21/22] gnu: python-scikit-build: Switch to pyproject-build-system. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Oct 2022 22:23:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58587 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58587@debbugs.gnu.org Received: via spool by 58587-submit@debbugs.gnu.org id=B58587.16664773717893 (code B ref 58587); Sat, 22 Oct 2022 22:23:06 +0000 Received: (at 58587) by debbugs.gnu.org; 22 Oct 2022 22:22:51 +0000 Received: from localhost ([127.0.0.1]:42619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omMtH-000238-5x for submit@debbugs.gnu.org; Sat, 22 Oct 2022 18:22:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omMt4-000226-8K for 58587@debbugs.gnu.org; Sat, 22 Oct 2022 18:22:38 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1omMsx-0005yB-Hb for 58587@debbugs.gnu.org; Sat, 22 Oct 2022 18:22:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=kNQL5z8dECvUJ5FQlPznZtDUBezkD1whnMwh8TzuNVc=; b=YTHoWU1jvIpnv/mhfbmV PN9eSuwDjtuJI0PfyXHNAAL1Xn7Tr4+kuMVxENxYBZ7YZuO04h3qhIF9PlpqPESkF00saLdlkSIxT toDQ3UGSRzCVsKg4maYpYLQEjtqTd3S3eLrDXpAonz8kItrqWIyW0af7rt9yf8TfJSmLLBNHxy3mU ANetwge7RKaoA3t7Yp++Phu7I61hTP+B/6M7A/uIkGKcwhAIDTzydffBBLSbqRMxNRlmVAy+s0GnU e5C2jLsV0tI7VQ4RR/peE+ToM1jHDS5UXUweCpAQ3kQCMlZ5H9MqgK7a6aEcZWuoBa2m/3qxMyoY9 Jk1cXgrHrwlAlQ==; Received: from [84.214.173.6] (helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1omMsx-0001V9-3F for 58587@debbugs.gnu.org; Sat, 22 Oct 2022 18:22:31 -0400 From: Marius Bakke Date: Sun, 23 Oct 2022 00:20:59 +0200 Message-Id: <20221022222100.18103-21-marius@gnu.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221022222100.18103-1-marius@gnu.org> References: <87eduzu18u.fsf@gnu.org> <20221022222100.18103-1-marius@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-scikit-build)[build-system]: Set to PYPROJECT-BUILD-SYSTEM. [arguments]: Remove obsolete phases. [native-inputs]: Remove PYTHON-PYPA-BUILD and PYTHON-WHEEL. --- gnu/packages/python-xyz.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a8b94b0acb..bae4c385c0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27859,7 +27859,7 @@ (define-public python-scikit-build (uri (pypi-uri "scikit-build" version)) (sha256 (base32 "1wx1m9vnxnnz59lyaisgyxldp313kciyd4af8lf112vb8vbjy9yk")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:phases @@ -27870,11 +27870,6 @@ (define-public python-scikit-build (("^(CMAKE_DEFAULT_EXECUTABLE = ).*" _ head) (format #f "~a ~s~%" head (search-input-file inputs "bin/cmake")))))) - ;; XXX: PEP 517 manual build copied from python-isort. - (replace 'build - (lambda _ - (setenv "SOURCE_DATE_EPOCH" "315532800") - (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -27900,12 +27895,7 @@ (define-public python-scikit-build ;; nondeterministically (see: ;; https://github.com/scikit-build/scikit-build/issues/711). "and not test_generator_cleanup " - "and not test_generator_selection "))))) - (replace 'install - (lambda _ - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl))))))) + "and not test_generator_selection ")))))))) (native-inputs (list cmake-minimal gfortran @@ -27916,15 +27906,13 @@ (define-public python-scikit-build python-mock python-packaging python-path - python-pypa-build python-pytest python-pytest-cov python-pytest-mock python-pytest-virtualenv python-pytest-xdist python-requests - python-setuptools-scm - python-wheel)) + python-setuptools-scm)) (propagated-inputs (list python-distro python-packaging python-wheel)) (home-page "https://github.com/scikit-build/scikit-build")