[gentoo-commits] repo/gentoo:master commit in: dev-python/m2r/

[Michał Górny]

commit:     44af788a5903baf81206ba2400af538ba4380341
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sat May 15 20:06:17 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 18 11:39:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44af788a

dev-python/m2r: Bump to python 3.10

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/m2r/m2r-0.2.1.ebuild | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
index cc8e39ecf1c..376b9157320 100644
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ b/dev-python/m2r/m2r-0.2.1.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Markdown to reStructuredText converter"
@@ -23,7 +22,7 @@ RDEPEND="
 BDEPEND="
        test? (
                dev-python/pygments[${PYTHON_USEDEP}]
-               $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 
python2_7) )
+       )
        ${RDEPEND}
 "
 
@@ -44,6 +43,12 @@ python_prepare_all() {
        cp "${FILESDIR}/"test.md tests/ || die
        cp "${FILESDIR}/"test.rst tests/ || die
        cp "${FILESDIR}/"m2r.1 "${S}" || die
+
+       # in python 3.10, the text changed from "optional arguments" to 
"options".
+       # the test matches on the concrete string, make it match on the part 
that is shared
+       # by both versions
+       sed -e 's/optional arguments:/option/' -i tests/test_cli.py || die
+
        distutils-r1_python_prepare_all
 }