From patchwork Mon Oct 17 20:11:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 43482 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 D485727BBED; Mon, 17 Oct 2022 21:15:32 +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 5083627BBEA for ; Mon, 17 Oct 2022 21:15:32 +0100 (BST) Received: from localhost ([::1]:37488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okWWJ-0000V5-Dd for patchwork@mira.cbaines.net; Mon, 17 Oct 2022 16:15:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okWTz-00070Y-Ux for guix-patches@gnu.org; Mon, 17 Oct 2022 16:13:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51107) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1okWTz-0002IB-Mz for guix-patches@gnu.org; Mon, 17 Oct 2022 16:13:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1okWTz-0007Pn-H9 for guix-patches@gnu.org; Mon, 17 Oct 2022 16:13:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58587] [PATCH 09/14] gnu: python-glyphslib: Use pyproject-build-system. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Oct 2022 20:13:07 +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.166603755628317 (code B ref 58587); Mon, 17 Oct 2022 20:13:07 +0000 Received: (at 58587) by debbugs.gnu.org; 17 Oct 2022 20:12:36 +0000 Received: from localhost ([127.0.0.1]:50152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okWTU-0007MZ-Cu for submit@debbugs.gnu.org; Mon, 17 Oct 2022 16:12:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okWTJ-0007KY-9i for 58587@debbugs.gnu.org; Mon, 17 Oct 2022 16:12:25 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:51282) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okWTE-0002E0-4b for 58587@debbugs.gnu.org; Mon, 17 Oct 2022 16:12:20 -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=peqUQD6UK8mw3Do6BHEl lOrswGL7MuokCSQV/OTawgelb9jwuxABz5AEGkNB5OKBgemwcmGHiwQ9Mi7BQZNGGqbKlbjHgPEie Uk8bGfoqxWpR/bqwgbW6BkxaVj66siZaLTPFOUM/biAcmFMLmFLwdYwFr8ZgKVYQu2cVAYjlaaFMO 8L/1yg6jbRthOOE8qJnRb/fG3lzqxVdBP4ucjaHmkARF2n74b2vcBiff+NEsspQMpB5Y1nyBvq0yI 2yckv6Yj8F9PEdLj5B4OBk9W7Rd1W2xSYmrPvbOG5KySrpis2cSWxwHneTBrQ/3uhpm2RBkBClsq3 73IrovOHSZwAQw==; Received: from [84.211.203.64] (port=33110 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okWTD-000512-M9 for 58587@debbugs.gnu.org; Mon, 17 Oct 2022 16:12:19 -0400 From: Marius Bakke Date: Mon, 17 Oct 2022 22:11:56 +0200 Message-Id: <20221017201201.4808-9-marius@gnu.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221017201201.4808-1-marius@gnu.org> References: <20221017200624.4076-1-marius@gnu.org> <20221017201201.4808-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