diff options
Diffstat (limited to 'dev-python/recommonmark')
| -rw-r--r-- | dev-python/recommonmark/Manifest | 1 | ||||
| -rw-r--r-- | dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-1.patch | 122 | ||||
| -rw-r--r-- | dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-2.patch | 63 | ||||
| -rw-r--r-- | dev-python/recommonmark/metadata.xml | 10 | ||||
| -rw-r--r-- | dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild | 44 |
5 files changed, 240 insertions, 0 deletions
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest new file mode 100644 index 000000000000..27dca1e32fbe --- /dev/null +++ b/dev-python/recommonmark/Manifest @@ -0,0 +1 @@ +DIST recommonmark-0.7.1.gh.tar.gz 24720 BLAKE2B 6543a23bd262be0ff6847fc1eb1bd3dad433606aa1adb52162cab2e0c4dd2265ac41b3816bbe1994c4f6ca732105712dbc9cd295d5cfd93061ad83520b8f449c SHA512 3e03440d606ea6247df9bd122a6fa2dccf01c0c315eeace046d5cd336657e26bbd1c6b7ad4ba46f344215905128b72508c036cc57bbe4b5e27df50c55371fe01 diff --git a/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-1.patch b/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-1.patch new file mode 100644 index 000000000000..f628630c2009 --- /dev/null +++ b/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-1.patch @@ -0,0 +1,122 @@ +https://bugs.gentoo.org/723468#c4 +By Anon Emuss <abuslbea@centurylink.net> +---- +Update tests for sphinx-3 + +The deprecated source_parsers no longer works with sphinx-3. Modify +conf.py files to use the recommonmark extension, which sphinx supports. + +Tested and appears to work with sphinx-2.4.4 and sphinx-3.2.1. + +diff --git a/tests/sphinx_code_block/conf.py b/tests/sphinx_code_block/conf.py +index 6b0140e..ddfafd5 100644 +--- a/tests/sphinx_code_block/conf.py ++++ b/tests/sphinx_code_block/conf.py +@@ -1,11 +1,9 @@ + + # -*- coding: utf-8 -*- + +-from recommonmark.parser import CommonMarkParser +- + templates_path = ['_templates'] +-source_suffix = '.md' +-source_parsers = { '.md': CommonMarkParser } ++extensions = ['recommonmark'] ++source_suffix = { '.md': 'markdown' } + master_doc = 'index' + project = u'sphinxproj' + copyright = u'2015, rtfd' +diff --git a/tests/sphinx_custom_md/conf.py b/tests/sphinx_custom_md/conf.py +index b29157b..9073346 100644 +--- a/tests/sphinx_custom_md/conf.py ++++ b/tests/sphinx_custom_md/conf.py +@@ -1,12 +1,11 @@ + + # -*- coding: utf-8 -*- + +-from recommonmark.parser import CommonMarkParser + from recommonmark.transform import AutoStructify + + templates_path = ['_templates'] +-source_suffix = '.markdown' +-source_parsers = { '.markdown': CommonMarkParser } ++extensions = ['recommonmark'] ++source_suffix = { '.markdown': 'markdown' } + master_doc = 'index' + project = u'sphinxproj' + copyright = u'2015, rtfd' +diff --git a/tests/sphinx_generic/conf.py b/tests/sphinx_generic/conf.py +index 6b0140e..ddfafd5 100644 +--- a/tests/sphinx_generic/conf.py ++++ b/tests/sphinx_generic/conf.py +@@ -1,11 +1,9 @@ + + # -*- coding: utf-8 -*- + +-from recommonmark.parser import CommonMarkParser +- + templates_path = ['_templates'] +-source_suffix = '.md' +-source_parsers = { '.md': CommonMarkParser } ++extensions = ['recommonmark'] ++source_suffix = { '.md': 'markdown' } + master_doc = 'index' + project = u'sphinxproj' + copyright = u'2015, rtfd' +diff --git a/tests/sphinx_indented_code/conf.py b/tests/sphinx_indented_code/conf.py +index f441071..90c5692 100644 +--- a/tests/sphinx_indented_code/conf.py ++++ b/tests/sphinx_indented_code/conf.py +@@ -1,11 +1,9 @@ + + # -*- coding: utf-8 -*- + +-from recommonmark.parser import CommonMarkParser +- + templates_path = ['_templates'] +-source_suffix = '.md' +-source_parsers = { '.md': CommonMarkParser } ++extensions = ['recommonmark'] ++source_suffix = { '.md': 'markdown' } + master_doc = 'index' + project = u'sphinxproj' + copyright = u'2015, rtfd' +diff --git a/tests/sphinx_nested_header_block/conf.py b/tests/sphinx_nested_header_block/conf.py +index 6b0140e..ddfafd5 100644 +--- a/tests/sphinx_nested_header_block/conf.py ++++ b/tests/sphinx_nested_header_block/conf.py +@@ -1,11 +1,9 @@ + + # -*- coding: utf-8 -*- + +-from recommonmark.parser import CommonMarkParser +- + templates_path = ['_templates'] +-source_suffix = '.md' +-source_parsers = { '.md': CommonMarkParser } ++extensions = ['recommonmark'] ++source_suffix = { '.md': 'markdown' } + master_doc = 'index' + project = u'sphinxproj' + copyright = u'2015, rtfd' +diff --git a/tests/sphinx_xref/conf.py b/tests/sphinx_xref/conf.py +index 443a026..acd840b 100644 +--- a/tests/sphinx_xref/conf.py ++++ b/tests/sphinx_xref/conf.py +@@ -1,14 +1,11 @@ + + # -*- coding: utf-8 -*- + +-from recommonmark.parser import CommonMarkParser +- +-extensions = 'sphinx.ext.autosectionlabel'] ++extensions = ['sphinx.ext.autosectionlabel', 'recommonmark'] + autosectionlabel_prefix_document = True + + templates_path = ['_templates'] +-source_suffix = '.md' +-source_parsers = { '.md': CommonMarkParser } ++source_suffix = { '.md': 'markdown' } + master_doc = 'index' + project = u'sphinxproj' + copyright = u'2015, rtfd' diff --git a/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-2.patch b/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-2.patch new file mode 100644 index 000000000000..75d9b1c961cb --- /dev/null +++ b/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-2.patch @@ -0,0 +1,63 @@ +https://bugs.gentoo.org/723468#c5 +By Anon Emuss <abuslbea@centurylink.net> +---- +Fix minor HTML changes in tests + +Newer versions of sphinx now put <p> tags around various elements. +Update the test_lists and CustomExtensionTests tests to expect that. +Also do not expect a class="first" for the Contents in the +CustomExtensionTests. + +Tested and appears to work with sphinx-2.4.4 and sphinx-3.2.1. + +diff --git a/tests/test_sphinx.py b/tests/test_sphinx.py +index 06078b1..8f4acb2 100644 +--- a/tests/test_sphinx.py ++++ b/tests/test_sphinx.py +@@ -142,17 +142,17 @@ class GenericTests(SphinxIntegrationTests): + output = self.read_file('index.html') + self.assertIn( + ('<ul class="simple">\n' +- '<li>Item A</li>\n' +- '<li>Item B</li>\n' +- '<li>Item C</li>\n' ++ '<li><p>Item A</p></li>\n' ++ '<li><p>Item B</p></li>\n' ++ '<li><p>Item C</p></li>\n' + '</ul>'), + output + ) + self.assertIn( + ('<ol class="simple">\n' +- '<li>Item 1</li>\n' +- '<li>Item 2</li>\n' +- '<li>Item 3</li>\n' ++ '<li><p>Item 1</p></li>\n' ++ '<li><p>Item 2</p></li>\n' ++ '<li><p>Item 3</p></li>\n' + '</ol>'), + output + ) +@@ -207,16 +207,17 @@ class CustomExtensionTests(SphinxIntegrationTests): + def test_integration(self): + output = self.read_file('index.html') + self.assertIn('<table ', output) +- self.assertIn('<th class="head">abc</th>', output) +- self.assertIn('<th class="head">data</th>', output) ++ self.assertIn('<th class="head"><p>abc</p></th>', output) ++ self.assertIn('<th class="head"><p>data</p></th>', output) + self.assertIn('</table>', output) + + self.assertIn( + ('<div class="contents topic" id="contents">\n' +- '<p class="topic-title first">Contents</p>\n' ++ '<p class="topic-title">Contents</p>\n' + '<ul class="simple">\n' +- '<li><a class="reference internal" href="#header" id="id1">Header</a><ul>\n' +- '<li><a class="reference internal" href="#header-2" id="id2">Header 2</a></li>\n' ++ '<li><p><a class="reference internal" href="#header" id="id1">Header</a></p>\n' ++ '<ul>\n' ++ '<li><p><a class="reference internal" href="#header-2" id="id2">Header 2</a></p></li>\n' + '</ul>\n</li>\n</ul>'), + output + ) diff --git a/dev-python/recommonmark/metadata.xml b/dev-python/recommonmark/metadata.xml new file mode 100644 index 000000000000..5e95859f915a --- /dev/null +++ b/dev-python/recommonmark/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>python@gentoo.org</email> + <name>Python</name> + </maintainer> + <stabilize-allarches /> + <origin>baldeagleos-repo</origin> +</pkgmetadata> diff --git a/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild b/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild new file mode 100644 index 000000000000..6b080e5280a8 --- /dev/null +++ b/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{13..14} ) +inherit distutils-r1 + +DESCRIPTION="Python docutils-compatibility bridge to CommonMark" +HOMEPAGE=" + https://recommonmark.readthedocs.io/ + https://github.com/readthedocs/recommonmark/ + https://pypi.org/project/recommonmark/ +" +SRC_URI=" + https://github.com/readthedocs/recommonmark/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" + +RDEPEND=" + >=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}] + >=dev-python/docutils-0.14[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] +" + +PATCHES=( + "${FILESDIR}/${PN}-0.6.0-sphinx3-1.patch" + "${FILESDIR}/${PN}-0.6.0-sphinx3-2.patch" +) + +# These tests are sensitive to Sphinx formatting changes and they will never +# get fixed because upstream has archived the project in favor of myst_parser. +# Bug #866009 +EPYTEST_DESELECT=( + "tests/test_sphinx.py::GenericTests::test_headings" + "tests/test_sphinx.py::CustomExtensionTests::test_integration" +) + +distutils_enable_tests pytest |
