From patchwork Sat Oct 22 22:20:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 43962 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 BC0F527BBEA; Mon, 24 Oct 2022 04:43:24 +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=unavailable 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 722EE27BBE9 for ; Mon, 24 Oct 2022 04:43:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omjsg-0001UF-Dp for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 18:55:46 -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-0004h6-Cc 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 1omMsZ-0005Uq-4j for guix-patches@gnu.org; Sat, 22 Oct 2022 18:22:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omMsY-0001zi-Vv for guix-patches@gnu.org; Sat, 22 Oct 2022 18:22:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58587] [PATCH v3 10/22] gnu: python-glyphslib: 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.16664773257637 (code B ref 58587); Sat, 22 Oct 2022 22:22:06 +0000 Received: (at 58587) by debbugs.gnu.org; 22 Oct 2022 22:22:05 +0000 Received: from localhost ([127.0.0.1]:42567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omMsW-0001yv-Om for submit@debbugs.gnu.org; Sat, 22 Oct 2022 18:22:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omMsK-0001wi-82 for 58587@debbugs.gnu.org; Sat, 22 Oct 2022 18:21:52 -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 1omMsF-00056r-2v for 58587@debbugs.gnu.org; Sat, 22 Oct 2022 18:21:47 -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=Q/AZitL3qkCOLqYFzL787h9HNn6LxS2iyRJOEc4RO9U=; b=kdIx4k+MAmAnkjeBGwhu gkWAPLOafDGhQ78jTwVDIdYpgMPWNjAj9euB6MyjIZr5GsJv+lyoxQDAsbr7uBUgk9b1ajfcNa4WU ccxwIVF4vfhN0n07aeT5zXVbMTap7SKenaWaeINWf+KnTaTOUSF0GJqSH6zBB/W8sjk7+ncTRklhl 0IwMY7g9Ol+EexGKoR+tZ1YkolxitzLX2J0V+FKDE4K/sguZGGULm1qkGZZdg/tiZHFjbb1LRyOdT eqJZanBipg++E4lNZEc8BJ3z+VITmVOlhs0zrXVbC/w+4YY6Xo4pBtHzmqdTzm5gGhF5YPKyI5pXL xPjw0O8Rhbr2QA==; 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 1omMsE-0001Rg-LT for 58587@debbugs.gnu.org; Sat, 22 Oct 2022 18:21:46 -0400 From: Marius Bakke Date: Sun, 23 Oct 2022 00:20:48 +0200 Message-Id: <20221022222100.18103-10-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/fontutils.scm (python-glyphslib)[build-system]: Switch to PYPROJECT-BUILD-SYSTEM. [arguments]: Add #:test-flags. Remove #:phases. [native-inputs]: Remove PYTHON-PYPA-BUILD and PYTHON-WHEEL. --- gnu/packages/fontutils.scm | 42 ++++++++++---------------------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 9b7f1ac879..eefde1d893 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -76,8 +76,9 @@ (define-module (gnu packages fontutils) #:use-module (guix build-system copy) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) - #:use-module (guix build-system python) #:use-module (guix build-system meson) + #:use-module (guix build-system pyproject) + #:use-module (guix build-system python) #:use-module (guix utils) #:use-module (srfi srfi-1)) @@ -591,39 +592,18 @@ (define-public python-glyphslib (sha256 (base32 "0mkkwd09g76hvif603ij5aqicxh47zvhgyyd0pjcjmpdy6dr70yw")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list - #:phases - #~(modify-phases %standard-phases - (replace 'build - (lambda _ - ;; The Zip format does not support pre-1980 time stamps. - (let ((circa-1980 (* 10 366 24 60 60))) - (setenv "SOURCE_DATE_EPOCH" (number->string circa-1980)) - (invoke "python" "-m" "build" "--wheel" "--no-isolation" ".")))) - (replace 'install - (lambda _ - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl)))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "GUIX_PYTHONPATH" - (string-append (getcwd) ":" (getenv "GUIX_PYTHONPATH"))) - (invoke "pytest" "-vv" - ;; These fail because the test data has not yet been - ;; updated for newer FontTools: - ;; https://github.com/googlefonts/glyphsLib/issues/787 - ;; Re-enable for versions > 6.0.7. - "--ignore=tests/builder/designspace_gen_test.py" - "--ignore=tests/builder/interpolation_test.py" - ))))))) + #:test-flags #~'("-vv" + ;; These fail because the test data has not yet been + ;; updated for newer FontTools: + ;; https://github.com/googlefonts/glyphsLib/issues/787 + ;; Re-enable for versions > 6.0.7. + "--ignore=tests/builder/designspace_gen_test.py" + "--ignore=tests/builder/interpolation_test.py"))) (native-inputs - (list python-pypa-build - python-setuptools-scm - python-wheel + (list python-setuptools-scm ;; For tests. python-pytest