From patchwork Thu Apr 6 21:37:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 49007 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 06262173FD; Thu, 6 Apr 2023 22:38: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=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 8274417395 for ; Thu, 6 Apr 2023 22:38:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pkXJ1-0008ME-2C; Thu, 06 Apr 2023 17:38:07 -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 1pkXIx-0008LT-49 for guix-patches@gnu.org; Thu, 06 Apr 2023 17:38:03 -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 1pkXIw-0004By-Sd for guix-patches@gnu.org; Thu, 06 Apr 2023 17:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pkXIw-0008IT-6j for guix-patches@gnu.org; Thu, 06 Apr 2023 17:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62703] [PATCH] gnu: abjad: Fix build. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 Apr 2023 21:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62703 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62703@debbugs.gnu.org Cc: Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168081705131849 (code B ref -1); Thu, 06 Apr 2023 21:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Apr 2023 21:37:31 +0000 Received: from localhost ([127.0.0.1]:55338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pkXIQ-0008Hc-6B for submit@debbugs.gnu.org; Thu, 06 Apr 2023 17:37:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:34630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pkXIM-0008HS-Ut for submit@debbugs.gnu.org; Thu, 06 Apr 2023 17:37:28 -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 1pkXIM-0007qn-GG for guix-patches@gnu.org; Thu, 06 Apr 2023 17:37:26 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pkXIG-00043i-ST for guix-patches@gnu.org; Thu, 06 Apr 2023 17:37:26 -0400 Received: by mail-wr1-x430.google.com with SMTP id r11so40809063wrr.12 for ; Thu, 06 Apr 2023 14:37:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680817038; x=1683409038; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xxNZ4b/IxzJwdr9qvxfRDHOfmX51HHvTttqc3EvNQgM=; b=Pn9QPQ2WR+2Gz9ITMBYaF0Odc4Nf54MEmArdmKeQEE5hqTnwQWd833czuVQ5vIzHe3 W5vvF0sdjtfGjTKCYyEOOzVnxF5k90qUKHl5XiOlrn0N+ST9XZ5EnJNkcLB+7GmXTdyN /GTNyN1swlwtIuOLNvv2dWrtklpeTo7M7VTfzgf6t7pCLAjO5KlCektWm9NxZnmScwdr soDdviy66iPZ2uY/qm0jDAuOfG6XEE7CaGMHDdzN4nbnydnz6uZcJHPcMIavSHWQmbMk sCulggWmisRLpwQXC3Y5+432HdumIhzv0nFGbDBzaBnrT1I1WeZOIVmuxI4TGThCl68X j0LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680817038; x=1683409038; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xxNZ4b/IxzJwdr9qvxfRDHOfmX51HHvTttqc3EvNQgM=; b=ZjjvmLOzpjwo9w/0TaiJpZh/WKxcO9fTRf93/oE4dE/OaXrV8JSOO8ZYdaGuR60Mt1 2X11QJE/h42MhBHnqf2Fzk1z5DIaOFhlW7kdTv7uwd0W8S8vppDut8Z4ds3dAgcRL1KI H8XXRQAlDuFEullrVATm3gNNLiDu1S7AhrYtZFzP89FwRahGQbYe8vF9lmZkn9OxdffK MUal15eskgD6mWYidXvgYoUo2XmW4YVjHpFirjSeqMhImOnGdaK8jJP8P2CtzoQI3Mmz Ka0WzEh0qfeWH/vLyUZ9+/4eeF12J1wi5Sb1k/xxZbOVx6deQ40H+VTve85yXrldrus5 SMAQ== X-Gm-Message-State: AAQBX9dDm+N9ajD5xJ3wFFrM3citX1yeZYYiEzxXTjGnsCI5K2hnIaz+ M05IRM4Mb7aDqYjPUjwZt5M/bB89Bys= X-Google-Smtp-Source: AKy350bcwIePrTdbT2KtQon/A4mZSrSFGmlzI1zjVuE8PMaqY+q6KAlH0BAJVQ/COgO6xSVCN1s6jw== X-Received: by 2002:adf:cd04:0:b0:2cf:ea5d:f607 with SMTP id w4-20020adfcd04000000b002cfea5df607mr7632130wrm.17.1680817038217; Thu, 06 Apr 2023 14:37:18 -0700 (PDT) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id f4-20020adff8c4000000b002cff06039d7sm2774292wrq.39.2023.04.06.14.37.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 14:37:17 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 6 Apr 2023 22:37:15 +0100 Message-Id: <20230406213715.28374-1-sharlatanus@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=sharlatanus@gmail.com; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Sort use-module alphabetically and add (guix build-system pyproject) * gnu/packages/music.scm (abjad): Fix build. [arguments]: Use gexp. : Add disable-failing-tests phase to fix build process of the package. [propagated-inputs]: Move python-flake8, python-isort, python-mypy, python-pytest, python-pytest-cov, python-pytest-helpers-namespace, python-six, python-sphinx-autodoc-typehints from here ... [native-inputs]: ... to here. Remove python-black. --- gnu/packages/music.scm | 98 +++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 48 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c63dc69972..faaf82703b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -69,33 +69,34 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages music) - #:use-module (guix gexp) - #:use-module (guix utils) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix build-system gnu) #:use-module (guix build-system ant) #:use-module (guix build-system cmake) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system meson) #:use-module (guix build-system perl) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system qt) - #:use-module (guix build-system scons) - #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system qt) - #:use-module (guix build-system waf) - #:use-module (guix build-system trivial) - #:use-module (guix build-system go) #:use-module (guix build-system qt) + #:use-module (guix build-system scons) + #:use-module (guix build-system trivial) + #:use-module (guix build-system waf) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages algebra) #:use-module (gnu packages apr) + #:use-module (gnu packages assembly) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) - #:use-module (gnu packages assembly) #:use-module (gnu packages backup) #:use-module (gnu packages base) ;libbdf #:use-module (gnu packages bash) @@ -104,9 +105,9 @@ (define-module (gnu packages music) #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) #:use-module (gnu packages cdrom) - #:use-module (gnu packages code) #:use-module (gnu packages check) #:use-module (gnu packages cmake) + #:use-module (gnu packages code) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) @@ -124,13 +125,14 @@ (define-module (gnu packages music) #:use-module (gnu packages freedesktop) #:use-module (gnu packages game-development) #:use-module (gnu packages gcc) - #:use-module (gnu packages gnupg) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnunet) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang) #:use-module (gnu packages gpodder) #:use-module (gnu packages graphics) #:use-module (gnu packages graphviz) @@ -142,12 +144,13 @@ (define-module (gnu packages music) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages java) - #:use-module (gnu packages libffi) #:use-module (gnu packages libevent) + #:use-module (gnu packages libffi) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) ; for alsa-utils #:use-module (gnu packages lirc) #:use-module (gnu packages llvm) + #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages mp3) #:use-module (gnu packages mpd) @@ -180,8 +183,8 @@ (define-module (gnu packages music) #:use-module (gnu packages stb) #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) - #:use-module (gnu packages texinfo) #:use-module (gnu packages tex) + #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) @@ -192,11 +195,9 @@ (define-module (gnu packages music) #:use-module (gnu packages wm) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages xiph) - #:use-module (gnu packages golang) - #:use-module (gnu packages lua) #:use-module ((srfi srfi-1) #:select (last))) (define-public audacious @@ -1554,50 +1555,51 @@ (define-public music21 (define-public abjad (package (name "abjad") + ;; XXX: The latest version which supports current Guix's Python 3.9.9. (version "3.4") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Abjad/abjad") - (commit (string-append "v" version)))) + (url "https://github.com/Abjad/abjad") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0s63vk9fifp0im9c31kb9ck39mbaxhrls993d8fvg0nkg41z1jnz")))) - (build-system python-build-system) + (base32 "0s63vk9fifp0im9c31kb9ck39mbaxhrls993d8fvg0nkg41z1jnz")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'loosen-requirements - (lambda _ - (substitute* "setup.py" - ;; Permit newer versions of uqbar. Remove for >3.4. - ((", <0\\.5\\.0") - "")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; See: https://stackoverflow.com/a/34140498 - (invoke "python" "-m" "pytest" "tests"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'loosen-requirements + (lambda _ + (substitute* "setup.py" + ;; Permit newer version of uqbar. remove for >3.4. + ((", <0\\.5\\.0") + "")))) + ;; FIXME: Check why it's failing with this: Note: compilation failed + ;; and \version outdated, did you update input syntax with + ;; convert-ly? + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "tests/test_ext_sphinx.py" + (("def test_ext_sphinx_01") "def __off_test_ext_sphinx_01"))))))) (inputs (list lilypond)) - (propagated-inputs - (list python-ply - python-quicktions - python-roman - python-six - python-uqbar - ;; XXX: These test dependencies(?) are listed as install_requires - ;; in setup.py. Propagate accordingly. - python-black - python-flake8 + (native-inputs + (list python-flake8 python-isort python-mypy python-pytest python-pytest-cov python-pytest-helpers-namespace + python-six python-sphinx-autodoc-typehints)) + (propagated-inputs + (list python-quicktions + python-ply + python-roman + python-uqbar)) (home-page "https://abjad.github.io") (synopsis "Python API for building LilyPond files") (description @@ -1607,7 +1609,7 @@ (define-public abjad programming language, you can use Abjad to make systematic changes to music as you work. Because Abjad wraps the LilyPond music notation package, you can use Abjad to control the typographic detail of symbols on the page.") - (license license:expat))) + (license license:expat))) (define-public python-abjad (deprecated-package "python-abjad" abjad))