| 1 |
commit: b596666d58e2d9ff7397783f18be11efc5fa1ad7 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 27 10:24:38 2023 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 27 12:45:00 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b596666d |
| 7 |
|
| 8 |
dev-python/ansible-pygments: patch tests to support current Pygments |
| 9 |
|
| 10 |
Revision bump because of an RDEPEND change required to match the |
| 11 |
expected test output, straight to stable because |
| 12 |
<dev-python/pygments-2.14 got dropped from the tree almost a month ago. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/892061 |
| 15 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 16 |
|
| 17 |
...1.1.ebuild => ansible-pygments-0.1.1-r1.ebuild} | 8 ++- |
| 18 |
...ansible-pygments-0.1.1-tests_pygments2_14.patch | 75 ++++++++++++++++++++++ |
| 19 |
2 files changed, 81 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild b/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild |
| 22 |
similarity index 73% |
| 23 |
rename from dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild |
| 24 |
rename to dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild |
| 25 |
index 0f4d366bc7b9..77088a1a54f2 100644 |
| 26 |
--- a/dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild |
| 27 |
+++ b/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild |
| 28 |
@@ -16,7 +16,11 @@ LICENSE="MIT" |
| 29 |
SLOT="0" |
| 30 |
KEYWORDS="amd64 ~riscv" |
| 31 |
|
| 32 |
-# 2.11.0+ needed in order for tests to pass |
| 33 |
-RDEPEND=">=dev-python/pygments-2.11.0[${PYTHON_USEDEP}]" |
| 34 |
+# 2.14.0+ needed in order for tests to pass |
| 35 |
+RDEPEND=">=dev-python/pygments-2.14.0[${PYTHON_USEDEP}]" |
| 36 |
+ |
| 37 |
+PATCHES=( |
| 38 |
+ "${FILESDIR}"/${PN}-0.1.1-tests_pygments2_14.patch |
| 39 |
+) |
| 40 |
|
| 41 |
distutils_enable_tests pytest |
| 42 |
|
| 43 |
diff --git a/dev-python/ansible-pygments/files/ansible-pygments-0.1.1-tests_pygments2_14.patch b/dev-python/ansible-pygments/files/ansible-pygments-0.1.1-tests_pygments2_14.patch |
| 44 |
new file mode 100644 |
| 45 |
index 000000000000..d58a13256ac5 |
| 46 |
--- /dev/null |
| 47 |
+++ b/dev-python/ansible-pygments/files/ansible-pygments-0.1.1-tests_pygments2_14.patch |
| 48 |
@@ -0,0 +1,75 @@ |
| 49 |
+Backported upstream commit 0ddab3516217ac2067b6e980f5b2a6b2ac1be3fa |
| 50 |
+ |
| 51 |
+--- a/tests/lexer_test.py |
| 52 |
++++ b/tests/lexer_test.py |
| 53 |
+@@ -86,41 +86,41 @@ def test_ansible_output_lexer(): |
| 54 |
+ |
| 55 |
+ <span class="k">TASK</span> <span class="p">[</span><span class="l">paused</span><span class="p">]</span> <span class="nv">************************************************************************************************************************************</span> |
| 56 |
+ <span class="w">Sunday 11 November 2018 20:16:48 +0100 (0:00:00.041) 0:07:59.637 *******</span> |
| 57 |
+-<span class="gd">--- before</span><span class="w"></span> |
| 58 |
+-<span class="gi">+++ after</span><span class="w"></span> |
| 59 |
+-<span class="gu">@@ -1,5 +1,5 @@</span><span class="w"></span> |
| 60 |
+-<span class="w"> </span>{<span class="w"></span> |
| 61 |
+-<span class="gd">- "exists": false,</span><span class="w"></span> |
| 62 |
+-<span class="gd">- "paused": false,</span><span class="w"></span> |
| 63 |
+-<span class="gd">- "running": false</span><span class="w"></span> |
| 64 |
+-<span class="gi">+ "exists": true,</span><span class="w"></span> |
| 65 |
+-<span class="gi">+ "paused": true,</span><span class="w"></span> |
| 66 |
+-<span class="gi">+ "running": true</span><span class="w"></span> |
| 67 |
+-<span class="w"> </span>}<span class="w"></span> |
| 68 |
++<span class="gd">--- before</span> |
| 69 |
++<span class="gi">+++ after</span> |
| 70 |
++<span class="gu">@@ -1,5 +1,5 @@</span> |
| 71 |
++<span class="w"> </span>{ |
| 72 |
++<span class="gd">- "exists": false,</span> |
| 73 |
++<span class="gd">- "paused": false,</span> |
| 74 |
++<span class="gd">- "running": false</span> |
| 75 |
++<span class="gi">+ "exists": true,</span> |
| 76 |
++<span class="gi">+ "paused": true,</span> |
| 77 |
++<span class="gi">+ "running": true</span> |
| 78 |
++<span class="w"> </span>} |
| 79 |
+ <span class="w">\ No newline at end of file</span> |
| 80 |
+ |
| 81 |
+ <span class="k">changed</span><span class="p">:</span> <span class="p">[</span><span class="nv">localhost</span><span class="p">]</span> |
| 82 |
+ |
| 83 |
+ <span class="k">TASK</span> <span class="p">[</span><span class="l">volumes (more volumes)</span><span class="p">]</span> <span class="nv">********************************************************************************************************************</span> |
| 84 |
+ <span class="w">Sunday 11 November 2018 20:19:25 +0100 (0:00:00.607) 0:10:36.974 *******</span> |
| 85 |
+-<span class="gd">--- before</span><span class="w"></span> |
| 86 |
+-<span class="gi">+++ after</span><span class="w"></span> |
| 87 |
+-<span class="gu">@@ -1,11 +1,11 @@</span><span class="w"></span> |
| 88 |
+-<span class="w"> </span>{<span class="w"></span> |
| 89 |
+-<span class="w"> </span> "expected_binds": [<span class="w"></span> |
| 90 |
+-<span class="gd">- "/tmp:/tmp:rw",</span><span class="w"></span> |
| 91 |
+-<span class="gd">- "/:/whatever:rw,z"</span><span class="w"></span> |
| 92 |
+-<span class="gi">+ "/tmp:/somewhereelse:ro,Z",</span><span class="w"></span> |
| 93 |
+-<span class="gi">+ "/tmp:/tmp:rw"</span><span class="w"></span> |
| 94 |
+-<span class="w"> </span> ],<span class="w"></span> |
| 95 |
+-<span class="w"> </span> "expected_volumes": {<span class="w"></span> |
| 96 |
+-<span class="gd">- "/tmp": {},</span><span class="w"></span> |
| 97 |
+-<span class="gd">- "/whatever": {}</span><span class="w"></span> |
| 98 |
+-<span class="gi">+ "/somewhereelse": {},</span><span class="w"></span> |
| 99 |
+-<span class="gi">+ "/tmp": {}</span><span class="w"></span> |
| 100 |
+-<span class="w"> </span> },<span class="w"></span> |
| 101 |
+-<span class="w"> </span> "running": true<span class="w"></span> |
| 102 |
+-<span class="w"> </span>}<span class="w"></span> |
| 103 |
++<span class="gd">--- before</span> |
| 104 |
++<span class="gi">+++ after</span> |
| 105 |
++<span class="gu">@@ -1,11 +1,11 @@</span> |
| 106 |
++<span class="w"> </span>{ |
| 107 |
++<span class="w"> </span> "expected_binds": [ |
| 108 |
++<span class="gd">- "/tmp:/tmp:rw",</span> |
| 109 |
++<span class="gd">- "/:/whatever:rw,z"</span> |
| 110 |
++<span class="gi">+ "/tmp:/somewhereelse:ro,Z",</span> |
| 111 |
++<span class="gi">+ "/tmp:/tmp:rw"</span> |
| 112 |
++<span class="w"> </span> ], |
| 113 |
++<span class="w"> </span> "expected_volumes": { |
| 114 |
++<span class="gd">- "/tmp": {},</span> |
| 115 |
++<span class="gd">- "/whatever": {}</span> |
| 116 |
++<span class="gi">+ "/somewhereelse": {},</span> |
| 117 |
++<span class="gi">+ "/tmp": {}</span> |
| 118 |
++<span class="w"> </span> }, |
| 119 |
++<span class="w"> </span> "running": true |
| 120 |
++<span class="w"> </span>} |
| 121 |
+ <span class="w">\ No newline at end of file</span> |
| 122 |
+ |
| 123 |
+ <span class="k">changed</span><span class="p">:</span> <span class="p">[</span><span class="nv">localhost</span><span class="p">]</span> |
Archives