commit: 67ed3e80d6bd581b0066e2c5e6948fd19edf3a03
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 23 10:28:49 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 23 10:48:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67ed3e80
dev-db/mycli: Enable py3.9
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-db/mycli/mycli-1.22.2_p20201026.ebuild | 43 +++++++++++++++---------------
dev-db/mycli/mycli-9999.ebuild | 43 +++++++++++++++---------------
2 files changed, 42 insertions(+), 44 deletions(-)
diff --git a/dev-db/mycli/mycli-1.22.2_p20201026.ebuild
b/dev-db/mycli/mycli-1.22.2_p20201026.ebuild
index 3d988df6d52..f660a9ed97d 100644
--- a/dev-db/mycli/mycli-1.22.2_p20201026.ebuild
+++ b/dev-db/mycli/mycli-1.22.2_p20201026.ebuild
@@ -1,48 +1,47 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..9} )
DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
MY_PV=$(ver_cut 1-3)
S="${WORKDIR}/${PN}-${MY_PV}"
DESCRIPTION="CLI for MySQL Database with auto-completion and syntax
highlighting"
-
HOMEPAGE="https://www.mycli.net";
SRC_URI="https://github.com/dbcli/${PN}/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+
LICENSE="BSD MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="ssh test"
-RESTRICT="!test? ( test )"
-RDEPEND="$(python_gen_cond_dep '
- >=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
- >=dev-python/click-7.0[${PYTHON_USEDEP}]
- >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
- >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
- <dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
- >=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
- >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
- <dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
- ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
+IUSE="ssh"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ >=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
+ >=dev-python/click-7.0[${PYTHON_USEDEP}]
+ >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
+ <dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+ >=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+ >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+ <dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
+ ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )"
+BDEPEND="
+ test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )"
distutils_enable_tests pytest
PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch"
"${FILESDIR}/mycli-1.22.2_p20201026.patch" )
python_test() {
- pytest --capture=sys \
- --showlocals \
+ epytest --capture=sys \
--doctest-modules \
--doctest-ignore-import-errors \
--ignore=setup.py \
diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild
index bbed0c81515..6c8183acf1e 100644
--- a/dev-db/mycli/mycli-9999.ebuild
+++ b/dev-db/mycli/mycli-9999.ebuild
@@ -1,46 +1,45 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..9} )
DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=rdepend
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 test"
-RESTRICT="!test? ( test )"
-RDEPEND="$(python_gen_cond_dep '
- >=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
- >=dev-python/click-7.0[${PYTHON_USEDEP}]
- >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
- >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
- <dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
- >=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
- >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
- <dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
- ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
+IUSE="ssh"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ >=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
+ >=dev-python/click-7.0[${PYTHON_USEDEP}]
+ >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
+ <dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+ >=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+ >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+ <dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
+ ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )"
+BDEPEND="
+ test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )"
distutils_enable_tests pytest
PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
python_test() {
- pytest --capture=sys \
- --showlocals \
+ epytest --capture=sys \
--doctest-modules \
--doctest-ignore-import-errors \
--ignore=setup.py \
