From 4fe228ee9aa3b9b825d54ace549a5517e153e8bd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 9 Jun 2024 00:08:14 +0100 Subject: gentoo auto-resync : 09:06:2024 - 00:08:13 --- dev-python/myst-parser/Manifest | 8 +-- .../files/myst-parser-2.0.0-sphinx-7.3.patch | 81 ---------------------- dev-python/myst-parser/myst-parser-2.0.0-r1.ebuild | 71 ------------------- dev-python/myst-parser/myst-parser-3.0.0.ebuild | 58 ---------------- dev-python/myst-parser/myst-parser-3.0.1.ebuild | 2 +- 5 files changed, 2 insertions(+), 218 deletions(-) delete mode 100644 dev-python/myst-parser/files/myst-parser-2.0.0-sphinx-7.3.patch delete mode 100644 dev-python/myst-parser/myst-parser-2.0.0-r1.ebuild delete mode 100644 dev-python/myst-parser/myst-parser-3.0.0.ebuild (limited to 'dev-python/myst-parser') diff --git a/dev-python/myst-parser/Manifest b/dev-python/myst-parser/Manifest index fbc2c35f0c47..361306777fab 100644 --- a/dev-python/myst-parser/Manifest +++ b/dev-python/myst-parser/Manifest @@ -1,9 +1,3 @@ -AUX myst-parser-2.0.0-sphinx-7.3.patch 3382 BLAKE2B a2a576863f5441533f96095da6c2d0b15cc87a839475d2604e08988bf00275976986b9733a6e1b4037ee8a5a4b64b2f86304532072c92cf00d0943969b32bdaf SHA512 55002133202bc0f8f1f3e13e4fa4b8146369e06c996b54cade49250daa26fa80998bfaba7b1ff0f502196967bc322e863aa8e2194577624f14dd2e0711d9e709 -DIST MyST-Parser-2.0.0.gh.tar.gz 815453 BLAKE2B 8f5dd823c3c79d843b45a7a4819d5677b51a12f78db2c1ce9700eb6faa8c4f0bc167fb1d8cd947e89ffab85aec947ab527b67dc73ef4db97a393f700a4331738 SHA512 c47bdd773565e93c4714d318a70f9a8adab1be6e2a63c23175667fc4afb5da4d66b84e11176782c8202e9fd68883e74d444911ddfb0b91356c2ba07fa65f7ea4 -DIST MyST-Parser-3.0.0.gh.tar.gz 823619 BLAKE2B 95d8f1c5a2ab442225079495fa4ebf3619d554bd3e6f469f6215a2458bad4fde3ca555dca591ac20537026765a8fda8a4fa9d85ca592251d9b699bba90782c59 SHA512 a91abfcb99b9b53cee6877d469c32a95c69c2fcbc9cfe6217451c0995e49dec89fe98cd5a1a5e408845985a10fbc21d4e3d8063f1d7a3d96781cb44352b3e806 DIST MyST-Parser-3.0.1.gh.tar.gz 823769 BLAKE2B 2b8d84dc6a61abd7d168317bb80632172f01f109751b40c108828d0b2fb9c8536da32ff6c873cd3bc20b70c2613b25167eeee999ea9f2d59dfc914ac231120b2 SHA512 4c2b08e9307685c2ef02eee89becba1d6e9f67eba7ab6d5bb5b425f232ac0922bb31cb5df5d60a5ed0846a9314475bcd2cb073a0101f514455c2598340e4b441 -DIST myst-parser-2.0.0-sphinx-7.2.patch 22443 BLAKE2B 994f0b2c419832e61cb006b1b45c01274970900bdcfcef3422d5331e88962a46884afbf5b27b5cb98ed349a426444ca4ff21810526cc34eae4cf074102f7b3de SHA512 707b2a69c81352d2900c91088ca137f6455e0006b0e7c798b6f03b9f0cac85489c27db662f5e6ab6e2cd52e10f1594aa54d5c6821c07c110ad138d0cf129ac65 -EBUILD myst-parser-2.0.0-r1.ebuild 1975 BLAKE2B 8f3c91fae114855d5948e2568226c1d07b2cb6c36783d4c1f6d6b58c83ba4af05dfdd3a9d10bf8f2e1cf5ea041f4069835d56e890c88c3017aba29b66a088df4 SHA512 5001437c17a09091af41b82384acfbc5356aef2aaff79de5c2c4f3074d2cc6b2b1c201c7b97619aa720b3c767326f2d2067418a30bd0ff2624f391decfce02bc -EBUILD myst-parser-3.0.0.ebuild 1611 BLAKE2B c46b9cd763f8602ce1353dd92fe112b37bbde59445f073d295f00cbd2a23a30ee771c019439a23ce9bdc69c0ee4fe009ed75df0c0de1d6fac39ddbd85acc21c7 SHA512 5af3d66993163c3d34353d156b770e2e3b4b811e86ba865d614010fe116ef9a0461733324ddab0cf593efb83e54c72fb436ef4a9bcec07173a6ebab3d8c899b0 -EBUILD myst-parser-3.0.1.ebuild 1611 BLAKE2B c136c088db9b0e18c56b365f0deb0b0b3df54e5fc29d17939574759819d21b3679581f907247e282393bf585cf427b0abd3836be2fa631f8d172d76ebbb1d406 SHA512 f9c43d315f267c2bc72f70debcf299eeab10d43af15713fc6dc856ba5a62413de21791e012599704b94cb9539d80e75dbc43d841be8eb392bb86279a81050986 +EBUILD myst-parser-3.0.1.ebuild 1603 BLAKE2B 6b156252ba34680ba7904b74d3585d359f4100644b3619a98463d65a6f96cd3233f8a5942b7d8130f30a95e57a4a9f56803087e7097be11f3c40fb325021d922 SHA512 a97582261f75cd02cf8877a1f9638ab51a319136e891537dd56b87bd02465b5f7443161d0f8940e2fff5fb9c8d747455ceb7110d1ba2c0b718101b2bfdca606c MISC metadata.xml 406 BLAKE2B d8a974be3dd4fef4800958dcb1eef3124dc8e3ec49e6678d0db7d6096ef290019aa025796c4f7c38bc11b750d1667ba97d4429b64e7271009da707cd945e113f SHA512 acdc27a39e068c487306002342b9c0c5910d61ed34a7b62878272054ea458d5aad46fe24095a52666ed77ffcb6e703687cc83de0c9e2cef395a1decf9003d918 diff --git a/dev-python/myst-parser/files/myst-parser-2.0.0-sphinx-7.3.patch b/dev-python/myst-parser/files/myst-parser-2.0.0-sphinx-7.3.patch deleted file mode 100644 index 3b9d9551311e..000000000000 --- a/dev-python/myst-parser/files/myst-parser-2.0.0-sphinx-7.3.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/tests/test_renderers/test_fixtures_sphinx.py b/tests/test_renderers/test_fixtures_sphinx.py -index bd0f85eb..65aba83a 100644 ---- a/tests/test_renderers/test_fixtures_sphinx.py -+++ b/tests/test_renderers/test_fixtures_sphinx.py -@@ -22,7 +22,12 @@ - def test_syntax_elements(file_params, sphinx_doctree_no_tr: CreateDoctree): - sphinx_doctree_no_tr.set_conf({"extensions": ["myst_parser"]}) - result = sphinx_doctree_no_tr(file_params.content, "index.md") -- file_params.assert_expected(result.pformat("index"), rstrip_lines=True) -+ pformat = result.pformat("index") -+ # changed in docutils 0.20.1 -+ pformat = pformat.replace( -+ '', '' -+ ) -+ file_params.assert_expected(pformat, rstrip_lines=True) - - - @pytest.mark.param_file(FIXTURE_PATH / "sphinx_link_resolution.md") -@@ -100,6 +105,8 @@ def test_sphinx_directives(file_params, sphinx_doctree_no_tr: CreateDoctree): - ), - "", - ) -+ # changed in sphinx 7.3 -+ pformat = pformat.replace("Added in version 0.2", "New in version 0.2") - - file_params.assert_expected(pformat, rstrip_lines=True) - -diff --git a/tests/test_sphinx/sourcedirs/heading_slug_func/conf.py b/tests/test_sphinx/sourcedirs/heading_slug_func/conf.py -index f6612b4c..33aed04b 100644 ---- a/tests/test_sphinx/sourcedirs/heading_slug_func/conf.py -+++ b/tests/test_sphinx/sourcedirs/heading_slug_func/conf.py -@@ -2,5 +2,6 @@ - - extensions = ["myst_parser"] - exclude_patterns = ["_build"] -+suppress_warnings = ["config.cache"] - myst_heading_anchors = 2 - myst_heading_slug_func = make_id -diff --git a/tests/test_sphinx/test_sphinx_builds.py b/tests/test_sphinx/test_sphinx_builds.py -index fcc1e463..b4e7c10d 100644 ---- a/tests/test_sphinx/test_sphinx_builds.py -+++ b/tests/test_sphinx/test_sphinx_builds.py -@@ -162,7 +162,12 @@ def test_references_singlehtml( - docname="other/other", - resolve=True, - regress=True, -- replace={"other\\other.md": "other/other.md"}, -+ replace={ -+ "other\\other.md": "other/other.md", -+ # changed in sphinx 7.3 -+ '="#document-index': '="index.html#document-index', -+ '="#document-other': '="index.html#document-other', -+ }, - ) - - get_sphinx_app_output( -@@ -170,7 +175,12 @@ def test_references_singlehtml( - filename="index.html", - buildername="singlehtml", - regress_html=True, -- replace={"Permalink to this headline": "Permalink to this heading"}, -+ replace={ -+ "Permalink to this headline": "Permalink to this heading", -+ # changed in sphinx 7.3 -+ '="#document-index': '="index.html#document-index', -+ '="#document-other': '="index.html#document-other', -+ }, - ) - - -@@ -469,7 +479,9 @@ def test_gettext_html( - regress_ext=".html", - replace={ - # upstream bug https://github.com/sphinx-doc/sphinx/issues/11689 -- '"Permalink to this heading"': '"Lien permanent vers cette rubrique"' -+ '"Permalink to this heading"': '"Lien permanent vers cette rubrique"', -+ # which was fixed to a different translation in sphinx 7.3 -+ '"Lien vers cette rubrique"': '"Lien permanent vers cette rubrique"', - }, - ) - diff --git a/dev-python/myst-parser/myst-parser-2.0.0-r1.ebuild b/dev-python/myst-parser/myst-parser-2.0.0-r1.ebuild deleted file mode 100644 index 4257951ca376..000000000000 --- a/dev-python/myst-parser/myst-parser-2.0.0-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit distutils-r1 - -MY_P=MyST-Parser-${PV} -DESCRIPTION="Extended commonmark compliant parser, with bridges to Sphinx" -HOMEPAGE=" - https://github.com/executablebooks/MyST-Parser/ - https://pypi.org/project/myst-parser/ -" -SRC_URI=" - https://github.com/executablebooks/MyST-Parser/archive/v${PV}.tar.gz - -> ${MY_P}.gh.tar.gz - https://github.com/executablebooks/MyST-Parser/pull/811.patch - -> ${P}-sphinx-7.2.patch -" -S=${WORKDIR}/${MY_P} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - =dev-python/markdown-it-py-3.0[${PYTHON_USEDEP}] - =dev-python/mdit-py-plugins-0.4[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - =dev-python/sphinx-6[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] - =dev-python/linkify-it-py-2.0.0[${PYTHON_USEDEP}] - dev-python/pytest-regressions[${PYTHON_USEDEP}] - dev-python/pytest-param-files[${PYTHON_USEDEP}] - >=dev-python/sphinx-7.2.6[${PYTHON_USEDEP}] - dev-python/sphinx-pytest[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - # https://github.com/executablebooks/MyST-Parser/pull/811 - "${DISTDIR}/${P}-sphinx-7.2.patch" - ) - if has_version '>=dev-python/sphinx-7.3'; then - PATCHES+=( - # https://github.com/executablebooks/MyST-Parser/pull/915 - "${FILESDIR}/${P}-sphinx-7.3.patch" - ) - fi - - default - - # unpin docutils - sed -i -e '/docutils/s:,<[0-9.]*::' pyproject.toml || die -} diff --git a/dev-python/myst-parser/myst-parser-3.0.0.ebuild b/dev-python/myst-parser/myst-parser-3.0.0.ebuild deleted file mode 100644 index eba761f257cc..000000000000 --- a/dev-python/myst-parser/myst-parser-3.0.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit distutils-r1 - -MY_P=MyST-Parser-${PV} -DESCRIPTION="Extended commonmark compliant parser, with bridges to Sphinx" -HOMEPAGE=" - https://github.com/executablebooks/MyST-Parser/ - https://pypi.org/project/myst-parser/ -" -SRC_URI=" - https://github.com/executablebooks/MyST-Parser/archive/v${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -RDEPEND=" - >=dev-python/docutils-0.18[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - =dev-python/markdown-it-py-3.0[${PYTHON_USEDEP}] - =dev-python/mdit-py-plugins-0.4[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - =dev-python/sphinx-6[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] - =dev-python/linkify-it-py-2.0.0[${PYTHON_USEDEP}] - dev-python/pytest-regressions[${PYTHON_USEDEP}] - dev-python/pytest-param-files[${PYTHON_USEDEP}] - >=dev-python/sphinx-7.3[${PYTHON_USEDEP}] - dev-python/sphinx-pytest[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - default - - # unpin docutils - sed -i -e '/docutils/s:,<[0-9.]*::' pyproject.toml || die -} diff --git a/dev-python/myst-parser/myst-parser-3.0.1.ebuild b/dev-python/myst-parser/myst-parser-3.0.1.ebuild index ac62012096ef..64c23a7291cd 100644 --- a/dev-python/myst-parser/myst-parser-3.0.1.ebuild +++ b/dev-python/myst-parser/myst-parser-3.0.1.ebuild @@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND=" >=dev-python/docutils-0.18[${PYTHON_USEDEP}] -- cgit v1.2.3