gentoo auto-resync : 18:06:2024 - 00:10:02

3 files changed, 73 insertions, 11 deletions

diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 8f39b481ec4b..e4fdb057f6fe 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,3 +1,4 @@
+AUX pymdown-extensions-10.8.1-test.patch 2967 BLAKE2B 696c72acfb0111387b309ef3fb1cee82cfaa433fcd8c1d940ad2eac030bdfda55f7c6eb1f1f95d292e0366215e052e6499ef2ad66598cadb43f71650f9edf6b3 SHA512 989e4606330dd94c596ab832e3e1c3e17af98c47b4293e95f8d1f051a16f1567b6daa4de65b7716d3f14c642305738469b8b40eef76ddca18b8eba7a74e70b75
 DIST pymdown_extensions-10.8.1.tar.gz 812097 BLAKE2B 1f9d0c2eea87ae15320ac81289532518639464d4fbf8e84fc55d0e3e14b40629960c0518c602a721d29c542d278a9ada53521fa7db228eb92f7f5aaa618dc27d SHA512 3a63086753f662cafaa0e1226d21cf90c9427c409b28898d037a3ebb566806226455b1e9e6c2f2b36781df02dfb7110fe0fb9e6df3170030af75ba5a42661ffd
-EBUILD pymdown-extensions-10.8.1.ebuild 1069 BLAKE2B 430cc4ce166cfd5aeab11355e58e15ffaca7fe1b16d1085c078fa3a884cfbd3d3728983fa615e30cc0245def5e0b2394bf21f833d4a5592e7927dd4a97d7cfef SHA512 38b9a98e192291f1ce12401709b9d4eb5d542590dc5df82d708a9ad124ca94caf2f3c185cfc8d31466a612c2ed9d49a06dedcebb6fddaca22c229848f624a45a
+EBUILD pymdown-extensions-10.8.1.ebuild 824 BLAKE2B eed62e95ee630a5d942787deff0f9221ef4b0ec11d3eb3573018d13955a552c28fdaca7e631d8cee80ae2796f86893e6adba4485fc4e539ea77af2b28c46617b SHA512 8bdb97fb0f7974ed8a1870d473f13af59c85a36cdc04e98458c94a5ef858731e1ba653fd68e2648caee04d091570a53d2dfe307efc208587cf1937249ced2313
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/files/pymdown-extensions-10.8.1-test.patch b/dev-python/pymdown-extensions/files/pymdown-extensions-10.8.1-test.patch
new file mode 100644
index 000000000000..507494094b73
--- /dev/null
+++ b/dev-python/pymdown-extensions/files/pymdown-extensions-10.8.1-test.patch
@@ -0,0 +1,66 @@
+From 321d5d8c7fa5965cb4c933eae8371113d40f9932 Mon Sep 17 00:00:00 2001
+From: facelessuser <faceless.shop@gmail.com>
+Date: Sun, 5 May 2024 06:50:56 -0600
+Subject: [PATCH] Update tests to account for latest Ruff and Pygments updates
+
+- Fix warning in Ruff
+- Fix test expectations of Pygments lexer output
+
+Fixes #2378
+---
+ tests/test_extensions/test_highlight.py    | 8 ++++----
+ tests/test_extensions/test_inlinehilite.py | 4 ++--
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/tests/test_extensions/test_highlight.py b/tests/test_extensions/test_highlight.py
+index 2b020a8a2..4d4433c80 100644
+--- a/tests/test_extensions/test_highlight.py
++++ b/tests/test_extensions/test_highlight.py
+@@ -23,10 +23,10 @@ def test_guess(self):
+             ```
+             ''',
+             '''
+-            <div class="highlight"><pre><span></span><code><span class="kn">import</span> <span class="nn">test</span>
++            <div class="highlight"><pre><span></span><code><span class="kn">import</span><span class="w"> </span><span class="nn">test</span>
+             <span class="n">test</span><span class="o">.</span><span class="n">test</span><span class="p">()</span>
+             </code></pre></div>
+-            ''',
++            ''',  # noqa: E501
+             True
+         )
+ 
+@@ -52,10 +52,10 @@ def test_guess_block(self):
+             ```
+             ''',
+             '''
+-            <div class="highlight"><pre><span></span><code><span class="kn">import</span> <span class="nn">test</span>
++            <div class="highlight"><pre><span></span><code><span class="kn">import</span><span class="w"> </span><span class="nn">test</span>
+             <span class="n">test</span><span class="o">.</span><span class="n">test</span><span class="p">()</span>
+             </code></pre></div>
+-            ''',
++            ''',  # noqa: E501
+             True
+         )
+ 
+diff --git a/tests/test_extensions/test_inlinehilite.py b/tests/test_extensions/test_inlinehilite.py
+index 3cb853070..c82baa6dc 100644
+--- a/tests/test_extensions/test_inlinehilite.py
++++ b/tests/test_extensions/test_inlinehilite.py
+@@ -224,7 +224,7 @@ def test_guessing(self):
+ 
+         self.check_markdown(
+             r'`import module`.',
+-            r'<p><code class="inlinehilite"><span class="kn">import</span> <span class="nn">module</span></code>.</p>'
++            r'<p><code class="inlinehilite"><span class="kn">import</span><span class="w"> </span><span class="nn">module</span></code>.</p>'  # noqa: E501
+         )
+ 
+ 
+@@ -251,7 +251,7 @@ def test_guessing_inline(self):
+ 
+         self.check_markdown(
+             r'`import module`.',
+-            r'<p><code class="inlinehilite"><span class="kn">import</span> <span class="nn">module</span></code>.</p>'
++            r'<p><code class="inlinehilite"><span class="kn">import</span><span class="w"> </span><span class="nn">module</span></code>.</p>'  # noqa: E501
+         )
+ 
+     def test_no_guessing_block(self):
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.8.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.8.1.ebuild
index 8f28adec21d5..c37645c8c438 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.8.1.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-10.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 
 inherit distutils-r1 pypi
 
@@ -31,15 +31,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	# broken on pypy3; unfortunately, the parametrization is based
-	# on indexes and these are pretty random, so we need to remove it
-	# entirely
-	# TODO: restore it when pypy with a fix is in Gentoo
-	# https://github.com/pypy/pypy/issues/4920
-	rm "tests/extensions/superfences/superfences (normal).txt" || die
-	distutils-r1_src_prepare
-}
+PATCHES=(
+	# https://github.com/facelessuser/pymdown-extensions/pull/2379
+	"${FILESDIR}/${P}-test.patch"
+)
 
 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1