gentoo auto-resync : 28:07:2023 - 22:38:00

5 files changed, 36 insertions, 85 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 7c0020e0bd7b..86499e6f711f 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 79e9b6b04aea..347333ed0c0b 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,5 +1,4 @@
 AUX mycli-1.21.1-fix-test-install.patch 456 BLAKE2B 3f4eafe405a2151b1b2897ac60347a5fdce45747f927a40367943ad78ef96753ad106bdefe516b76946fa509b17a31d9423cf0b5cf311e79174ce5e4f6320428 SHA512 90c53b12baee1339cdc629615a021ff0290e6350f3358491cd163c4405d49be02340a56a73475623a6b49877cef53e3c5bd9aa93897aa91769a402e8f4c0b88a
 DIST mycli-1.26.1.gh.tar.gz 279221 BLAKE2B 2bb178110b5aba3e381541a7892cc1d8bed8e41c499d1dc36fa39435805a118536de44bf21b2ca2652afefcd15f8bc86ed77de876f703740e796444ff8cea6b0 SHA512 bce9def37718444f2445ed3a7ad91c54df4cc3dc5d207a4a2e0fc72eb27b75fca687958241fc40f5494efcdf9e4bae251f3cf94c13b967dd922d5ff653348c77
-EBUILD mycli-1.26.1.ebuild 1683 BLAKE2B 8beca1b176bba3db36816e79b7ba40c8edb7465c4c217c4ad18c67c6ed8cbdf06f11b9b6d720954f98960c27f104b1876f9420f528d1f8c4689612d4b0b9e088 SHA512 3de41e9d7517e31387619cf20647072f536da610caa7748a2851203f9cfdb32fddff5cb16df4436f1592e6538a53871a158da1adbc2f7c7325c77900fe5355b8
-EBUILD mycli-9999.ebuild 1632 BLAKE2B c4d91d2d635674af01a31a61c371e851dc3b538be2745c2c127a59b30c96282347ca7d9726e6e251ab2ddc6c3fb685cbd8adae7486e6fc20a6019652fa8d6c03 SHA512 1cc719bafabd5e2b7e4f85ac3605e0bccd4e3ee659883db46f9260050922fbb9065cef5850c6c9e107a32cc41bab3de2f259efa7d968df5c41dc8963d50de117
-MISC metadata.xml 371 BLAKE2B 1cfb3b7159e4981c81e6760abb532d5b63b23249624040576d2c411357116180d96548641830a1189043ee082dd2c62b7d2889a294e7458fe37e3c7ea95f34db SHA512 c6b79c416d79d9acf77c9dda796729e23f80ba8b292566ba989414025434884f8155ad2ee4b2a4a0f3b683e2f15275774898e3865c3711eb5c942a294ec77ec3
+EBUILD mycli-1.26.1-r1.ebuild 2050 BLAKE2B 402b90263dacf222b8a769245c94ef35ac9bb54c1a75667281abb582e4204cb778f2eec016778faf4ded29ce63027cf2d6a4235b28c708e84c2f488237521429 SHA512 c296de49a78fa7b5f7dcd8ce0bc05f1ac8c0d9318ea0a64b194d77c0d74b229075ed09bef923efc705433e3149203ab334e45f9381e0f441ab4631baa498da99
+MISC metadata.xml 626 BLAKE2B 754538c528392717c6f22b1988d8d901458eaa053d90fdcc6a96c30408a6f9e661bbd8da4dfd57e8edc71e715028e493d7c3b3994ae7b337556881294c771095 SHA512 1d08dd18cdc6e1ab95e80b5234ed6f64c6b9f69346c86bde183c8bbee1940fd54c6a958b03e9b142dceb6d7e61eae2d47c3c5012a9e368a4ec6617c7539729d5
diff --git a/dev-db/mycli/metadata.xml b/dev-db/mycli/metadata.xml
index 29ada13e241e..3d240850c878 100644
--- a/dev-db/mycli/metadata.xml
+++ b/dev-db/mycli/metadata.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>parona@protonmail.com</email>
+		<name>Alfred Wingate</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">dbcli/mycli</remote-id>
 		<remote-id type="pypi">mycli</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 	<use>
 		<flag name="ssh">Add support for connection over SSH tunnel</flag>
 	</use>
diff --git a/dev-db/mycli/mycli-1.26.1.ebuild b/dev-db/mycli/mycli-1.26.1-r1.ebuild
index 437959885397..1f0f11d9838d 100644
--- a/dev-db/mycli/mycli-1.26.1.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
-}
diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild
deleted file mode 100644
index a7e9fc8f8841..000000000000
--- a/dev-db/mycli/mycli-9999.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 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_{9..11} )
-
-inherit distutils-r1 git-r3
-
-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/
-"
-EGIT_REPO_URI="https://github.com/dbcli/mycli.git"
-
-LICENSE="BSD MIT"
-SLOT="0"
-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/pyaes[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-		dev-python/pyperclip[${PYTHON_USEDEP}]
-		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
-		<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() {
-	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
-}