From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id cIUuGE8NVmNCkQAAbAwnHQ (envelope-from ) for ; Mon, 24 Oct 2022 05:58:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 7bX2Fk8NVmOmzgAAG6o9tA (envelope-from ) for ; Mon, 24 Oct 2022 05:58:07 +0200 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 1397938919 for ; Mon, 24 Oct 2022 05:58:07 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omjrY-00018m-Kt for larch@yhetil.org; Sun, 23 Oct 2022 18:54:36 -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 1omMsZ-0004gs-6O for guix-patches@gnu.org; Sat, 22 Oct 2022 18:22: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 1omMsY-0005U3-MG for guix-patches@gnu.org; Sat, 22 Oct 2022 18:22:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omMsY-0001za-Hw for guix-patches@gnu.org; Sat, 22 Oct 2022 18:22:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58587] [PATCH v3 09/22] gnu: weasyprint: Use pyproject-build-system. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Oct 2022 22:22: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.16664773247624 (code B ref 58587); Sat, 22 Oct 2022 22:22:06 +0000 Received: (at 58587) by debbugs.gnu.org; 22 Oct 2022 22:22:04 +0000 Received: from localhost ([127.0.0.1]:42564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omMsW-0001yf-51 for submit@debbugs.gnu.org; Sat, 22 Oct 2022 18:22:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omMsI-0001wb-OK for 58587@debbugs.gnu.org; Sat, 22 Oct 2022 18:21:51 -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 1omMsD-00056j-Iy for 58587@debbugs.gnu.org; Sat, 22 Oct 2022 18:21:45 -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=3+eQtppnn3nXQOdDQCihD9B0PsifcuOoUb/12XbGaTA=; b=bZbjnCAwjFSjGRfq39oR 2hlXMmP9cFyz6Qa2I08wikW0OTn74oeD7vFxE+Yl2q8i4MIb/6XiBmGd3S+macL5ELal7iTEFEzwp x7b7hvuiotUubqY9Hy+HTT9a+Si78bhIcQHYIMtNufXcr83YnwX+B63whjoTgIUTeXp7EHiIPz/GW Ce73zz3eDtQYONwFp/whDoz42IYmciiTVraeGzTvaOIRMngNFSRZVuyp/pdMX6YOvvkE149OWvMMg bkFtoFEDyp+wPzDdlak8iz6zeB8UpxYCq0vaXcMOkiwqMRLOdYFRfJS1QyW8cxF67Q5MuXBqpjEvb DTG9ws3xyW+Nzg==; 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 1omMsD-0001Rb-51 for 58587@debbugs.gnu.org; Sat, 22 Oct 2022 18:21:45 -0400 From: Marius Bakke Date: Sun, 23 Oct 2022 00:20:47 +0200 Message-Id: <20221022222100.18103-9-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 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" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1666583887; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=3+eQtppnn3nXQOdDQCihD9B0PsifcuOoUb/12XbGaTA=; b=T0gMzYejIQ5+6GY8O394O94Gaawij6ks7pFSlvPlYQL+sJsz8TfJTW8ZZqXNIbuPDGVnAM 47P2lyB+Az2TIFmilRd1jpMeiH7HCBKWJ3YqngqfB97YB14SOarAAP02gl2C8kV3DOFs/H TJ3qWqQH2kK/U5ZVoHmggDpqQUpYx1YREKnn27hx7q3jwboCHV8Eo1KolAwnDXpnJYtoDW HuZLRWWNtE5EoQc+mUJnomDlceTWLJ2fhn6L37lWzIBBwA/o3aNB727JqmqwgfSaiMCj6B 4pGCpqj/lcsDaMoq5oNECDMjXzKm1KQoYra8UNr/uPde2+a+A+SLkNTFAEMxMA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1666583887; a=rsa-sha256; cv=none; b=MWG4Oa/jchQ3/ZzHHEsFmHYItzG7hayO3ILOtZJftXbpB8TkdF/6dlhoBR9vj08I76Wg1E TcQO1LVGkVv/v3knVtiKz7fvK51gm22jAWEm6xcSH9ySYFElZSNH/FSooXeFxPvW3yGIcA DLvho1EwnS+50SCZ9ExwEFPhFNhl+37EMNJY9NCk5/+eDURRguLrUVcrixoTizWWXlK7ur x3VCvQBCcyJRbIPVn2qz1Lkqwaznk11PM2tARWpmrMDQcZGqTw+h875qDq1mw6RX1lSjht KVvbnP+jAqODipeuoyGebQ0YT/QX66BBPTuvkwin0VNjC93HFNCxL81He0kLgw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=bZbjnCAw; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -0.11 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=bZbjnCAw; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: 1397938919 X-Spam-Score: -0.11 X-Migadu-Scanner: scn0.migadu.com X-TUID: nLH9nn/+v8A3 * gnu/packages/pdf.scm (weasyprint)[build-system]: Switch to PYPROJECT-BUILD-SYSTEM. [arguments]: Remove redundant phases. Add #:test-flags. [native-inputs]: Remove PYTHON-PYPA-BUILD. --- gnu/packages/pdf.scm | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index ec75bca6e3..8c871e4341 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1497,9 +1497,11 @@ (define-public weasyprint (sha256 (base32 "0cn8gpgyic6pmrnhp0540nbgplpsd5aybi7k89anz6m1sshgjzgs")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list + #:test-flags #~(list "-vv" "-c" "/dev/null" + "-n" (number->string (parallel-job-count))) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-library-paths @@ -1520,21 +1522,7 @@ (define-public weasyprint (("'pangoft2-1.0-0'") (format #f "~s" (search-input-file inputs - "lib/libpangoft2-1.0.so")))))) - ;; XXX: PEP 517 manual build copied from python-isort. - (replace 'build - (lambda _ - (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv" "-c" "/dev/null" - "-n" (number->string (parallel-job-count)))))) - (replace 'install - (lambda _ - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl))))))) + "lib/libpangoft2-1.0.so"))))))))) (inputs (list fontconfig glib harfbuzz pango)) (propagated-inputs (list gdk-pixbuf @@ -1552,7 +1540,6 @@ (define-public weasyprint (list font-dejavu ;tests depend on it ghostscript python-flit-core - python-pypa-build python-pytest python-pytest-xdist)) (home-page "https://weasyprint.org/") -- 2.38.0