From patchwork Tue May 19 07:32:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 22207 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 6398D27BBE3; Tue, 19 May 2020 08:33:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id B074D27BBE1 for ; Tue, 19 May 2020 08:33:21 +0100 (BST) Received: from localhost ([::1]:45402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jawkb-0006jx-43 for patchwork@mira.cbaines.net; Tue, 19 May 2020 03:33:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jawkJ-0006i5-2d for guix-patches@gnu.org; Tue, 19 May 2020 03:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37503) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jawkI-0002XH-Px for guix-patches@gnu.org; Tue, 19 May 2020 03:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jawkI-00046B-Mq for guix-patches@gnu.org; Tue, 19 May 2020 03:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41392] [PATCH] Upgrade python-argcomplete to 1.11.1 Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 May 2020 07:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41392 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41392@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158987354715705 (code B ref -1); Tue, 19 May 2020 07:33:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 May 2020 07:32:27 +0000 Received: from localhost ([127.0.0.1]:49048 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jawjf-00045A-B9 for submit@debbugs.gnu.org; Tue, 19 May 2020 03:32:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:42510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jawjZ-00044y-Gd for submit@debbugs.gnu.org; Tue, 19 May 2020 03:32:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jawjZ-0005cS-6z for guix-patches@gnu.org; Tue, 19 May 2020 03:32:17 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:52108) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jawjU-0002Fv-K3 for guix-patches@gnu.org; Tue, 19 May 2020 03:32:16 -0400 Received: by mail-wm1-x32c.google.com with SMTP id f134so1946174wmf.1 for ; Tue, 19 May 2020 00:32:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leibniz-psychology-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=b2mSB8E/G5mV0TP8+mbHMKvMopKoNvUTTQ3jk/Cpykc=; b=la5rbyoX5t/EDsrQm+yHOrnFjvIPkv6RZWT6RPaebUV+eL8qaIvXQ/L99JWRZKyF7E Rfqa5W+tQYTSjS1/9YEkrr+uDAAxjugCh+iByrNQZzKNogaU9wykWwrfiA3gzPatQXIQ kREWe9r1AOEmnnJGN5hHVKFGUifRC/jaomu5boBA0H+9n50Xb88zyI4IMyuZm8SY9Uh6 M4s84ZhR+vPQ8KHHQDyk1z5LXEf2DgUVjS72XRdw0ekPWl7ZKvQVVQDAkHtepjk+vBLN 4rMrWp7BMyklJpe79VtvAVdoE4izTa1tThKTxPQ1lN7tA84dYGh+kS1UisFmnfDVKb25 VrzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=b2mSB8E/G5mV0TP8+mbHMKvMopKoNvUTTQ3jk/Cpykc=; b=kODOIh8q3H++DUsQqRLqqsMK4hZpWSLkY1JiqmcBo0nHK9qGDHmGA/7IjDR9QMcfLM nqeL8OQ3qMvP20CVva2MIBqd+7v5Dl2cXd6psm0sO55jwBXP9ipptMERLau5Ro4EkLkN xEqQEMpB0dqUkLZA0pIBWzcGsDbI6IMdhkhVXZ2z51XwUO/lIHIcq/EqlxNK1Q5+Ys3L 7Cr/vBBtHJ4Mwiw9JLbHT35jX0I2mxwcFW8jmKLDRxxntZk7UgPbAtBizohnC8VkaOLb OrNuTngMtfRrCFVDYRGFdlXBc68kD8i03cg8A++O3NwDE9yrQFb4DZ7A4Jac/WrnIW40 SYWw== X-Gm-Message-State: AOAM533+VOEGuq2JRh38uEYjzUyIjzWoT2H/D5itKOlZJX+QgXREG92P HpIXPb73C0xZTJpIIS3kupj1oToz1sTN6uyWEU/oEv1oh5Qc7z3z0NLzDydyMUeZSslinLFZoOx BDpWlI7RDXW+aRkTEkwq7pzhKNKnAl7dwBOlar6zfYAAv57BS7QMw2W058/AvzIczgJSgXIsdA8 NnwQMycbs= X-Google-Smtp-Source: ABdhPJzBpiNtmLtkjVxEO+pIJIff1yCTDwz2eZdWFmyP25K8Q+MTP6gLTqUfIu3Hgrced0skCGy+Nw== X-Received: by 2002:a05:600c:21c2:: with SMTP id x2mr3780950wmj.148.1589873530413; Tue, 19 May 2020 00:32:10 -0700 (PDT) Received: from localhost (dynamic-2a01-0c23-7850-5200-7d0a-d634-6a10-7df9.c23.pool.telefonica.de. [2a01:c23:7850:5200:7d0a:d634:6a10:7df9]) by smtp.gmail.com with ESMTPSA id c19sm20734647wrb.89.2020.05.19.00.32.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 00:32:09 -0700 (PDT) Date: Tue, 19 May 2020 09:32:09 +0200 From: Lars-Dominik Braun Message-ID: <20200519073209.GA3485@zpidnp36> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Received-SPF: none client-ip=2a00:1450:4864:20::32c; envelope-from=ldb@leibniz-psychology.org; helo=mail-wm1-x32c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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" X-getmail-retrieved-from-mailbox: Patches Hi, the attached patch upgrades python-argcomplete to version 1.11.1 and includes a fix from git for the testsuite and fish>=3.1. Cheers, Lars From f72dc474ff2e0ded162661b5c845371cb48c936d Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 19 May 2020 09:24:03 +0200 Subject: [PATCH] gnu: python-argcomplete: Update to 1.11.1 * gnu/packages/python-xyz.scm (python-argcomplete)[version]: Upgrade [arguments]: Remove, obsolete * gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch: Add fix for fish 3.1 * gnu/local.mk (dist_patch_DATA): Add new file --- gnu/local.mk | 1 + .../python-argcomplete-1.11.1-fish31.patch | 35 +++++++++++++++++++ gnu/packages/python-xyz.scm | 23 ++---------- 3 files changed, 39 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch diff --git a/gnu/local.mk b/gnu/local.mk index 38b286203e..82497923c8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1409,6 +1409,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-CVE-2018-14647.patch \ %D%/packages/patches/python-aiohttp-3.6.2-no-warning-fail.patch \ %D%/packages/patches/python-alembic-exceptions-cause.patch \ + %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ %D%/packages/patches/python-cross-compile.patch \ diff --git a/gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch b/gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch new file mode 100644 index 0000000000..575c8abbb7 --- /dev/null +++ b/gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch @@ -0,0 +1,35 @@ +From 08bfc8a788e8081515d733e67be026d051c726f7 Mon Sep 17 00:00:00 2001 +From: Evan +Date: Thu, 19 Mar 2020 14:55:07 +1100 +Subject: [PATCH] Remove expected test failure for new versions of fish (#292) + +--- + test/test.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/test/test.py b/test/test.py +index e91352b..2c34806 100755 +--- a/test/test.py ++++ b/test/test.py +@@ -28,6 +28,8 @@ + + BASH_VERSION = subprocess.check_output(['bash', '-c', 'echo $BASH_VERSION']).decode() + BASH_MAJOR_VERSION = int(BASH_VERSION.split('.')[0]) ++FISH_VERSION_STR = subprocess.check_output(['fish', '-c', 'echo -n $FISH_VERSION']).decode() ++FISH_VERSION_TUPLE = tuple(int(x) for x in FISH_VERSION_STR.split('.')) + + + class TempDir(object): +@@ -1258,8 +1260,11 @@ class TestFish(_TestSh, unittest.TestCase): + expected_failures = [ + 'test_parse_special_characters', + 'test_comp_point', +- 'test_special_characters_double_quoted' + ] ++ if FISH_VERSION_TUPLE < (3, 1): ++ expected_failures.extend([ ++ 'test_special_characters_double_quoted' ++ ]) + + skipped = [ + 'test_single_quotes_in_single_quotes', diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c26a766d64..bc593120aa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13014,33 +13014,16 @@ PNG, JPEG, JPEG2000 and GIF files in pure Python.") (define-public python-argcomplete (package (name "python-argcomplete") - (version "1.10.3") + (version "1.11.1") (source (origin (method url-fetch) (uri (pypi-uri "argcomplete" version)) (sha256 (base32 - "02jkc44drb0yjz6x28lvg6rj607n8r2irdpdvyylm8xnycn54zx3")))) + "0h1przxffrhqvi46k40pzjsvdrq4zc3sl1pc96kkigqppq0vdrss")) + (patches (search-patches "python-argcomplete-1.11.1-fish31.patch")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'embed-tool-references - (lambda _ - (substitute* "argcomplete/bash_completion.d/python-argcomplete.sh" - ((" grep") - (string-append " " (which "grep"))) - ((" egrep") - (string-append " " (which "egrep"))) - (("elif which") - (string-append "elif " (which "which"))) - (("\\$\\(which") - (string-append "$(" (which "which")))) - #t))))) - (inputs - `(("grep" ,grep) - ("which" ,which))) (native-inputs `(("python-coverage" ,python-coverage) ("python-flake8" ,python-flake8) -- 2.20.1