[gentoo-commits] repo/gentoo:master commit in: dev-db/mycli/

[Arthur Zamarin]

commit:     bbb5a7c4846019466e561e8db6150bfdc57f62ea
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 10:28:58 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 10:28:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbb5a7c4

dev-db/mycli: enable py3.10, add missing test deps

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-db/mycli/mycli-1.24.1.ebuild | 24 +++++++++++++++---------
 dev-db/mycli/mycli-9999.ebuild   | 27 ++++++++++++++++-----------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/dev-db/mycli/mycli-1.24.1.ebuild b/dev-db/mycli/mycli-1.24.1.ebuild
index b42d206497b..d20a269fdd0 100644
--- a/dev-db/mycli/mycli-1.24.1.ebuild
+++ b/dev-db/mycli/mycli-1.24.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_SINGLE_IMPL=yes
 inherit distutils-r1
 
@@ -35,17 +35,23 @@ RDEPEND="
                <dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
                ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
 "
+BDEPEND="
+       test? ( $(python_gen_cond_dep '
+               dev-python/mock[${PYTHON_USEDEP}]
+               dev-python/paramiko[${PYTHON_USEDEP}]
+       ') )
+"
 distutils_enable_tests pytest
 
 PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
 
 python_test() {
-       epytest --capture=sys \
-               --doctest-modules \
-               --doctest-ignore-import-errors \
-               --ignore=setup.py \
-               --ignore=mycli/magic.py \
-               --ignore=mycli/packages/parseutils.py \
-               --ignore=test/features \
-               --ignore=mycli/packages/paramiko_stub/__init__.py
+       local EPYTEST_IGNORE=(
+               setup.py
+               mycli/magic.py
+               mycli/packages/parseutils.py
+               test/features
+               mycli/packages/paramiko_stub/__init__.py
+       )
+       epytest --capture=sys --doctest-modules --doctest-ignore-import-errors
 }

diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild
index 544eb50eeb4..272605957e9 100644
--- a/dev-db/mycli/mycli-9999.ebuild
+++ b/dev-db/mycli/mycli-9999.ebuild
@@ -3,18 +3,16 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_SINGLE_IMPL=yes
 EGIT_REPO_URI="https://github.com/dbcli/mycli.git";
 inherit distutils-r1 git-r3
 
 DESCRIPTION="CLI for MySQL Database with auto-completion and syntax 
highlighting"
 HOMEPAGE="https://www.mycli.net";
-SRC_URI=""
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="ssh"
 
 RDEPEND="
@@ -33,17 +31,24 @@ RDEPEND="
                <dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
                ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
 "
+BDEPEND="
+       test? ( $(python_gen_cond_dep '
+               dev-python/mock[${PYTHON_USEDEP}]
+               dev-python/paramiko[${PYTHON_USEDEP}]
+       ') )
+"
+
 distutils_enable_tests pytest
 
 PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
 
 python_test() {
-       epytest --capture=sys \
-               --doctest-modules \
-               --doctest-ignore-import-errors \
-               --ignore=setup.py \
-               --ignore=mycli/magic.py \
-               --ignore=mycli/packages/parseutils.py \
-               --ignore=test/features \
-               --ignore=mycli/packages/paramiko_stub/__init__.py
+       local EPYTEST_IGNORE=(
+               setup.py
+               mycli/magic.py
+               mycli/packages/parseutils.py
+               test/features
+               mycli/packages/paramiko_stub/__init__.py
+       )
+       epytest --capture=sys --doctest-modules --doctest-ignore-import-errors
 }