From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 18:01:16 2019 Received: (at submit) by debbugs.gnu.org; 13 Jul 2019 22:01:16 +0000 Received: from localhost ([127.0.0.1]:43487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmQ4u-0008Bd-JW for submit@debbugs.gnu.org; Sat, 13 Jul 2019 18:01:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:57664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmQ4p-0008BC-Fo for submit@debbugs.gnu.org; Sat, 13 Jul 2019 18:01:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54511) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmQ4o-0002k5-5h for guix-patches@gnu.org; Sat, 13 Jul 2019 18:01:07 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_40,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmQ4m-0005nV-Bj for guix-patches@gnu.org; Sat, 13 Jul 2019 18:01:05 -0400 Received: from mira.cbaines.net ([2a01:7e00::f03c:91ff:fe69:8da9]:60074) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hmQ4m-0005li-63 for guix-patches@gnu.org; Sat, 13 Jul 2019 18:01:04 -0400 Received: from localhost (148.185.93.209.dyn.plus.net [209.93.185.148]) by mira.cbaines.net (Postfix) with ESMTPSA id F28941721C for ; Sat, 13 Jul 2019 23:01:02 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id f1b7e53c for ; Sat, 13 Jul 2019 22:01:02 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH 1/2] gnu: python-pep8: Patch to fix test failure with Python 3.7. Date: Sat, 13 Jul 2019 23:01:01 +0100 Message-Id: <20190713220102.7416-1-mail@cbaines.net> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a01:7e00::f03c:91ff:fe69:8da9 X-Spam-Score: -1.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: -2.3 (--) Patch from the upstream repository, see https://github.com/PyCQA/pycodestyle/issues/786 for more details. * gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch: New file= . * gnu/packages/python-xyz.scm (python-pep8)[source]: Add it. --- .../python-pep8-stdlib-tokenize-compat.patch | 35 +++++++++++++++++++ gnu/packages/python-xyz.scm | 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-pep8-stdlib-tokenize-comp= at.patch diff --git a/gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patc= h b/gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch new file mode 100644 index 0000000000..f11d8f7be8 --- /dev/null +++ b/gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch @@ -0,0 +1,35 @@ +From 397463014fda3cdefe8d6c9d117ae16d878dc494 Mon Sep 17 00:00:00 2001 +From: Michael Hudson-Doyle +Date: Tue, 25 Sep 2018 14:58:57 +1200 +Subject: [PATCH] Keep compability with stdlib tokenize.py changes + +https://github.com/python/cpython/commit/c4ef4896eac86a6759901c8546e26de= 4695a1389 +is not yet part of any release of Python but has been backported to all +versions in Git (includeing 2.7!). It causes the tokenize.py module to +emit a synthetic NEWLINE token for files that do not in fact end with a +newline, which confuses pycodestyle's checks for blank lines at the end +of a file. Fortunately the synthetic NEWLINE tokens are easy to detect +(the token text is ""). + +Fixes #786 +--- + pycodestyle.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pycodestyle.py b/pycodestyle.py +index 0d725d27..fbc3dca3 100755 +--- a/pep8.py ++++ b/pep8.py +@@ -258,10 +258,10 @@ def trailing_blank_lines(physical_line, lines, lin= e_number, total_lines): + """ + if line_number =3D=3D total_lines: + stripped_last_line =3D physical_line.rstrip() +- if not stripped_last_line: ++ if physical_line and not stripped_last_line: + return 0, "W391 blank line at end of file" + if stripped_last_line =3D=3D physical_line: +- return len(physical_line), "W292 no newline at end of file" ++ return len(lines[-1]), "W292 no newline at end of file" +=20 +=20 + @register_check diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a60e1c7e2a..ac43ef9057 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6350,7 +6350,8 @@ applications.") (uri (pypi-uri "pep8" version)) (sha256 (base32 - "002rkl4lsn6x2mxmf8ar00l0m8i3mzrc6pnzz77blyksmpsxa4x1")))) + "002rkl4lsn6x2mxmf8ar00l0m8i3mzrc6pnzz77blyksmpsxa4x1")) + (patches (search-patches "python-pep8-stdlib-tokenize-compat.pat= ch")))) (build-system python-build-system) (home-page "https://pep8.readthedocs.org/") (synopsis "Python style guide checker") --=20 2.22.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 18:17:04 2019 Received: (at 36643) by debbugs.gnu.org; 13 Jul 2019 22:17:04 +0000 Received: from localhost ([127.0.0.1]:43514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmQKG-00008o-Lq for submit@debbugs.gnu.org; Sat, 13 Jul 2019 18:17:04 -0400 Received: from mira.cbaines.net ([212.71.252.8]:44124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmQKD-00008G-8b; Sat, 13 Jul 2019 18:17:01 -0400 Received: from localhost (148.185.93.209.dyn.plus.net [209.93.185.148]) by mira.cbaines.net (Postfix) with ESMTPSA id D48B117222; Sat, 13 Jul 2019 23:17:00 +0100 (BST) Received: from phact (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 3e497093; Sat, 13 Jul 2019 22:17:00 +0000 (UTC) References: <87blybrqjn.fsf@devup.no> <87lfx4mm5f.fsf@devup.no> User-agent: mu4e 1.2.0; emacs 26.2 From: Christopher Baines To: guix-devel@gnu.org Subject: Re: core-updates frozen! In-reply-to: <87lfx4mm5f.fsf@devup.no> Date: Sat, 13 Jul 2019 23:17:00 +0100 Message-ID: <87pnmdzijn.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 36643 Cc: 36641@debbugs.gnu.org, 36643@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 (-) --=-=-= Content-Type: text/plain I've sent a few patches to fix a couple of build issues on the core-updates branch [1][2]. 1: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36641 2: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36643 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl0qWFxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XcgNQ/7BDiCSo+ztV1HqWrjoXJFfNBHn3SDrI+JZHZQoq8A5UdgW/p5NO8B5Xec RyGUj6z1I/auyWSrp3W5mWhaQ9xwvsF6wa8bhh/RP9RyCun/h7U2jgghYHHXXLKZ SAs9CF47eDbYYLJBqvp59HNaLjv5uYIUn0RSkfDV9+KRMwEfedENdgEpnZtg8mtD viYHQoE7j26nDHIdIpnAUI93iu/CTK/s2gO2Vk2AGlBJoqzX5/G4BeWbtdv9QgtO zmJYZYM/84HpHEs2WOttbSnbG9Qvj1vb4eQY0S3TdXJ6c3FDpPGYvlWH74eoFBUX ZjyKS5XbUfFDKXXtA/gTrbECd+bER6UCpbRrOXdZlZlNuwUFMXG5FGO2iFDTALjq WQGdlrNFwcKu3HFyIibDobXby+fsxtrPsLzyIDN9UsAUthFkzB4g9o6AUwrgNJPJ Y+aiFRnbKdeaauyaz4cMtd7Uhiy8muH+aZURCP8xSNjGQWImcglSfgoigWSJDoa2 kCNjnr44Zd+h+kfHALrOU5S9CfEWIHrxob9JlWVQAT8JHM+Dg1FEEhDPBDE1YZgx WFNhaTQPe4OJ0kLaYX3RB/sJ2InjvSAu6TZQZjK0ipRNxC3Z1gNyHF5m4qiLbhhV v54DrBpVsrchIRTPUl8xIeBqZLQ/0EJ1CJEYB/22NaiLPACb0KE= =AIC+ -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 18:56:18 2019 Received: (at 36643) by debbugs.gnu.org; 13 Jul 2019 22:56:18 +0000 Received: from localhost ([127.0.0.1]:43570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmQwE-00016u-AF for submit@debbugs.gnu.org; Sat, 13 Jul 2019 18:56:18 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:49697) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmQwC-00016h-Qg for 36643@debbugs.gnu.org; Sat, 13 Jul 2019 18:56:17 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 998AB210C6; Sat, 13 Jul 2019 18:56:11 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sat, 13 Jul 2019 18:56:11 -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=fm3; bh=s8TAWt/C2ZlUZscYA2zVMeIOFA ev47LgjeLEuvta7/I=; b=toF7Oz4jY7AI/ny8voE6F5K/5RN1TlVD5BqFrnc2Qa Hc0pgkyAoDazJLN3CBcS+Yp0giH8dOej1k1Y9N+0r53dxP/AIxbDYUoQskTJv60d uoqkCj4mhrR5WIX19z8VYcgQffCBhma7tRO79VmsR4NcjBbVMoRxgUJbe22QLc7L P865rd4dOaNV1DWuALa64KDLK2dZ+IsXOjILk6NSlV4hdxfLCoYSIJml/AoiX8F0 OJU1xVKEq9j9jtp9j0p46yjtxuDrhrJgDPKrWw5Wy//4h2df3LtJNhg/ejcdOkUi H56AmQ6pKcanQbuOCliXm62vtF+VfD/pHXvD90HjoCdQ== 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=fm3; bh=s8TAWt /C2ZlUZscYA2zVMeIOFAev47LgjeLEuvta7/I=; b=eWtgTMgHHQXiQtjlnlXWkb fyg+xLxsiVf1SpMHI9TAhBubTzXnu4hppr3+RFeDydnGKDWH/tKNW0EizlsBuUjc Wr7bYK5mz9B+jR1BOwfZDRXAWNOqjSnBaHlB7U3416zJMgz2yT2bjM+Byyef0Ti8 +8+tKcmoXWy4+TiHEWlHA4WHRjPTIg2JhUG4q6nt/WXS5jA6Ky8C1SS8nspSk3Z4 oGsaBca+lYDdJbehP4Ud0th+g0CC+sVTtWceJh2wZ9FGTCTLTcolg1ETK8lNzda6 aN1gGi5AfijsYTHzTeCvuYDH+lE3bzWALBThKt3yF/BfQviWIlFin8tRCKLJwSqg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrheeggddtudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufgjfhgffffkgggtsehgtderre dtredtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeeivd drudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvges fhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 0D7CE380076; Sat, 13 Jul 2019 18:56:10 -0400 (EDT) From: Marius Bakke To: Christopher Baines , 36643@debbugs.gnu.org Subject: Re: [bug#36643] [PATCH 1/2] gnu: python-pep8: Patch to fix test failure with Python 3.7. In-Reply-To: <20190713220102.7416-1-mail@cbaines.net> References: <20190713220102.7416-1-mail@cbaines.net> User-Agent: Notmuch/0.29.1 (https://notmuchmail.org) Emacs/26.2 (x86_64-pc-linux-gnu) Date: Sun, 14 Jul 2019 00:56:09 +0200 Message-ID: <87k1cllf1y.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: 36643 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 Christopher Baines writes: > Patch from the upstream repository, see > https://github.com/PyCQA/pycodestyle/issues/786 for more details. > > * gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch: New file. > * gnu/packages/python-xyz.scm (python-pep8)[source]: Add it. LGTM, thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl0qYYkACgkQoqBt8qM6 VPo8tQf8Cw6u83GRYfJyWSLXSB04yBxabIgenvvklJC7prbcWgbpFAFZHeVDalQW PEgwSBj1cPs/EAEo0Df+KoEQznchhMgEjemRufmKQxLhyC7EPft8VGZ9hJtZRZNL SCKp6xVAyodFdb5QZ92Iz5E0YnaOYoh+4xE08KJOnlxhPMCWnOFQl98B5eQ1YL6/ N5+XKNeGPpxm4JM6HUNTJhdWWxpYxV2vVmXfcUCKJ8g8b1fk70ZYzN6zQW+voxKz JNFXWCL4wt8m8PYZV7XZcEdoL4XL9UT9k3wUcUyz5xXL4UvftXZXuuo9Ll3TonhN yB7SDC1PBVgiU9znHnepgKCHBYM3VQ== =Egmo -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 14 04:10:38 2019 Received: (at 36643-done) by debbugs.gnu.org; 14 Jul 2019 08:10:38 +0000 Received: from localhost ([127.0.0.1]:43774 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmZac-0007c3-Bq for submit@debbugs.gnu.org; Sun, 14 Jul 2019 04:10:35 -0400 Received: from mira.cbaines.net ([212.71.252.8]:44268) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmZaZ-0007bu-W4 for 36643-done@debbugs.gnu.org; Sun, 14 Jul 2019 04:10:32 -0400 Received: from localhost (148.185.93.209.dyn.plus.net [209.93.185.148]) by mira.cbaines.net (Postfix) with ESMTPSA id 4403D171AE; Sun, 14 Jul 2019 09:10:26 +0100 (BST) Received: from phact (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 899edc91; Sun, 14 Jul 2019 08:10:25 +0000 (UTC) References: <20190713220102.7416-1-mail@cbaines.net> <87k1cllf1y.fsf@devup.no> User-agent: mu4e 1.2.0; emacs 26.2 From: Christopher Baines To: Marius Bakke Subject: Re: [bug#36643] [PATCH 1/2] gnu: python-pep8: Patch to fix test failure with Python 3.7. In-reply-to: <87k1cllf1y.fsf@devup.no> Date: Sun, 14 Jul 2019 09:10:23 +0100 Message-ID: <87v9w53ukw.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 36643-done Cc: 36643-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.0 (-) --=-=-= Content-Type: text/plain Marius Bakke writes: > Christopher Baines writes: > >> Patch from the upstream repository, see >> https://github.com/PyCQA/pycodestyle/issues/786 for more details. >> >> * gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch: New file. >> * gnu/packages/python-xyz.scm (python-pep8)[source]: Add it. > > LGTM, thanks! Great, I've pushed this now. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl0q429fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XeZkw//c0y5aZRpN1gRn6V3H9N36INHDwmMDUqf821otMZ6nIVT3tw5hrRghxMo P6NJMtEVX60Ele6adjK4KHc0DnxUl3AG/hi0yHxPAriFpsVC87KvWgQP8H2K9KoR WXRBEOz5Mi5dNMiWql8O6gyrRAJNgl1BlOhUAOPKq8oXt2cJjOcyaNXgI7QHWI1a GYWy4ghz5JMhflt1eGMrdX6FZWZWcQTQC6sltXbKhEf/ZRrvLtMVfCypK3s9RKc8 K09GfUL+vAmpsj8GbQwgY0TWqiq7qsM9F3rN8WFIjUd9OOzocm3od0zEbPBLUvZh bUyMtpoMy3yQ6SAb8YMLdHsaJIvsCFT4rxl3H3yueiFERpnBcCi/DP04t0PjBU9o cwLlif0v+ulMWii9z6gIEii0j0eVYVl9uahMighc9+vop++SxX3Du0P+novbUmpI ggpHAjKAvkAsi1NL299QxCu5X7VW352wXhWh7DkpfDBsgGLhmpcln8GYYXBfZEcm 0ulyuXSTqcOWgtuh0zHzpMY38Llmn3MZATBhFJT2uZv3z4lu2p7Q0qZyHbiQL5BB LmuM12Hrxdhbuoq3cKY0Gc56HMgAMrzmu/mrJqALkqYNDq5sKMf/KRjpCJmxpHM+ DdIjDhDj55AviAgxtVb/Lyf5NEnz3cFWcafcW/SpObN4l2OhgAU= =NJIq -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Sep 19 20:43:55 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, 11 Aug 2019 11:24:08 +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