diff options
author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-09 12:22:14 +0200 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-09 12:22:14 +0200 |
commit | 94ca5b4357af8f8921f0cb0873a7cf316f13aa69 (patch) | |
tree | 6ef30120737f26f298f7f17d86597b0b729517e0 /gnu/packages/patches/python-pyflakes-test-location.patch | |
parent | 6750c114e3e988249f4069d0180316c6d0192350 (diff) | |
parent | db61bdd7f52270a35bd0a3a88650d98276dab20b (diff) | |
download | guix-94ca5b4357af8f8921f0cb0873a7cf316f13aa69.tar.gz guix-94ca5b4357af8f8921f0cb0873a7cf316f13aa69.zip |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/patches/python-pyflakes-test-location.patch')
-rw-r--r-- | gnu/packages/patches/python-pyflakes-test-location.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/gnu/packages/patches/python-pyflakes-test-location.patch b/gnu/packages/patches/python-pyflakes-test-location.patch deleted file mode 100644 index ea2c50c82e..0000000000 --- a/gnu/packages/patches/python-pyflakes-test-location.patch +++ /dev/null @@ -1,42 +0,0 @@ -This patch fixes test failure related to reported source code locations. -It is a backport of this patch: - - commit 6a5f38b5ab12260fde8a0463acd433bc2d34dbcf - Author: Louis Sautier <sautier.louis@gmail.com> - Date: Sat Oct 3 02:37:53 2020 +0200 - - Fix tests with Python 3.9, closes #549 (#586) - - Stop allowing failures on Python nightly. - -diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py -index 128aa69..b728e65 100644 ---- a/pyflakes/test/test_api.py -+++ b/pyflakes/test/test_api.py -@@ -515,6 +515,8 @@ def foo(bar=baz, bax): - if ERROR_HAS_LAST_LINE: - if PYPY and sys.version_info >= (3,): - column = 7 -+ elif sys.version_info >= (3, 9): -+ column = 21 - elif sys.version_info >= (3, 8): - column = 9 - else: -@@ -543,6 +545,8 @@ foo(bar=baz, bax) - if ERROR_HAS_LAST_LINE: - if PYPY and sys.version_info >= (3,): - column = 12 -+ elif sys.version_info >= (3, 9): -+ column = 17 - elif sys.version_info >= (3, 8): - column = 14 - else: -@@ -577,6 +581,8 @@ foo(bar=baz, bax) - position_end = 1 - if PYPY: - column = 6 -+ elif ver >= (3, 9): -+ column = 13 - else: - column = 7 - # Column has been "fixed" since 3.2.4 and 3.3.1 |