From debbugs-submit-bounces@debbugs.gnu.org Tue May 19 03:32:27 2020 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 To: guix-patches@gnu.org Subject: [PATCH] Upgrade python-argcomplete to 1.11.1 Message-ID: <20200519073209.GA3485@zpidnp36> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="l76fUT7nc3MelDdI" 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-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --l76fUT7nc3MelDdI Content-Type: multipart/mixed; boundary="Q68bSM7Ycu6FN28Q" Content-Disposition: inline --Q68bSM7Ycu6FN28Q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --Q68bSM7Ycu6FN28Q Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-python-argcomplete-Update-to-1.11.1.patch" Content-Transfer-Encoding: quoted-printable =46rom f72dc474ff2e0ded162661b5c845371cb48c936d Mon Sep 17 00:00:00 2001 =46rom: 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.p= atch 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 =3D \ %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 (#2= 92) + +--- + 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 @@ +=20 + BASH_VERSION =3D subprocess.check_output(['bash', '-c', 'echo $BASH_VERSI= ON']).decode() + BASH_MAJOR_VERSION =3D int(BASH_VERSION.split('.')[0]) ++FISH_VERSION_STR =3D subprocess.check_output(['fish', '-c', 'echo -n $FIS= H_VERSION']).decode() ++FISH_VERSION_TUPLE =3D tuple(int(x) for x in FISH_VERSION_STR.split('.')) +=20 +=20 + class TempDir(object): +@@ -1258,8 +1260,11 @@ class TestFish(_TestSh, unittest.TestCase): + expected_failures =3D [ + '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' ++ ]) +=20 + skipped =3D [ + '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-argcomplet= e.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) --=20 2.20.1 --Q68bSM7Ycu6FN28Q-- --l76fUT7nc3MelDdI Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEyk+M9DfXR4/aBV/UQhN3ARo3hEYFAl7Di3QACgkQQhN3ARo3 hEa9ZQv9H6MxYc98K0vsOV7ElnxAPtjU9zLGV2txQDDlUjVxDaIvYj5Dr8gQmWWC 1GRm2T1PRWSiwsTQIYjCRMCgFAK6ZGGLZRvQ9tOCsgQV8LLuMD3Tpr86zroQILeT 20vpbLQYaHD8fOUF0yXcAEtZAmvmQRIEBKx/nlfq3U9fpjyoz8wB2BRq+FtCTmfE bhMC17+OxGvhD/ozsU6iwiMCbWpjZGtvwaTwOpLxUIW2unrS9797BDA57FkhmTcX N+P4gS91WfdaI5p+r1ATiCWOfZmx1XWT8kGQCBfiEgRYTdI8ctgP3PyAMfbo0UOq csOeIR6R0hrCboq6nJ8AhuLhzMEAUcOxSn9G68tzSeeIqc0IlEGMYEQlaIQP8Jss VyphXtDtLvvk9w9q9pFsKmTwq8g9Q/rFuAPkxwCsr/5Csn8oGHRwvPAbSi5owH3q 7KSMIODZyntX8ja+b9Y+GOCftPbOGQ3hgcqcl7RfZFxk/NEaeV9im9QOsNI0gWuQ /gEVMz3U =U9I3 -----END PGP SIGNATURE----- --l76fUT7nc3MelDdI-- From debbugs-submit-bounces@debbugs.gnu.org Wed May 20 16:47:53 2020 Received: (at 41392) by debbugs.gnu.org; 20 May 2020 20:47:53 +0000 Received: from localhost ([127.0.0.1]:54445 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jbVcz-0004T8-Ae for submit@debbugs.gnu.org; Wed, 20 May 2020 16:47:53 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:51929) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jbVcu-0004Ss-LG for 41392@debbugs.gnu.org; Wed, 20 May 2020 16:47:48 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id C953219E8; Wed, 20 May 2020 16:47:38 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 20 May 2020 16:47:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=4ONkCR5JmQefVEx1QooBMP7CCd GJrWcs7TZuIeROgUo=; b=NMIJd4ziARQtTV46PYHTrrXJ4BP6ChJx3hXMOBC5KH zTx8y1+TTAixBQDtLWwXUfeqkuyo+9FUJJXWIwIja1UO7wSl5Scil3/F8pUQiEXv Tavab5ZGCUsqlYLBPncUakcB+mGgzs3qxdYArGb1iFMRTvINek1qyAAf8tCTgdDl mj81KY/5WEYpE08+jIBWYUGZlyjdc/b+Xj5nG2WnUUJcp1sfvvp4ZRD01Eu2o35e fE+9CkvY8s8nrk/jCwC1hU5kFKiXNZ/hT1fm2Xm6Rqjs5iD1vvX96zxYA379AFkT dzRLwxjfi+ZmGaEdaBtBm/C5YUpgHr5+NmVeOQXlNz0w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=4ONkCR 5JmQefVEx1QooBMP7CCdGJrWcs7TZuIeROgUo=; b=izTpWJ8ILps7nbCyIEQRBv oNS47UpyQUHlHgNJ5n4dM1GOAWOYKBfWHTXk+nkUGrd6YqJCXHTl65ZcI+jV5anc WAiG1XLA9KYdwrftiUwq1rwxJmSZ2CjrBfANHj8RP62LBDmZYrzJhFRjuWkmIhAD yjStQdAJLLj/gWCL433XBaWZRpNuAD+ghvgsk+IpsGJsVeESJ9F0c0g+gmBbAvys Zd7MbVinrmC5YnZuDnrlH65xhP4SVirQHs8kfByh6Fq5hX3yXjYEiwu19iAVXjst u+JHr3Igsht9SshcidaaohJlz9gzrx1ZxC9UGo9sgLehjqV6kLq93bJ4JqFZRDrw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedruddtledgudehudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufgjfhgffffkgggtsehgtd erredtredtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgr shhtmhgrihhlrdgtohhmqeenucggtffrrghtthgvrhhnpedtvdfggeevgeeivdffueejie dttedvkedtudfggfdtgeefiedtieekffdugfeuffenucfkphepkeegrddvtddvrdeikedr jeehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmh gsrghkkhgvsehfrghsthhmrghilhdrtghomh X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id BEB11328005D; Wed, 20 May 2020 16:47:37 -0400 (EDT) From: Marius Bakke To: Lars-Dominik Braun , 41392@debbugs.gnu.org Subject: Re: [bug#41392] [PATCH] Upgrade python-argcomplete to 1.11.1 In-Reply-To: <20200519073209.GA3485@zpidnp36> References: <20200519073209.GA3485@zpidnp36> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Wed, 20 May 2020 22:47:36 +0200 Message-ID: <87wo569vvb.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41392 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Lars-Dominik Braun writes: > 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. Thanks! A few small nit-picks: > 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 Please use punctuations in commit messages. > * gnu/packages/python-xyz.scm (python-argcomplete)[version]: Upgrade > [arguments]: Remove, obsolete Also mention the removed [inputs]. > * 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 Here it should say something along the lines of "...fish31.patch": New file. ...(dist_patch_DATA): Add it. See the commit log for examples. > 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(-) > + 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. Very minor issues, but getting these right will get your patches merged faster in the future. ;-) Can you send an updated patch? TIA! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl7Fl2gACgkQoqBt8qM6 VPqokQgAyWkbf+5LWFBGw5aGyKBW0qgPo0LkbTtAI6kkXP3MO4HIfIxFnF7Ml0iN Sa+ZZ2174wxZ5gC3EJsl00oGnrNSAc2A+9r+X4qgMZ+afrEHIQTZDK+i5i8UWYnM a74OWYG6ZC0mOs7hN9xbBgABPtjZ2BKkllCix5tjqpGDJWKqWGi5LhRjetUiUJsw 96TzTbZlbaFWX/SwyI/s4raRjDHjgfA9a7HXJHPIRwn9pukVB5faU4jUy8C0oZ6I Ff+eGo/1+WVpvjRepupSyg1HswpOyf4Xh1jklzdghg6p+O90mn6ZH3LWvEIY+SkV WbcQ79ahwPWfR8SL4+3A1S/6a5OT1g== =WJu3 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri May 22 02:31:53 2020 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 To: Marius Bakke Subject: Re: [bug#41392] [PATCH] Upgrade python-argcomplete to 1.11.1 Message-ID: <20200522063135.GB3278@zpidnp36> References: <20200519073209.GA3485@zpidnp36> <87wo569vvb.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ZwgA9U+XZDXt4+m+" Content-Disposition: inline In-Reply-To: <87wo569vvb.fsf@devup.no> User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 41392 Cc: 41392@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --ZwgA9U+XZDXt4+m+ Content-Type: multipart/mixed; boundary="BwCQnh7xodEAoBMC" Content-Disposition: inline --BwCQnh7xodEAoBMC Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --BwCQnh7xodEAoBMC Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-python-argcomplete-Update-to-1.11.1.patch" Content-Transfer-Encoding: quoted-printable =46rom b02f6b56c0b35e2a47a31516bb9a3a8ad1f82366 Mon Sep 17 00:00:00 2001 =46rom: 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= =2E1. [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.p= atch 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 =3D \ %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>=3D3.1, see +https://github.com/kislyuk/argcomplete/commit/08bfc8a788e8081515d733e67be0= 26d051c726f7 + +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 @@ +=20 + BASH_VERSION =3D subprocess.check_output(['bash', '-c', 'echo $BASH_VERSI= ON']).decode() + BASH_MAJOR_VERSION =3D int(BASH_VERSION.split('.')[0]) ++FISH_VERSION_STR =3D subprocess.check_output(['fish', '-c', 'echo -n $FIS= H_VERSION']).decode() ++FISH_VERSION_TUPLE =3D tuple(int(x) for x in FISH_VERSION_STR.split('.')) +=20 +=20 + class TempDir(object): +@@ -1258,8 +1260,11 @@ class TestFish(_TestSh, unittest.TestCase): + expected_failures =3D [ + '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' ++ ]) +=20 + skipped =3D [ + '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-argcomplet= e.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) --=20 2.20.1 --BwCQnh7xodEAoBMC-- --ZwgA9U+XZDXt4+m+ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEyk+M9DfXR4/aBV/UQhN3ARo3hEYFAl7HccMACgkQQhN3ARo3 hEZqiQwAj9y74z+akl6iz8r0FCL1GnYIPaS7OGq5zer5ixG9LD/WXJp35O3NcKfS u3/X+aU+rIkR7jdBk+g4wM/pODKWFHhDxh8gx5FPWyVZfAOcSVOTH0DTT9Y7dc41 +aHxscSepPIpwENf5sHGhkGDNx1QvfqW5AaXOtMKJHPpQb0gtGUgHSwgFJqY5k7t hrDtgSzRhdqQaE/dgOjBFO0q+PrjRLRkNTDqhFwqLd+Z9wKn6h66ujpdHcTNeDGp MK6iBQpywo3I6gvoV3KdPZP7WyK+x/R3KPAcQX8vvz6eXOs20UqM21S1nMIi0+qr hup06rPeIDe8PYOD2jrSolGHJQvLfVnOhiTUCh0i42hNaxZEnIs+Sh9wRmiPevbp pNt8yGIKiIjPjLGc6hrsLQrAZjG/YumcaB04Do2BvQMm4o0aTB8m0qjKzHhfKgJB rdkwikHU2usCTrMWfOiIP/jTGfTwm+d+OzybpZoFkGIXDTDnA8OCNSzpxqt5ZPWb UU1j96fm =QBPe -----END PGP SIGNATURE----- --ZwgA9U+XZDXt4+m+-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 23 14:07:40 2020 Received: (at 41392-done) by debbugs.gnu.org; 23 May 2020 18:07:40 +0000 Received: from localhost ([127.0.0.1]:35528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcYYd-0007Nz-Se for submit@debbugs.gnu.org; Sat, 23 May 2020 14:07:40 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:57381) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcYYc-0007Nm-Ji for 41392-done@debbugs.gnu.org; Sat, 23 May 2020 14:07:39 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id E7A5C8B9; Sat, 23 May 2020 14:07:32 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sat, 23 May 2020 14:07:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm3; bh=hBDM4kOZztoYu5kBWo3KhbxpUW cb9pGS3o9eauV/Zx4=; b=AsMVHsCodsfYDGB/NEAKwkIYHFdFd/+bJicTS2aQ+1 J4iHnC9hux4EP9Biwjpcjf8hrlMmZTrFOosleuqeWMXY3CXxbPSEyOCEHD2qRuV7 hPcSnVH1iWkjOm4zAsgi7NczHQ9MZPm8tZuA4eb57zv1Y9cKub+NPbJNb7r2Dnj0 Cz7rP7xUHAJ5SH8Fp78/1hRpa38B4pnctLAm4tmwLhXMrdwGv/GqORKtDJvchjbH xSu9XPJErlwqNR8mxx+VJQu63SPL4qiRWus1qWq4Xnt5bSpWW/G8mCHWXNFUydgR 97w3HBOppUvi901k7om/Ccf9d+JaaCEi4qBX6YbIDeGg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=hBDM4k OZztoYu5kBWo3KhbxpUWcb9pGS3o9eauV/Zx4=; b=wpe54lyJ6DWmAIwE74+H4d 17ECTxQa2XS35v27Bw/Tmqqk7OUTLC3HJUmpr3nMLgNBa9Ox7Ifbnk710wZV8wjp DlALWn6ILQt6YJvNpPlW+ZGk/roZlYQjyivEaF/3hDf8pBvV0ZKp8UJlZMXWNBbS ydTSwIbP4H0JJUYbkOD+x+OojEJipg2oS4TigRH0a1rSKY+QZbGLNr+d8bnGiqKo HHPw+u5aJh1LRjkOK84Q5njWHd5XCQ877ajhdMe0p4djVZlQcyzUZckpmL1X0vsh XZ78fYXBIzSjg9nUIGRQChdXQWtrwRpxiJIh/G0WeKQhBa0s2tJlVJVh3iLMk4JA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudduhedguddvudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufgjfhgffffkgggtsehgtd erredtredtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgr shhtmhgrihhlrdgtohhmqeenucggtffrrghtthgvrhhnpedtvdfggeevgeeivdffueejie dttedvkedtudfggfdtgeefiedtieekffdugfeuffenucfkphepkeegrddvtddvrdeikedr jeehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmh gsrghkkhgvsehfrghsthhmrghilhdrtghomh X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 091D23066503; Sat, 23 May 2020 14:07:31 -0400 (EDT) From: Marius Bakke To: Lars-Dominik Braun Subject: Re: [bug#41392] [PATCH] Upgrade python-argcomplete to 1.11.1 In-Reply-To: <20200522063135.GB3278@zpidnp36> References: <20200519073209.GA3485@zpidnp36> <87wo569vvb.fsf@devup.no> <20200522063135.GB3278@zpidnp36> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Sat, 23 May 2020 20:07:30 +0200 Message-ID: <87zh9y7cf1.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41392-done Cc: 41392-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Lars-Dominik Braun writes: > 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. Perfect, applied! I noticed it broke the Python 2 variant, but it only has a single dependency and is probably not worth fixing. Let's see if anyone complains and instead remove it later. :-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl7JZmIACgkQoqBt8qM6 VPoEAAgAz0ma1NDJYN4Q3+ytePItma2BVho1Rn2GvhwTv/MIxZwZ0Cl1e3telISF f946/fmF5e8XjMuOlQbqVCHUe8Kgn/azO2v0YW5Zgn/yuHhPRcmcu4q8gs34DMKN GtPMWJSUhOcGhx5JerqkcMZapPWHUR5EwplrYCNxgYhmbsjkMVtz2OhiA8HUMBnF /3ZDvQoMQe8Ze4+5qBD6BUdhY3ipvdvPIFKBzwZGwJjBJuJXWHbn2db7ab4jLjDo lIllc7LPEVhP+7CLtB/dvZvYLWkvuBj/wzlbb848Uy8tWCaVnMvZUcan6UQHg62b JpbcuZ5FYtWdP0/NLnDMIISQnblpNw== =nyKW -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Jun 14 03:52:09 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 21 Jun 2020 11:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator