From patchwork Fri May 22 06:31:35 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: 22257 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 0FA1627BBE3; Fri, 22 May 2020 07:32: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 23FE527BBE1 for ; Fri, 22 May 2020 07:32:21 +0100 (BST) Received: from localhost ([::1]:45016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jc1EC-0007JC-NW for patchwork@mira.cbaines.net; Fri, 22 May 2020 02:32:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jc1Dy-0007Ii-Rd for guix-patches@gnu.org; Fri, 22 May 2020 02:32:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46349) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jc1Du-0006no-Iv for guix-patches@gnu.org; Fri, 22 May 2020 02:32:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jc1Du-0008F0-EZ for guix-patches@gnu.org; Fri, 22 May 2020 02:32: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: Fri, 22 May 2020 06:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41392 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: 41392@debbugs.gnu.org Received: via spool by 41392-submit@debbugs.gnu.org id=B41392.159012911331663 (code B ref 41392); Fri, 22 May 2020 06:32:02 +0000 Received: (at 41392) by debbugs.gnu.org; 22 May 2020 06:31:53 +0000 Received: from localhost ([127.0.0.1]:57895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jc1Dg-0008EY-VL for submit@debbugs.gnu.org; Fri, 22 May 2020 02:31:52 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:34512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jc1Db-0008EG-PK for 41392@debbugs.gnu.org; Fri, 22 May 2020 02:31:48 -0400 Received: by mail-wr1-f47.google.com with SMTP id g12so7816098wrw.1 for <41392@debbugs.gnu.org>; Thu, 21 May 2020 23:31:43 -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:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=J8ajMWAi1XqN7UWJQK06mX+cng6+RyqLPRmvAw3t/t8=; b=rPggg5GBQju8NHAeRxY3McbB+XJ+JSeraD9LemzY7shufW78c6xmEohTcIVmO4qB8O B8sgB6N0Sk82GrnLzERaqzDv05vzz2UqxsIFajYln0A/tl75tJdoQE1/z44W72xfY52o JELU+5AQOQh/2fv+6UgT2dk087l9e9jIdfUImOymTvZ0ImBHu5dW+mGP+hgoz1DEoTUk klSJ+0AtuyM/tJMl8A2W/9dpy7mRngjHmwrtA5A61P0eMwsudVLpRk2uFBlmyTauTs9X FJ0y41dgT80z1R1efMafJKCQeoMjlvIcy+ReW+2PsozlamJDkAWKPoro9mvNDr+Ye3eg Ej0g== 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:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=J8ajMWAi1XqN7UWJQK06mX+cng6+RyqLPRmvAw3t/t8=; b=DdgLcFbsoSx3AkzTIAF88Hag3M5IyW1s6l94PJIC8aPFEyRhDoh0sAlGrHZXhcvt2D U099SrvunPRXTYDpsXmGLWgXSTofKem3vScvzZT54rchijP0bUdWkcnqPDxjYnbyAhn/ o595VO8l45mldgis0cR+NkocARanJnzeTt1tHMcEi/yxUDvdlaxGQB5CN29b4Fexxs9t 9nr1Z3TNbbQDT1AE6mH0dC6CjNdxdxRAuaQhODA2POzXeifKniGiKmHnO//2L4qIi1Kh 8EvnZsX9KRq5MRv9ddK05iCmCCh2OivpPqr7oBzbklfF00nQewGl09qJTRqkqUhix8hn ywpQ== X-Gm-Message-State: AOAM530pRM1KoUTdwp5Hl5Usq2BDe/bbc5K3YDvbOj0Pj0DoNLAqh6e5 OSMYSZf7qtmvNT12lLlSsI7Pj/owGZYvXV62+KdgSkQs0M7/360ByYr2aoADU3WWKkyFXZBPFzh GNSjJfY+oFFXhqTFoXlMgGtbAwf8Br51ZiPz43yF+S345aB4U1Hm8wFhbNG+Kf9i7t1g65QJYbE cCtBY= X-Google-Smtp-Source: ABdhPJz319f7Yq7DkfS18niWian6sWbcbE9eFfApI/jFZKrVm5G/82ienLBncfD1Ms2lQuF114TmPA== X-Received: by 2002:adf:dcc8:: with SMTP id x8mr1978042wrm.404.1590129097508; Thu, 21 May 2020 23:31:37 -0700 (PDT) Received: from localhost (dynamic-2a01-0c23-7c26-f900-ddb8-2756-0b1b-b01e.c23.pool.telefonica.de. [2a01:c23:7c26:f900:ddb8:2756:b1b:b01e]) by smtp.gmail.com with ESMTPSA id x6sm8497584wrv.57.2020.05.21.23.31.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2020 23:31:36 -0700 (PDT) Date: Fri, 22 May 2020 08:31:35 +0200 From: Lars-Dominik Braun Message-ID: <20200522063135.GB3278@zpidnp36> References: <20200519073209.GA3485@zpidnp36> <87wo569vvb.fsf@devup.no> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <87wo569vvb.fsf@devup.no> User-Agent: Mutt/1.10.1 (2018-07-13) 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, > Please use punctuations in commit messages. > Also mention the removed [inputs]. > Here it should say something along the lines of "...fish31.patch": New file. > ...(dist_patch_DATA): Add it. > Finally, can you remove this git patch header, and instead add a short > free-style comment about what the patch does, and where it comes from > (URL)? See other patches for examples. all done. See attached updated patch. Cheers, Lars From b02f6b56c0b35e2a47a31516bb9a3a8ad1f82366 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]: Update to 1.11.1. [arguments]: Remove, obsolete. [inputs]: Remove as well. * gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../python-argcomplete-1.11.1-fish31.patch | 29 +++++++++++++++++++ gnu/packages/python-xyz.scm | 23 ++------------- 3 files changed, 33 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..98f0ca1473 --- /dev/null +++ b/gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch @@ -0,0 +1,29 @@ +Upstream commit fixing testcases for fish>=3.1, see +https://github.com/kislyuk/argcomplete/commit/08bfc8a788e8081515d733e67be026d051c726f7 + +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