From 41bac7c4a33c31c2bbd3ade4f48e869e029310ff Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Sun, 21 Dec 2025 10:30:32 +0200 Subject: [PATCH] dev-db/mycli: add 1.42.0 Signed-off-by: Alfred Wingate Part-of: https://github.com/gentoo/gentoo/pull/45110 Closes: https://github.com/gentoo/gentoo/pull/45110 Signed-off-by: Sam James --- dev-db/mycli/Manifest | 1 + dev-db/mycli/mycli-1.42.0.ebuild | 146 +++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+) create mode 100644 dev-db/mycli/mycli-1.42.0.ebuild diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest index 0ac556433cac..ef07574be7ae 100644 --- a/dev-db/mycli/Manifest +++ b/dev-db/mycli/Manifest @@ -1 +1,2 @@ DIST mycli-1.41.2.tar.gz 309963 BLAKE2B 002d4acf1d59af017145d42e265546bda13d86ad28f87341aceb860e824310df6ff56e15c21c27f3b4c2e8ed9a9f7c535dd2d0d5f243d60887f91f27cea57bde SHA512 d0c5ee73689209b30bf832c4494bf03123c73f4d818624668456039aff518dd12ef5b29daf0f5b14bb36619e0d2459e5d8971193c8ec17f7d6bcf771f409b153 +DIST mycli-1.42.0.tar.gz 310978 BLAKE2B eda39befdade2f1c842d25ef9a3ce373ff6e7890639246a92520046de41854367b7f51b29c76bf45b51ecdc4bde7fbec0b97001c010ed486d2d101095190af86 SHA512 74ff63058099ce5663d1195acaccba239551dd0fec1095c44e3c94590ad409d132b7b62f86ecfb2acef5f38c865aefe7f4748a3554065857512152bf3c6a1527 diff --git a/dev-db/mycli/mycli-1.42.0.ebuild b/dev-db/mycli/mycli-1.42.0.ebuild new file mode 100644 index 000000000000..1dfe9e0a524f --- /dev/null +++ b/dev-db/mycli/mycli-1.42.0.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/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.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 +}