summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2021-05-22 19:06:45 +0200
committerMarius Bakke <marius@gnu.org>2021-05-22 20:03:24 +0200
commit0de7945dc47612286ef080315a5a78f019b161b6 (patch)
tree6fd429da1ed8246cd1b9b034c8e0522813596c05 /gnu
parent9df9a878c0a8f0c4503432bb38b16a74d1fa523d (diff)
gnu: python-pyflakes: Remove obsolete patch.
This patch was added on 'core-updates' in 43c889de85e79f279931d6cced261f54c9be5075, but no longer necessary since the update to 2.3.1 in 91741db5397174a2e96b4010c3c9ff53d34e8ef0. * gnu/packages/patches/python-pyflakes-fix-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-xyz.scm (python-pyflakes)[source](patches): Remove.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/patches/python-pyflakes-fix-tests.patch40
-rw-r--r--gnu/packages/python-xyz.scm3
3 files changed, 1 insertions, 43 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index ad889557c85..ecbf67118e6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1567,7 +1567,6 @@ dist_patch_DATA = \
1567 %D%/packages/patches/python-keras-integration-test.patch \ 1567 %D%/packages/patches/python-keras-integration-test.patch \
1568 %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ 1568 %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \
1569 %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ 1569 %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \
1570 %D%/packages/patches/python-pyflakes-fix-tests.patch \
1571 %D%/packages/patches/python-flint-includes.patch \ 1570 %D%/packages/patches/python-flint-includes.patch \
1572 %D%/packages/patches/python-libxml2-python39-compat.patch \ 1571 %D%/packages/patches/python-libxml2-python39-compat.patch \
1573 %D%/packages/patches/python-libxml2-utf8.patch \ 1572 %D%/packages/patches/python-libxml2-utf8.patch \
diff --git a/gnu/packages/patches/python-pyflakes-fix-tests.patch b/gnu/packages/patches/python-pyflakes-fix-tests.patch
deleted file mode 100644
index 48107c82539..00000000000
--- a/gnu/packages/patches/python-pyflakes-fix-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From c873a25136dfdb062855b595cdf0a992ac825adf Mon Sep 17 00:00:00 2001
2From: Louis Sautier <sautier.louis@gmail.com>
3Date: Sat, 3 Oct 2020 01:36:15 +0200
4Subject: [PATCH] Fix tests with Python 3.9, closes #549
5
6---
7 pyflakes/test/test_api.py | 8 ++++++--
8 1 file changed, 6 insertions(+), 2 deletions(-)
9
10diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
11index 8e1e3c9c..906fb396 100644
12--- a/pyflakes/test/test_api.py
13+++ b/pyflakes/test/test_api.py
14@@ -517,6 +515,8 @@ def foo(bar=baz, bax):
15 if ERROR_HAS_LAST_LINE:
16 if PYPY:
17 column = 7
18+ elif sys.version_info >= (3, 9):
19+ column = 21
20 elif sys.version_info >= (3, 8):
21 column = 9
22 else:
23@@ -545,6 +545,8 @@ def test_nonKeywordAfterKeywordSyntaxError(self):
24 if ERROR_HAS_LAST_LINE:
25 if PYPY:
26 column = 12
27+ elif sys.version_info >= (3, 9):
28+ column = 17
29 elif sys.version_info >= (3, 8):
30 column = 14
31 else:
32@@ -579,6 +581,8 @@ def test_invalidEscape(self):
33 position_end = 1
34 if PYPY:
35 column = 6
36+ elif ver >= (3,9):
37+ column = 13
38 else:
39 column = 7
40 # Column has been "fixed" since 3.2.4 and 3.3.1
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 85b3b5ad0b5..29f2d056f18 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9076,8 +9076,7 @@ PEP 8.")
9076 (uri (pypi-uri "pyflakes" version)) 9076 (uri (pypi-uri "pyflakes" version))
9077 (sha256 9077 (sha256
9078 (base32 9078 (base32
9079 "1ny10364ciqh4ripasj4zzv4145l21l3s85m3qlrvfq5pk58xg7m")) 9079 "1ny10364ciqh4ripasj4zzv4145l21l3s85m3qlrvfq5pk58xg7m"))))
9080 (patches (search-patches "python-pyflakes-fix-tests.patch"))))
9081 (build-system python-build-system) 9080 (build-system python-build-system)
9082 (home-page "https://github.com/PyCQA/pyflakes") 9081 (home-page "https://github.com/PyCQA/pyflakes")
9083 (synopsis "Passive checker of Python programs") 9082 (synopsis "Passive checker of Python programs")