* [gentoo-commits] repo/gentoo:master commit in: dev-python/pymdown-extensions/files/, dev-python/pymdown-extensions/
@ 2024-05-17 8:20 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2024-05-17 8:20 UTC (permalink / raw
To: gentoo-commits
commit: fe39e0dab1bdaabb22680379b3d0bc1810f3930e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 08:18:05 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 17 08:20:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe39e0da
dev-python/pymdown-extensions: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pymdown-extensions/Manifest | 2 -
.../files/pymdown-extensions-10.7.1-md36.patch | 49 --------------------
.../pymdown-extensions-10.7.1.ebuild | 52 ----------------------
.../pymdown-extensions-10.8.ebuild | 47 -------------------
4 files changed, 150 deletions(-)
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 7c3aa6a86986..0ec1dfae02da 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,3 +1 @@
-DIST pymdown_extensions-10.7.1.tar.gz 811769 BLAKE2B ed2195a1a2262b96d444dd7d60c6330a6670cbe44a0f00f4c5a1dd80f4d2f13f0202adac5505d2fd5b6b5b02300e2d0bc62680fd92f3c00363c4123f02151a0a SHA512 60dce8fafb1935ab3d42320f9b6a3db9b60f4f4d4585b79f123103183f2a2ae9ed1256ae84992ad14b20f6969519a9c1a1b916c301a63715f867e8136be5eb2b
DIST pymdown_extensions-10.8.1.tar.gz 812097 BLAKE2B 1f9d0c2eea87ae15320ac81289532518639464d4fbf8e84fc55d0e3e14b40629960c0518c602a721d29c542d278a9ada53521fa7db228eb92f7f5aaa618dc27d SHA512 3a63086753f662cafaa0e1226d21cf90c9427c409b28898d037a3ebb566806226455b1e9e6c2f2b36781df02dfb7110fe0fb9e6df3170030af75ba5a42661ffd
-DIST pymdown_extensions-10.8.tar.gz 811981 BLAKE2B 98e95166fa4fdb0ed7049104f2a49995e43a40fb5118673ee8f47b999c4881a8468ce98e6381fd78d58b15218c444c8c3270450a845e5025cab8861d1746fcdb SHA512 24b5d2211941a771c7f3b6fb9d6eb2db2c3b38906c4c37f2fa385e5b28140a60dc163256e903fd4df4144b05d9c1c4c0c296fe76ceb290969674753b87de7466
diff --git a/dev-python/pymdown-extensions/files/pymdown-extensions-10.7.1-md36.patch b/dev-python/pymdown-extensions/files/pymdown-extensions-10.7.1-md36.patch
deleted file mode 100644
index 5c914923e6cc..000000000000
--- a/dev-python/pymdown-extensions/files/pymdown-extensions-10.7.1-md36.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 509e93de0f4d6052ff017a543aff70eb354dc590 Mon Sep 17 00:00:00 2001
-From: Isaac Muse <faceless.shop@gmail.com>
-Date: Tue, 26 Mar 2024 06:40:11 -0600
-Subject: [PATCH] Fix SmartSymbols Toc test (#2344)
-
-Fixes #2343
----
- tests/test_extensions/test_smartsymbols.py | 24 +++++++++++++++++++++-
- 1 file changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_extensions/test_smartsymbols.py b/tests/test_extensions/test_smartsymbols.py
-index b438fb7d7..1a8688f0c 100644
---- a/tests/test_extensions/test_smartsymbols.py
-+++ b/tests/test_extensions/test_smartsymbols.py
-@@ -1,6 +1,9 @@
- """Test cases for SmartSymbols."""
- from .. import util
- import markdown
-+from pymdownx.__meta__ import parse_version
-+
-+PYMD_3_6 = parse_version(markdown.__version__) >= (3, 6, 0)
-
-
- class TestSmartSymbols(util.MdCase):
-@@ -139,4 +142,23 @@ def test_toc_tokens(self):
-
- md = markdown.Markdown(extensions=['toc', 'pymdownx.smartsymbols'])
- md.convert('# *Foo* =/= `bar`')
-- self.assertEqual(md.toc_tokens, [{'level': 1, 'id': 'foo-bar', 'name': 'Foo ≠ bar', 'children': []}])
-+ self.assertEqual(
-+ md.toc_tokens,
-+ [
-+ {
-+ 'children': [],
-+ 'data-toc-label': '',
-+ 'html': '<em>Foo</em> ≠ <code>bar</code>',
-+ 'id': 'foo-bar',
-+ 'level': 1,
-+ 'name': 'Foo ≠ bar'
-+ }
-+ ] if PYMD_3_6 else [
-+ {
-+ 'level': 1,
-+ 'id': 'foo-bar',
-+ 'name': 'Foo ≠ bar',
-+ 'children': []
-+ }
-+ ]
-+ )
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.7.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.7.1.ebuild
deleted file mode 100644
index b81baf88a509..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.7.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
- https://github.com/facelessuser/pymdown-extensions/
- https://pypi.org/project/pymdown-extensions/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
- >=dev-python/markdown-3.5[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
- test? (
- >=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- local PATCHES=(
- # https://github.com/facelessuser/pymdown-extensions/issues/2343
- "${FILESDIR}/${P}-md36.patch"
- )
-
- # 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
-}
-
-python_test() {
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- epytest
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.8.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.8.ebuild
deleted file mode 100644
index 30aebcd368e1..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
- https://github.com/facelessuser/pymdown-extensions/
- https://pypi.org/project/pymdown-extensions/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
- >=dev-python/markdown-3.6[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
- test? (
- >=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
- )
-"
-
-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
-}
-
-python_test() {
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- epytest
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pymdown-extensions/files/, dev-python/pymdown-extensions/
@ 2024-06-17 16:27 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2024-06-17 16:27 UTC (permalink / raw
To: gentoo-commits
commit: c66ca5fb3d2a06c603b42e55a723d8c5684185fc
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 15:48:33 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 16:25:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c66ca5fb
dev-python/pymdown-extensions: Fix tests
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/pymdown-extensions-10.8.1-test.patch | 66 ++++++++++++++++++++++
.../pymdown-extensions-10.8.1.ebuild | 13 ++---
2 files changed, 70 insertions(+), 9 deletions(-)
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..59752923d9ee 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.8.1.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-10.8.1.ebuild
@@ -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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-17 16:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-17 16:27 [gentoo-commits] repo/gentoo:master commit in: dev-python/pymdown-extensions/files/, dev-python/pymdown-extensions/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-05-17 8:20 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox