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

["Michał Górny" <mgorny@gentoo.org>]

commit:     b5d0df65350b69232639af5d8b812fe7fa3cac87
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Thu Jul 27 12:35:39 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 28 15:58:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d0df65

dev-db/mycli: add missing dependency sqlglot

* Fix tests and update other deps as well.

Closes: https://bugs.gentoo.org/911158
Closes: https://bugs.gentoo.org/909833
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-db/mycli/mycli-1.26.1-r1.ebuild | 43 +++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/dev-db/mycli/mycli-1.26.1-r1.ebuild b/dev-db/mycli/mycli-1.26.1-r1.ebuild
index 437959885397..1f0f11d9838d 100644
--- a/dev-db/mycli/mycli-1.26.1-r1.ebuild
+++ b/dev-db/mycli/mycli-1.26.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit distutils-r1
 
@@ -29,14 +29,15 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		>=dev-python/cli_helpers-2.2.1[${PYTHON_USEDEP}]
 		>=dev-python/click-7.0[${PYTHON_USEDEP}]
-		>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+		>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
 		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/prompt-toolkit-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/prompt-toolkit-3.0.6[${PYTHON_USEDEP}]
 		<dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+		>=dev-python/pyaes-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
 		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-		dev-python/pyperclip[${PYTHON_USEDEP}]
+		>=dev-python/pyperclip-1.8.1[${PYTHON_USEDEP}]
+		>=dev-python/sqlglot-5.1.3[${PYTHON_USEDEP}]
 		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
 		<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
 		ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )'
@@ -45,23 +46,29 @@ RDEPEND="
 BDEPEND="
 	test? (
 		$(python_gen_cond_dep '
-			dev-python/mock[${PYTHON_USEDEP}]
 			dev-python/paramiko[${PYTHON_USEDEP}]
 		')
 	)
 "
 
+EPYTEST_DESELECT=(
+	# Fails after a seemingly benign change in sqlparse 0.4.3
+	# https://github.com/dbcli/mycli/issues/1103
+	"test/test_smart_completion_public_schema_only.py::test_auto_escaped_col_names"
+	# Requires a running mysql daemon
+	"test/test_main.py::test_batch"
+	"test/test_main.py::test_execute"
+	"test/test_main.py::test_init"
+	"test/test_special_iocommands.py::test_favorite_query"
+	"test/test_special_iocommands.py::test_watch"
+	"test/test_tabular_output.py::test_sql_output"
+)
+
+EPYTEST_IGNORE=(
+	# Requires a running mysql daemon
+	"test/test_sqlexecute.py"
+)
+
 distutils_enable_tests pytest
 
 PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
-
-python_test() {
-	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
-}