dev-python/automat: patch out m2r usage

This avoids the hard blocker with m2r (which is now last-rited) which
makes upgrades a lot smoother (no need for manual intervention).

Bug: https://bugs.gentoo.org/847532
Bug: https://bugs.gentoo.org/848900
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2022-06-14 20:20:25 +01:00
parent e92180dd99
commit 5f2a7ebaa5
2 changed files with 26 additions and 1 deletions

View File

@@ -25,12 +25,12 @@ RDEPEND="
"
BDEPEND="
dev-python/setuptools_scm[${PYTHON_USEDEP}]
!!dev-python/m2r
"
PATCHES=(
"${FILESDIR}/test_visualize-twisted-import-errors.patch"
"${FILESDIR}/${P}-py311.patch"
"${FILESDIR}/${PN}-20.2.0-ignore-m2r.patch"
)
distutils_enable_tests pytest

View File

@@ -0,0 +1,25 @@
Completely ignore m2r (which is now last-rited) so we can drop the hard-blocker
which makes world upgrades a pain (installed m2r would break b/c of newer
mistune, and would break automat build).
https://github.com/miyakogi/m2r/issues/66
https://bugs.gentoo.org/848900
https://bugs.gentoo.org/847532
--- a/setup.py
+++ b/setup.py
@@ -4,13 +4,8 @@ Setup file for automat
from setuptools import setup, find_packages
-try:
- from m2r import parse_from_file
- long_description = parse_from_file('README.md')
-except(IOError, ImportError):
- print("\n\n!!! m2r not found, long_description is bad, don't upload this to PyPI !!!\n\n")
- import io
- long_description = io.open('README.md', encoding="utf-8").read()
+import io
+long_description = io.open('README.md', encoding="utf-8").read()
setup(
name='Automat',