commit:     ec37dd3a7ffc0197883d37a88eee8b002e994b3c
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Mon Nov 17 08:34:55 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 22 11:47:55 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec37dd3a

dev-db/mycli: add 1.41.1

Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44650
Closes: https://github.com/gentoo/gentoo/pull/44650
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/mycli/Manifest            |   1 +
 dev-db/mycli/mycli-1.41.1.ebuild | 146 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 147 insertions(+)

diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 84d81b15d1cc..a2a27612c842 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,2 +1,3 @@
 DIST mycli-1.37.0.tar.gz 300531 BLAKE2B 
f081db26a2f1ab9c804384525abd0e98dee308da0075691433fe323e6638757cec689cd4ab559b5ffafc5d953b961785b8f8a3b380eaeae5bad47c29165fc9c6
 SHA512 
6e6cb2c4de7a6b5b9d758806abd076fdfbd2ea9bdc89d0096948a6dad68b55d4378d5687eac950409b0eb8e6d67ae6da0851b749129ed63b701496427a33dbb2
 DIST mycli-1.41.0.tar.gz 309802 BLAKE2B 
17f5ab136fe92800828d9d1ab83e5d3a9be1993117787df0c1fa40b0fcdcfeb46c199732a4f20aac934cba53ccf0847869eda45e12c17c408b17ef76287ae1c7
 SHA512 
df9fd92228860e2fc81b50d8eb4dbeb5db4d06313b9231e4344473e682ff9379eb72f66750709bbe616b995161eef72aa6fbb6f2b235fe59d20a8b93a17418be
+DIST mycli-1.41.1.tar.gz 309858 BLAKE2B 
84fe6f17a8230950dbef5329e37565bb71d8b606604d2c305cf5f087af5b30a5d41675f430ca00d11ba8cde0cd575ba8dd8f939be4b4f7ea9c53f1bd26f71a43
 SHA512 
3078846589c97cced82f8894145df5ee1da91b462e734965a2a44a51cb52afbbb20983f17b7e2ffaded4c90cd1a2f4ac2e38787444fd428cd060064187597e1f

diff --git a/dev-db/mycli/mycli-1.41.1.ebuild b/dev-db/mycli/mycli-1.41.1.ebuild
new file mode 100644
index 000000000000..1dfe9e0a524f
--- /dev/null
+++ b/dev-db/mycli/mycli-1.41.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CLI for MySQL Database with auto-completion and syntax 
highlighting"
+HOMEPAGE="
+       https://www.mycli.net/
+       https://github.com/dbcli/mycli/
+       https://pypi.org/project/mycli/
+"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+# optional llm unpackaged
+IUSE="ssh"
+
+RDEPEND="
+       $(python_gen_cond_dep '
+               >=dev-python/cli-helpers-2.7.0[${PYTHON_USEDEP}]
+               >=dev-python/click-8.3.1[${PYTHON_USEDEP}]
+               >=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
+               >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+               >=dev-python/prompt-toolkit-3.0.6[${PYTHON_USEDEP}]
+               <dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}]
+               dev-python/pycryptodome[${PYTHON_USEDEP}]
+               >=dev-python/pyfzf-0.3.1[${PYTHON_USEDEP}]
+               >=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+               >=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+               >=dev-python/pyperclip-1.8.1[${PYTHON_USEDEP}]
+               =dev-python/sqlglot-27*[${PYTHON_USEDEP}]
+               <dev-python/sqlparse-0.6.0[${PYTHON_USEDEP}]
+               >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+               ssh? (
+                       dev-python/paramiko[${PYTHON_USEDEP}]
+                       dev-python/sshtunnel[${PYTHON_USEDEP}]
+               )
+       ')
+"
+BDEPEND="
+       $(python_gen_cond_dep '
+               dev-python/setuptools-scm[${PYTHON_USEDEP}]
+               test? (
+                       dev-db/mysql[server]
+                       dev-python/paramiko[${PYTHON_USEDEP}]
+                       dev-python/sshtunnel[${PYTHON_USEDEP}]
+               )
+       ')
+"
+
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_prepare_all() {
+       # no coverage please
+       sed -e 's/import coverage ; coverage.process_startup(); //' \
+               -i test/features/environment.py test/features/steps/wrappers.py 
|| die
+
+       # convert from pycryptodomex to pycryptodome
+       sed -e 's/pycryptodomex/pycryptodome/' -i pyproject.toml || die
+       sed -e 's/from Cryptodome/from Crypto/' -i mycli/config.py || die
+
+       distutils-r1_python_prepare_all
+}
+
+src_test() {
+       # test/utils.py
+       local -x PYTEST_PASSWORD="notsecure"
+       local -x PYTEST_HOST="127.0.0.1"
+       local -x PYTEST_PORT="43307"
+       local -x PYTEST_CHARSET="utf8"
+
+       einfo "Creating mysql test instance ..."
+       mysqld \
+               --no-defaults \
+               --initialize-insecure \
+               --basedir="${EPREFIX}/usr" \
+               --datadir="${T}/mysql" 1>"${T}"/mysql_install.log || die
+
+       einfo "Starting mysql test instance ..."
+       mysqld \
+               --no-defaults \
+               --character-set-server="${PYTEST_CHARSET}" \
+               --bind-address="${PYTEST_HOST}" \
+               --port="${PYTEST_PORT}" \
+               --pid-file="${T}/mysqld.pid" \
+               --socket="${T}/mysqld.sock" \
+               --datadir="${T}/mysql" 1>"${T}/mysqld.log" 2>&1 &
+
+       # wait for it to start
+       local i
+       for (( i = 0; i < 10; i++ )); do
+               [[ -S ${T}/mysqld.sock ]] && break
+               sleep 1
+       done
+       [[ ! -S ${T}/mysqld.sock ]] && die "mysqld failed to start"
+
+       einfo "Configuring test mysql instance ..."
+       mysql \
+               -u root \
+               --socket="${T}/mysqld.sock" \
+               -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 
'${PYTEST_PASSWORD}'" \
+               || die "Failed to change mysql user password"
+
+       EPYTEST_IGNORE=(
+               # Requires unpackaged llm
+               test/test_llm_special.py
+               # AssertionError: assert 8 in [4, 5, 6, 7]
+               # Per upstream: "...it is a flaky test at best."
+               # 
https://github.com/dbcli/mycli/commit/3d08910a366d4505a40e8a0fb36c210330723f18
+               test/test_special_iocommands.py::test_watch_query_full
+       )
+
+       local failures=()
+       nonfatal distutils-r1_src_test
+       [[ ${?} -ne 0 ]] && failures+=( pytest )
+
+       # Behave is in a weird situation, last non beta version is 7 years old 
and doesnt build well with modern setuptools.
+       # Mycli doesnt pass tests with prereleases of updated behave.
+       #behave --jobs=$(get_makeopts_jobs)  --summary --verbose test/features
+       #[[ ${?} -ne 0 ]] && failures+=( behave )
+
+       einfo "Stopping mysql test instance ..."
+       pkill -F "${T}"/mysqld.pid || die
+       # wait for it to stop
+       local i
+       for (( i = 0; i < 10; i++ )); do
+               [[ -S ${T}/mysqld.sock ]] || break
+               sleep 1
+       done
+
+       rm -rf "${T}"/mysql || die
+
+       if [[ ${#failures[@]} -gt 0 ]]; then
+               die "Tests failed: ${failures}"
+       fi
+}

Reply via email to