commit: b596666d58e2d9ff7397783f18be11efc5fa1ad7 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Mon Feb 27 10:24:38 2023 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Mon Feb 27 12:45:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b596666d
dev-python/ansible-pygments: patch tests to support current Pygments Revision bump because of an RDEPEND change required to match the expected test output, straight to stable because <dev-python/pygments-2.14 got dropped from the tree almost a month ago. Closes: https://bugs.gentoo.org/892061 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> ...1.1.ebuild => ansible-pygments-0.1.1-r1.ebuild} | 8 ++- ...ansible-pygments-0.1.1-tests_pygments2_14.patch | 75 ++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) 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 similarity index 73% rename from dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild rename to dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild index 0f4d366bc7b9..77088a1a54f2 100644 --- a/dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild +++ b/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild @@ -16,7 +16,11 @@ LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~riscv" -# 2.11.0+ needed in order for tests to pass -RDEPEND=">=dev-python/pygments-2.11.0[${PYTHON_USEDEP}]" +# 2.14.0+ needed in order for tests to pass +RDEPEND=">=dev-python/pygments-2.14.0[${PYTHON_USEDEP}]" + +PATCHES=( + "${FILESDIR}"/${PN}-0.1.1-tests_pygments2_14.patch +) distutils_enable_tests pytest 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 new file mode 100644 index 000000000000..d58a13256ac5 --- /dev/null +++ b/dev-python/ansible-pygments/files/ansible-pygments-0.1.1-tests_pygments2_14.patch @@ -0,0 +1,75 @@ +Backported upstream commit 0ddab3516217ac2067b6e980f5b2a6b2ac1be3fa + +--- a/tests/lexer_test.py ++++ b/tests/lexer_test.py +@@ -86,41 +86,41 @@ def test_ansible_output_lexer(): + + <span class="k">TASK</span> <span class="p">[</span><span class="l">paused</span><span class="p">]</span> <span class="nv">************************************************************************************************************************************</span> + <span class="w">Sunday 11 November 2018 20:16:48 +0100 (0:00:00.041) 0:07:59.637 *******</span> +-<span class="gd">--- before</span><span class="w"></span> +-<span class="gi">+++ after</span><span class="w"></span> +-<span class="gu">@@ -1,5 +1,5 @@</span><span class="w"></span> +-<span class="w"> </span>{<span class="w"></span> +-<span class="gd">- "exists": false,</span><span class="w"></span> +-<span class="gd">- "paused": false,</span><span class="w"></span> +-<span class="gd">- "running": false</span><span class="w"></span> +-<span class="gi">+ "exists": true,</span><span class="w"></span> +-<span class="gi">+ "paused": true,</span><span class="w"></span> +-<span class="gi">+ "running": true</span><span class="w"></span> +-<span class="w"> </span>}<span class="w"></span> ++<span class="gd">--- before</span> ++<span class="gi">+++ after</span> ++<span class="gu">@@ -1,5 +1,5 @@</span> ++<span class="w"> </span>{ ++<span class="gd">- "exists": false,</span> ++<span class="gd">- "paused": false,</span> ++<span class="gd">- "running": false</span> ++<span class="gi">+ "exists": true,</span> ++<span class="gi">+ "paused": true,</span> ++<span class="gi">+ "running": true</span> ++<span class="w"> </span>} + <span class="w">\ No newline at end of file</span> + + <span class="k">changed</span><span class="p">:</span> <span class="p">[</span><span class="nv">localhost</span><span class="p">]</span> + + <span class="k">TASK</span> <span class="p">[</span><span class="l">volumes (more volumes)</span><span class="p">]</span> <span class="nv">********************************************************************************************************************</span> + <span class="w">Sunday 11 November 2018 20:19:25 +0100 (0:00:00.607) 0:10:36.974 *******</span> +-<span class="gd">--- before</span><span class="w"></span> +-<span class="gi">+++ after</span><span class="w"></span> +-<span class="gu">@@ -1,11 +1,11 @@</span><span class="w"></span> +-<span class="w"> </span>{<span class="w"></span> +-<span class="w"> </span> "expected_binds": [<span class="w"></span> +-<span class="gd">- "/tmp:/tmp:rw",</span><span class="w"></span> +-<span class="gd">- "/:/whatever:rw,z"</span><span class="w"></span> +-<span class="gi">+ "/tmp:/somewhereelse:ro,Z",</span><span class="w"></span> +-<span class="gi">+ "/tmp:/tmp:rw"</span><span class="w"></span> +-<span class="w"> </span> ],<span class="w"></span> +-<span class="w"> </span> "expected_volumes": {<span class="w"></span> +-<span class="gd">- "/tmp": {},</span><span class="w"></span> +-<span class="gd">- "/whatever": {}</span><span class="w"></span> +-<span class="gi">+ "/somewhereelse": {},</span><span class="w"></span> +-<span class="gi">+ "/tmp": {}</span><span class="w"></span> +-<span class="w"> </span> },<span class="w"></span> +-<span class="w"> </span> "running": true<span class="w"></span> +-<span class="w"> </span>}<span class="w"></span> ++<span class="gd">--- before</span> ++<span class="gi">+++ after</span> ++<span class="gu">@@ -1,11 +1,11 @@</span> ++<span class="w"> </span>{ ++<span class="w"> </span> "expected_binds": [ ++<span class="gd">- "/tmp:/tmp:rw",</span> ++<span class="gd">- "/:/whatever:rw,z"</span> ++<span class="gi">+ "/tmp:/somewhereelse:ro,Z",</span> ++<span class="gi">+ "/tmp:/tmp:rw"</span> ++<span class="w"> </span> ], ++<span class="w"> </span> "expected_volumes": { ++<span class="gd">- "/tmp": {},</span> ++<span class="gd">- "/whatever": {}</span> ++<span class="gi">+ "/somewhereelse": {},</span> ++<span class="gi">+ "/tmp": {}</span> ++<span class="w"> </span> }, ++<span class="w"> </span> "running": true ++<span class="w"> </span>} + <span class="w">\ No newline at end of file</span> + + <span class="k">changed</span><span class="p">:</span> <span class="p">[</span><span class="nv">localhost</span><span class="p">]</span>
