From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id gDRUFSsYj2aEWgEA62LTzQ:P1 (envelope-from ) for ; Wed, 10 Jul 2024 23:24:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id gDRUFSsYj2aEWgEA62LTzQ (envelope-from ) for ; Thu, 11 Jul 2024 01:24:27 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=g2MygsCF; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720653867; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=xqQmdE///f7gCwjI+XLOkhXBu7FXrOB0kET6CCzFYlo=; b=h3/YE9789WQY9pyDHfamN+VrnNAeIi5iVjmsSpyetewGGl6vPOGU1LgZOg2+U8YC6Zy3iQ uzEYBA6EGqgO1r8wJy/5FYoOzYrXx6B/qkdeOF1waqEupw4Mm0YnuXOV7g8AMtaKH+KH+1 NBvl25JLMnxCK8HAtyfciMhSsRBvrISCc2R6HNiCawO2DF82THWmiY0eTB0szQd+/XKOxF OmWUuLrmudyAqnvYArQZbJ0ft89bniTYhhvkLDPPNIqexwu1UsTO4SyLKqPxmoVlKRhZRY 6bhip9x5taxZ4A4rzezE/6knIHdlhFbhtLJP/Yncqgv1Rx0Kf4hJolGNCGA06w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720653867; a=rsa-sha256; cv=none; b=DcE92nzC+GL9y9zS52N0QclvOI+Pg/pe6LVC5UjOOZvG3aJkgcrXFel101TxJmWCLN8dAl AVJtbEEAHUWOE+fl3tGZtHEbsztLHhg4i7Gd/nOcaCbw4vARioPd1idOmddDzkd+4zR4Vr yFl6/pX8JNlk6vMHzafiUXqi5AWxWJBG6+vaCVsJXt0SXXBDwDnFTm+xaenbWsmIjyOzeP lzT2xizfzZgtnmJQBC3Mj4/5K/ZcrHHPnJb3QmJTWJvnNY0dbcqh+Wp26uLfWVVBJsIFp8 8iNYFbN4WWVbcuAQR17M5lXzp06xq5L14UHQVj07oULS9cisACs151fY6VKBlA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=g2MygsCF; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B6771769CD for ; Thu, 11 Jul 2024 01:24:26 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sRgfR-0005Ny-5H; Wed, 10 Jul 2024 19:24:09 -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 1sRgfM-0005Mi-R2 for guix-patches@gnu.org; Wed, 10 Jul 2024 19:24:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sRgfM-0002fg-II for guix-patches@gnu.org; Wed, 10 Jul 2024 19:24:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sRgfK-0005MX-QG for guix-patches@gnu.org; Wed, 10 Jul 2024 19:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71884] [PATCH v2 3/4] gnu: python-dolfin-adjoint: Swap to pyproject-build-system. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jul 2024 23:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71884 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71884@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 71884-submit@debbugs.gnu.org id=B71884.172065379020519 (code B ref 71884); Wed, 10 Jul 2024 23:24:02 +0000 Received: (at 71884) by debbugs.gnu.org; 10 Jul 2024 23:23:10 +0000 Received: from localhost ([127.0.0.1]:50532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRgeT-0005Ks-K1 for submit@debbugs.gnu.org; Wed, 10 Jul 2024 19:23:09 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:42201) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRgeS-0005K6-0E for 71884@debbugs.gnu.org; Wed, 10 Jul 2024 19:23:08 -0400 Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-426717a2d12so1762665e9.0 for <71884@debbugs.gnu.org>; Wed, 10 Jul 2024 16:23:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720653723; x=1721258523; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xqQmdE///f7gCwjI+XLOkhXBu7FXrOB0kET6CCzFYlo=; b=g2MygsCFU9vr/1E2O9tVcPYVI8Il6qGta2WvXU+JEUQl4+okOzSdd34gf6eAceWOiZ 9Bi6FBJH4kvMmb9fxByuuQjfC1CDoG7MqPkmEpdVcDA0sd9bKGXXxVNYu/zry/6FJi41 KKlqOswA1lLmHzWYRH0VjXy2aJ5LEoVv+8iYq24hnoonNW2s6UiRNYRq5CAFwhgK2nTy 1MQrAxsrKYtJ5dC3kDbm32tEk+JREWWR6NSCZlQweJhYcuXMwuFLeFxUaL3gkUuycXEm f/AiJcKkfIdn3WZoWyLgrucs8+Ia6QWvOwNo/MlnrDIWAOjO448kPelaUHlk144PibCo NIaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720653723; x=1721258523; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xqQmdE///f7gCwjI+XLOkhXBu7FXrOB0kET6CCzFYlo=; b=VUNO4hF/YkchENyQDdI+BfpjaoqfdL8sAEJbxA5D4KcT8EiuzqIxdi83s2k7jQCWww XqiFZPOg4A3TZ83cdMCscYrRXwB3uPcregzrb3k6XNzUplQ89KFpGcRZYXmBfqqRHcBb vqvDMPozSAq0ujJcW3VX/XPukvGsSGRQlZcvIl4habtYlU0qobfWSPedIeVBQoZSpoPr YHEpyhfoHqQ+63CqCjFxDGXGDoTO7VDPYDQpC4ja4bra1wGvzaG2tK96IE32cXsGRc4T wmiEUQyNN/MzpYP8f9BxwCgMiIUxnd4wjKbkpUK9OEod/RJZkkNYDEPDoOAe1u0LVtYq 3X3Q== X-Gm-Message-State: AOJu0Yxzlzd+89TVBhtjbhqNjkSJbgm4UxeiW9vetUUwMFw/q9HnpNzy 7JHdAg45D9iFtg+kZv83/QbYJNEgAYi+xt2skxHX+rMMhhHsd2LimkuNYS6I X-Google-Smtp-Source: AGHT+IFRclHxgARlUEP9ptBZ99q4LCXSKE4oQ+YFUXs/btVYbYoA0iB+8CwDVTsczer+Gls9rO6wOg== X-Received: by 2002:a05:600c:2297:b0:426:706c:a55a with SMTP id 5b1f17b1804b1-427981b2265mr8080465e9.2.1720653722681; Wed, 10 Jul 2024 16:22:02 -0700 (PDT) Received: from guxtil.incerto.xyz (bagu-15-b2-v4wan-170076-cust245.vm21.cable.virginm.net. [77.98.0.246]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4266f6f108dsm96856225e9.13.2024.07.10.16.22.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 16:22:02 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 11 Jul 2024 00:21:49 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <6ebbf954f399ca8347144b087fae787c2b071354.1720653590.git.sharlatanus@gmail.com> References: <6ebbf954f399ca8347144b087fae787c2b071354.1720653590.git.sharlatanus@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -0.80 X-Spam-Score: -0.80 X-Migadu-Queue-Id: B6771769CD X-Migadu-Scanner: mx11.migadu.com X-TUID: j05lu8guEG2N * gnu/packages/simulation.scm (python-dolfin-adjoint) [source]: Remove trailing #t from snippet. [build-system]: Swap to pyproject-build-system. [arguments]: Apply G-expressions. <#:phases>: Swap back to defaul 'check phase. python-dolfin-adjoint Change-Id: Idf100b718b44d9d6695e598c434fbbac55a38845 --- gnu/packages/simulation.scm | 61 ++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 5341c0ae55..ad9f0080cc 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -1187,8 +1187,7 @@ (define-public python-dolfin-adjoint (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "0xhy76a5f33hz94wc9g2mc5qmwkxfccbbc6yxl7psm130afp8lhn")) + (base32 "0xhy76a5f33hz94wc9g2mc5qmwkxfccbbc6yxl7psm130afp8lhn")) (modules '((guix build utils))) (snippet '(begin @@ -1201,39 +1200,33 @@ (define-public python-dolfin-adjoint (("\\\"mpirun\\\", \\\"-n\\\", \\\"2\\\", ") ""))) ;; Result files are regenerated in the check phase. (delete-file-recursively - "tests/migration/viscoelasticity/test-results") - #t)))) - (build-system python-build-system) + "tests/migration/viscoelasticity/test-results"))))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'build 'mpi-setup - ,%openmpi-setup) - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((doc (string-append (assoc-ref outputs "out") - "/share/doc/" ,name "-" - ,version)) - (examples (string-append doc "/examples"))) - (mkdir-p examples) - (copy-recursively "examples" examples)) - #t)) - (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (setenv "HOME" (getcwd)) - (and (invoke "py.test" "-v" "tests/fenics_adjoint" - "-k" "not test_read_checkpoint") - (invoke "py.test" "-v" "tests/migration") - (invoke "py.test" "-v" "tests/pyadjoint"))) - #t)) - ;; Remove 'sanity-check, because it tries to import - ;; firedrake_adjoint after importing fenics_adjoint. - ;; Both load a module named 'backend' and firedrake_adjoint - ;; fails with an ImportError if it sees that the backend module - ;; has already been loaded. - (delete 'sanity-check)))) + (list + #:test-flags + #~(list "tests/fenics_adjoint" + "tests/migration" + "tests/pyadjoint" + "-k" "not test_read_checkpoint") + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'mpi-setup #$%openmpi-setup) + (add-before 'check 'set-environment-variables + (lambda _ + (setenv "HOME" "/tmp"))) + (add-after 'install 'install-doc + (lambda _ + (let* ((doc (string-append #$output "/share/doc/" #$name "-" #$version)) + (examples (string-append doc "/examples"))) + (mkdir-p examples) + (copy-recursively "examples" examples)))) + ;; Remove 'sanity-check, because it tries to import + ;; firedrake_adjoint after importing fenics_adjoint. + ;; Both load a module named 'backend' and firedrake_adjoint + ;; fails with an ImportError if it sees that the backend module + ;; has already been loaded. + (delete 'sanity-check)))) (inputs (list fenics openmpi pybind11)) (native-inputs -- 2.41.0