1 |
commit: f861e691e1488fdff3cc14a1958711289e076c76 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 1 13:19:16 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 1 13:36:17 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f861e691 |
7 |
|
8 |
dev-python/argcomplete: Fix XPASS with fish 3.1.0 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/720216 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
.../argcomplete/argcomplete-1.11.1-r1.ebuild | 4 +++ |
14 |
.../files/argcomplete-1.11.1-fish-xpass.patch | 35 ++++++++++++++++++++++ |
15 |
2 files changed, 39 insertions(+) |
16 |
|
17 |
diff --git a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild |
18 |
index 47957f564ad..b8764d725fa 100644 |
19 |
--- a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild |
20 |
+++ b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild |
21 |
@@ -31,6 +31,10 @@ BDEPEND=" |
22 |
>=dev-python/pip-19 |
23 |
)" |
24 |
|
25 |
+PATCHES=( |
26 |
+ "${FILESDIR}"/argcomplete-1.11.1-fish-xpass.patch |
27 |
+) |
28 |
+ |
29 |
python_test() { |
30 |
"${EPYTHON}" test/test.py -v || die |
31 |
} |
32 |
|
33 |
diff --git a/dev-python/argcomplete/files/argcomplete-1.11.1-fish-xpass.patch b/dev-python/argcomplete/files/argcomplete-1.11.1-fish-xpass.patch |
34 |
new file mode 100644 |
35 |
index 00000000000..575c8abbb74 |
36 |
--- /dev/null |
37 |
+++ b/dev-python/argcomplete/files/argcomplete-1.11.1-fish-xpass.patch |
38 |
@@ -0,0 +1,35 @@ |
39 |
+From 08bfc8a788e8081515d733e67be026d051c726f7 Mon Sep 17 00:00:00 2001 |
40 |
+From: Evan <evanunderscore@×××××.com> |
41 |
+Date: Thu, 19 Mar 2020 14:55:07 +1100 |
42 |
+Subject: [PATCH] Remove expected test failure for new versions of fish (#292) |
43 |
+ |
44 |
+--- |
45 |
+ test/test.py | 7 ++++++- |
46 |
+ 1 file changed, 6 insertions(+), 1 deletion(-) |
47 |
+ |
48 |
+diff --git a/test/test.py b/test/test.py |
49 |
+index e91352b..2c34806 100755 |
50 |
+--- a/test/test.py |
51 |
++++ b/test/test.py |
52 |
+@@ -28,6 +28,8 @@ |
53 |
+ |
54 |
+ BASH_VERSION = subprocess.check_output(['bash', '-c', 'echo $BASH_VERSION']).decode() |
55 |
+ BASH_MAJOR_VERSION = int(BASH_VERSION.split('.')[0]) |
56 |
++FISH_VERSION_STR = subprocess.check_output(['fish', '-c', 'echo -n $FISH_VERSION']).decode() |
57 |
++FISH_VERSION_TUPLE = tuple(int(x) for x in FISH_VERSION_STR.split('.')) |
58 |
+ |
59 |
+ |
60 |
+ class TempDir(object): |
61 |
+@@ -1258,8 +1260,11 @@ class TestFish(_TestSh, unittest.TestCase): |
62 |
+ expected_failures = [ |
63 |
+ 'test_parse_special_characters', |
64 |
+ 'test_comp_point', |
65 |
+- 'test_special_characters_double_quoted' |
66 |
+ ] |
67 |
++ if FISH_VERSION_TUPLE < (3, 1): |
68 |
++ expected_failures.extend([ |
69 |
++ 'test_special_characters_double_quoted' |
70 |
++ ]) |
71 |
+ |
72 |
+ skipped = [ |
73 |
+ 'test_single_quotes_in_single_quotes', |