gentoo auto-resync : 15:02:2023 - 08:00:21

4 files changed, 91 insertions, 1 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 65a2dd6d8517..f15801a6797e 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/stack_data/Manifest b/dev-python/stack_data/Manifest
index 7d9aa1e59ebf..1ba30d4a7617 100644
--- a/dev-python/stack_data/Manifest
+++ b/dev-python/stack_data/Manifest
@@ -1,3 +1,4 @@
+AUX stack_data-0.6.2-pygments-2.14.0.patch 4723 BLAKE2B 4c61d6d6846f663d90aaf2f71cbf9b95fff76367b4d9965aa401da8e61596f6d156017e037419d91bd8e4ed5bf9dd20a85795544cbca6d85d3ea7cac5558b238 SHA512 9cd7269c0b7051bdaa3a7402406aac1b170fea78f3d9c0431b636de318fe8dc91f9aab54d963a19024a57f84938d372d9fcce43216d6d037b32f0213bb0488d5
 DIST stack_data-0.6.2.tar.gz 44146 BLAKE2B 1344b48a597af3df3a00036412c513faa97824f183a4337566a1a8efafcb6ec6597cf5fad3c6d532e8df2173900bdf87d0071efc66a801bd93743a92619fb5dd SHA512 cdc623f8efc2fc4a968fd537c2147f4de90c0878554b3d3d741cf916ae549da8756d6ac943dbdee94721cc6a0c433d04d73e30bccee2b4ec1f5027efc3c9b90d
-EBUILD stack_data-0.6.2.ebuild 891 BLAKE2B 61ce7bfa1c290b491c0c3ed28aa9072e5e95d4374be3f6841ae7ed6b4d70d74abc7c0ad7f812c6341099065218515d5269779b41fe3d50037f819c17fdd38f29 SHA512 04ea0be8aeda90d76c4f9910ac0b8fa559d0b3d1a3221eed45f39ae5014e7a662d6fc078cbcfc24d11aa9232f5157631a636e45a963922d93ac508817a23445f
+EBUILD stack_data-0.6.2.ebuild 946 BLAKE2B 549807e8017277ff10a46f9aca5ef814884fae206c6f2f3e7e202ce885487148d14f0455e60f89458e4aec6b5805c40baa16641205d6d5cb2a41256a822a08d7 SHA512 7d16170e0caf4400cd1f308a1d9b7cece2cf23d78f486c1d25585629f3b170ce524ffaf2e826bae6c0be5078cb6c4989315e6c4b0c2f5d588ec3595f8fee639e
 MISC metadata.xml 399 BLAKE2B 6f2f1d18b8e574335af618995b745aa50ff1db8c58ea881b3596cbc9c22796dcf20b78ae52f370d308999a337233c6ab5a778a555876877851cdec20ac4e14b0 SHA512 474c2eae21a1617dbbd8002189fff802764bdf24bc854dd68b1feaf3e7ec4ba7831678b5facc9cf4587c784874cd530b11140ee345e831a9b7824e6752d2923e
diff --git a/dev-python/stack_data/files/stack_data-0.6.2-pygments-2.14.0.patch b/dev-python/stack_data/files/stack_data-0.6.2-pygments-2.14.0.patch
new file mode 100644
index 000000000000..6d1909bd8382
--- /dev/null
+++ b/dev-python/stack_data/files/stack_data-0.6.2-pygments-2.14.0.patch
@@ -0,0 +1,85 @@
+https://bugs.gentoo.org/892617
+https://github.com/alexmojaki/stack_data/pull/48
+
+From 4fbe4c0aec04ac818070d5963b0249a5592c1b53 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 3 Feb 2023 14:51:01 +0100
+Subject: [PATCH] Update test_pygments_example and skip it with Pygments <
+ 2.14.0
+
+--- a/tests/test_core.py
++++ b/tests/test_core.py
+@@ -630,7 +630,7 @@ def test_example():
+ """
+ 
+ 
+-@pytest.mark.skipif(pygments_version < (2, 12), reason="Different output in older Pygments")
++@pytest.mark.skipif(pygments_version < (2, 14), reason="Different output in older Pygments")
+ def test_pygments_example():
+     from .samples.pygments_example import bar
+     result = bar()
+@@ -670,32 +670,32 @@ def test_pygments_example():
+ 
+ TerminalFormatter native:
+ 
+-  13 | \x1b[34mdef\x1b[39;49;00m \x1b[32mbar\x1b[39;49;00m():
+-  14 |     x = \x1b[34m1\x1b[39;49;00m
+-  15 |     \x1b[36mstr\x1b[39;49;00m(x)
+-  17 |     \x1b[90m@deco\x1b[39;49;00m
+-  18 |     \x1b[34mdef\x1b[39;49;00m \x1b[32mfoo\x1b[39;49;00m():
+-  19 |         \x1b[34mpass\x1b[39;49;00m
++  13 | \x1b[34mdef\x1b[39;49;00m \x1b[32mbar\x1b[39;49;00m():\x1b[37m\x1b[39;49;00m
++  14 |     x = \x1b[34m1\x1b[39;49;00m\x1b[37m\x1b[39;49;00m
++  15 |     \x1b[36mstr\x1b[39;49;00m(x)\x1b[37m\x1b[39;49;00m
++  17 |     \x1b[90m@deco\x1b[39;49;00m\x1b[37m\x1b[39;49;00m
++  18 |     \x1b[34mdef\x1b[39;49;00m \x1b[32mfoo\x1b[39;49;00m():\x1b[37m\x1b[39;49;00m
++  19 |         \x1b[34mpass\x1b[39;49;00m\x1b[37m\x1b[39;49;00m
+ -----
+-  25 | \x1b[34mdef\x1b[39;49;00m \x1b[32mdeco\x1b[39;49;00m(f):
+-  26 |     f.result = print_stack()
+-  27 |     \x1b[34mreturn\x1b[39;49;00m f
++  25 | \x1b[34mdef\x1b[39;49;00m \x1b[32mdeco\x1b[39;49;00m(f):\x1b[37m\x1b[39;49;00m
++  26 |     f.result = print_stack()\x1b[37m\x1b[39;49;00m
++  27 |     \x1b[34mreturn\x1b[39;49;00m f\x1b[37m\x1b[39;49;00m
+ -----
+ 
+ ====================
+ 
+ TerminalFormatter <class \'stack_data.core.style_with_executing_node.<locals>.NewStyle\'>:
+ 
+-  13 | \x1b[34mdef\x1b[39;49;00m \x1b[32mbar\x1b[39;49;00m():
+-  14 |     x = \x1b[34m1\x1b[39;49;00m
+-  15 |     \x1b[36mstr\x1b[39;49;00m(x)
+-  17 |     \x1b[90m@deco\x1b[39;49;00m
+-  18 |     \x1b[34mdef\x1b[39;49;00m \x1b[32mfoo\x1b[39;49;00m():
+-  19 |         \x1b[34mpass\x1b[39;49;00m
++  13 | \x1b[34mdef\x1b[39;49;00m \x1b[32mbar\x1b[39;49;00m():\x1b[37m\x1b[39;49;00m
++  14 |     x = \x1b[34m1\x1b[39;49;00m\x1b[37m\x1b[39;49;00m
++  15 |     \x1b[36mstr\x1b[39;49;00m(x)\x1b[37m\x1b[39;49;00m
++  17 |     \x1b[90m@deco\x1b[39;49;00m\x1b[37m\x1b[39;49;00m
++  18 |     \x1b[34mdef\x1b[39;49;00m \x1b[32mfoo\x1b[39;49;00m():\x1b[37m\x1b[39;49;00m
++  19 |         \x1b[34mpass\x1b[39;49;00m\x1b[37m\x1b[39;49;00m
+ -----
+-  25 | \x1b[34mdef\x1b[39;49;00m \x1b[32mdeco\x1b[39;49;00m(f):
+-  26 |     f.result = print_stack()
+-  27 |     \x1b[34mreturn\x1b[39;49;00m f
++  25 | \x1b[34mdef\x1b[39;49;00m \x1b[32mdeco\x1b[39;49;00m(f):\x1b[37m\x1b[39;49;00m
++  26 |     f.result = print_stack()\x1b[37m\x1b[39;49;00m
++  27 |     \x1b[34mreturn\x1b[39;49;00m f\x1b[37m\x1b[39;49;00m
+ -----
+ 
+ ====================
+@@ -753,9 +753,9 @@ def test_pygments_example():
+   13 | <span class="k">def</span> <span class="nf">bar</span><span class="p">():</span>
+   14 |     <span class="n">x</span> <span class="o">=</span> <span class="mi">1</span>
+   15 |     <span class="nb">str</span><span class="p">(</span><span class="n">x</span><span class="p">)</span>
+-  17 | <span class=" -ExecutingNode">    </span><span class="nd nd-ExecutingNode">@deco</span><span class=" -ExecutingNode"></span>
+-  18 | <span class=" -ExecutingNode">    </span><span class="k k-ExecutingNode">def</span><span class=" -ExecutingNode"> </span><span class="nf nf-ExecutingNode">foo</span><span class="p p-ExecutingNode">():</span><span class=" -ExecutingNode"></span>
+-  19 | <span class=" -ExecutingNode">        </span><span class="k k-ExecutingNode">pass</span><span class=" -ExecutingNode"></span>
++  17 | <span class=" -ExecutingNode">    </span><span class="nd nd-ExecutingNode">@deco</span>
++  18 | <span class=" -ExecutingNode">    </span><span class="k k-ExecutingNode">def</span><span class=" -ExecutingNode"> </span><span class="nf nf-ExecutingNode">foo</span><span class="p p-ExecutingNode">():</span>
++  19 | <span class=" -ExecutingNode">        </span><span class="k k-ExecutingNode">pass</span>
+ -----
+   25 | <span class="k">def</span> <span class="nf">deco</span><span class="p">(</span><span class="n">f</span><span class="p">):</span>
+   26 |     <span class="n">f</span><span class="o">.</span><span class="n">result</span> <span class="o">=</span> <span class="n n-ExecutingNode">print_stack</span><span class="p p-ExecutingNode">()</span>
+
diff --git a/dev-python/stack_data/stack_data-0.6.2.ebuild b/dev-python/stack_data/stack_data-0.6.2.ebuild
index 41f861b9517b..c1c970dc4484 100644
--- a/dev-python/stack_data/stack_data-0.6.2.ebuild
+++ b/dev-python/stack_data/stack_data-0.6.2.ebuild
@@ -33,4 +33,8 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-pygments-2.14.0.patch
+)
+
 distutils_enable_tests pytest