From patchwork Fri Nov 17 20:48:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Figiel X-Patchwork-Id: 56589 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 DE38A27BBEA; Fri, 17 Nov 2023 20:49:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 D246D27BBE2 for ; Fri, 17 Nov 2023 20:49:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r45lv-0003Op-I4; Fri, 17 Nov 2023 15:49:03 -0500 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 1r45lu-0003OY-7f for guix-patches@gnu.org; Fri, 17 Nov 2023 15:49:02 -0500 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 1r45lt-0002Xf-W8 for guix-patches@gnu.org; Fri, 17 Nov 2023 15:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r45lu-0004im-8j for guix-patches@gnu.org; Fri, 17 Nov 2023 15:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67247] [PATCH] gnu: python-uqbar: Update to 0.5.9. Resent-From: Troy Figiel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Nov 2023 20:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67247 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67247@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170025411718048 (code B ref -1); Fri, 17 Nov 2023 20:49:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Nov 2023 20:48:37 +0000 Received: from localhost ([127.0.0.1]:47221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r45lR-0004gi-Bw for submit@debbugs.gnu.org; Fri, 17 Nov 2023 15:48:36 -0500 Received: from lists.gnu.org ([2001:470:142::17]:51468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r45lP-0004ft-9j for submit@debbugs.gnu.org; Fri, 17 Nov 2023 15:48:32 -0500 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 1r45lH-0003Hy-Mk for guix-patches@gnu.org; Fri, 17 Nov 2023 15:48:24 -0500 Received: from mout-y-209.mailbox.org ([91.198.250.237]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1r45lF-0002TU-IT for guix-patches@gnu.org; Fri, 17 Nov 2023 15:48:23 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-y-209.mailbox.org (Postfix) with ESMTPS id 4SX8B73JMTz9sbM for ; Fri, 17 Nov 2023 21:48:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troyfigiel.com; s=MBO0001; t=1700254095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=2+blQVzanomTPeF4RWymziEiTt1JRZ2nPKMOFIs/3H4=; b=GKul36guGuy0eH5nYE468Xy88phXE5UgL7llnzBc5h0frIymG4u/SusZw6VVN30K1+Yb8m BGdQqC0dpbWZAf+X0b/i/Dbl7DANQ8Vb7aqfESu2w8y9yyhWETrRWBCvlNLB6MKaMRcA0s mfaEw1ARBVRONqyQeODq695ZGyYbIFbunIRJ0M/rEM9O5vIuMnNaWWDV3xmaPy1faNBP51 sjV9f78v+SkVB8mnMXo5RvBFKEJ9/kiD+I/+PeYnF78LHob6CaU6ztrkbX2XuFIWmm5VfL amYrDr1iQy5dl7kf3L/PsdUsBt/JApNvSCka6fZ5/lHRZCyD55h8JrCW5zGzBA== From: Troy Figiel Date: Fri, 17 Nov 2023 21:48:02 +0100 Message-ID: <8734x4m7i5.fsf@troyfigiel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4SX8B73JMTz9sbM Received-SPF: pass client-ip=91.198.250.237; envelope-from=troy@troyfigiel.com; helo=mout-y-209.mailbox.org 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 * gnu/packages/graphviz.scm (python-uqbar): Update to 0.5.9. [source]: Add patch for Python 3.10 compatibility. [arguments]: Remove outdated patch phase. Change-Id: I81d83efd69bd07fe12790981c48a6e82297908f0 --- gnu/local.mk | 1 + gnu/packages/graphviz.scm | 12 +++------- .../patches/python-uqbar-python3.10.patch | 23 +++++++++++++++++++ 3 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/python-uqbar-python3.10.patch diff --git a/gnu/local.mk b/gnu/local.mk index fcd9024ce3..78a1d16102 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1766,6 +1766,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-sgmllib3k-assertions.patch \ %D%/packages/patches/python-telingo-fix-comparison.patch \ %D%/packages/patches/python-typeguard-python3.10.patch \ + %D%/packages/patches/python-uqbar-python3.10.patch \ %D%/packages/patches/python-wxwidgets-type-errors.patch \ %D%/packages/patches/qtdeclarative-5-disable-qmlcache.patch \ %D%/packages/patches/qtdeclarative-disable-qmlcache.patch \ diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index b91c365e3c..c5507e036c 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -195,7 +195,7 @@ (define-public python-pygraphviz (define-public python-uqbar (package (name "python-uqbar") - (version "0.5.6") + (version "0.5.9") (source (origin (method git-fetch) @@ -205,18 +205,12 @@ (define-public python-uqbar (file-name (git-file-name name version)) (sha256 (base32 - "1ml3x2mf7nlnvrh9lari5yk0sz2mmg39jwsbjxnpzhnw4kcwpdrs")))) + "0c573nzpm51qgz2g296f8pw8ys0i3r6daynxk06zagk5l5fgw9ar")) + (patches (search-patches "python-uqbar-python3.10.patch")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - (substitute* "setup.py" - ;; Latest versions of sphink-rtd-theme require npm to build. - (("sphinx-rtd-theme >= 0.5.0") "sphinx-rtd-theme >= 0.2.4") - (("black") "black >= 19.10b0")) - #t)) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? diff --git a/gnu/packages/patches/python-uqbar-python3.10.patch b/gnu/packages/patches/python-uqbar-python3.10.patch new file mode 100644 index 0000000000..164f0c0c64 --- /dev/null +++ b/gnu/packages/patches/python-uqbar-python3.10.patch @@ -0,0 +1,23 @@ +Since Python 3.10 the output of a CLI program created with argparse +uses "options" instead of "optional arguments". This behaviour breaks +the tests in python-uqbar. + +--- a/tests/test_cli.py ++++ b/tests/test_cli.py +@@ -84,7 +84,7 @@ def test_call_help(): + + speak like a cat + +- optional arguments: ++ options: + -h, --help show this help message and exit + --version show program's version number and exit + --loud be adamant +@@ -101,6 +101,6 @@ def test_help(): + """ + usage: vox-aggregator [-h] [--version] {help,list,birds,mammals} ... + +- optional arguments: ++ options: + -h, --help show this help message and exit + --version show program's version number and exit