commit: ad8abf44b957d6f248019f00402315b0db48a0d4 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Tue Jul 7 18:19:33 2020 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Tue Jul 7 18:19:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad8abf44
dev-db/mycli: Version bump for 1.21.1 Signed-off-by: Brian Evans <grknight <AT> gentoo.org> dev-db/mycli/Manifest | 1 + .../files/mycli-1.21.1-fix-test-install.patch | 12 ++++++ dev-db/mycli/mycli-1.21.1.ebuild | 50 ++++++++++++++++++++++ dev-db/mycli/mycli-9999.ebuild | 34 +++++++++------ 4 files changed, 84 insertions(+), 13 deletions(-) diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest index 1f52fa521b6..ede73337f21 100644 --- a/dev-db/mycli/Manifest +++ b/dev-db/mycli/Manifest @@ -1 +1,2 @@ DIST mycli-1.20.1.tar.gz 265264 BLAKE2B d00b1713132609b0a5ec6e8b78785fdab5c6b4db5937bc0b9bc69ddde90ad3dc75aeb99ccf6b5e7fe5e78e9bf4819f03fb454825e5182bc5d2c44356032343d1 SHA512 82ee642b2a4c158b0e2ea275941650125e15004ec1c70b2ab90ae0825090efccb4910a14fd46bcdf795a74adba5689b46de5668447308de63d1cbbbe2e6b0e9d +DIST mycli-1.21.1.tar.gz 267646 BLAKE2B e0678974949ae219236b89fbe9ebdacfee9c1efc8f92853c937150dbb841680664432e9f5c79181545df8b3321480cf784e45a83139351cc93256d26dcdd66f0 SHA512 beb3888ff8abc2a79e591516d7f0f76d0c18f186bd0dca3b4aadcf93b3045de53ac7f135553ad509273c85ea364e81df5dcadf9eacf1dbef8ceff7345aa5ed6d diff --git a/dev-db/mycli/files/mycli-1.21.1-fix-test-install.patch b/dev-db/mycli/files/mycli-1.21.1-fix-test-install.patch new file mode 100644 index 00000000000..bee5934e5dd --- /dev/null +++ b/dev-db/mycli/files/mycli-1.21.1-fix-test-install.patch @@ -0,0 +1,12 @@ +--- a/setup.py 2020-04-19 16:15:15.000000000 -0400 ++++ b/setup.py 2020-07-07 13:56:25.181039348 -0400 +@@ -85,7 +85,8 @@ + author_email='[email protected]', + version=version, + url='http://mycli.net', +- packages=find_packages(), ++ packages=find_packages("mycli"), ++ package_dir={"": "mycli"}, + package_data={'mycli': ['myclirc', 'AUTHORS', 'SPONSORS']}, + description=description, + long_description=description, diff --git a/dev-db/mycli/mycli-1.21.1.ebuild b/dev-db/mycli/mycli-1.21.1.ebuild new file mode 100644 index 00000000000..ab785d36904 --- /dev/null +++ b/dev-db/mycli/mycli-1.21.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_6,3_7} ) +DISTUTILS_SINGLE_IMPL=yes +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 + +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${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-1.1.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/click-7.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/configobj-5.0.6[${PYTHON_MULTI_USEDEP}] + >=dev-python/cryptography-1.0.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/prompt_toolkit-3.0.0[${PYTHON_MULTI_USEDEP}] + <dev-python/prompt_toolkit-4.0.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/pygments-2.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/pymysql-0.9.2[${PYTHON_MULTI_USEDEP}] + >=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}] + <dev-python/sqlparse-0.4.0[${PYTHON_MULTI_USEDEP}] + ssh? ( dev-python/paramiko[${PYTHON_MULTI_USEDEP}] )') +" +DEPEND="${RDEPEND}" + +distutils_enable_tests pytest + +BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_MULTI_USEDEP}]') )" + +PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" ) + +python_test() { + pytest --capture=sys \ + --showlocals \ + --doctest-modules \ + --doctest-ignore-import-errors \ + --ignore=setup.py \ + --ignore=mycli/magic.py \ + --ignore=mycli/packages/parseutils.py \ + --ignore=test/features +} diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild index 829a69b455b..9fcacbc962c 100644 --- a/dev-db/mycli/mycli-9999.ebuild +++ b/dev-db/mycli/mycli-9999.ebuild @@ -4,6 +4,8 @@ EAPI=7 PYTHON_COMPAT=( python{3_6,3_7} ) +DISTUTILS_SINGLE_IMPL=yes +DISTUTILS_USE_SETUPTOOLS=rdepend EGIT_REPO_URI="https://github.com/dbcli/mycli.git"; inherit distutils-r1 git-r3 @@ -16,20 +18,26 @@ SLOT="0" KEYWORDS="" IUSE="ssh test" RESTRICT="!test? ( test )" -RDEPEND=" - >=dev-python/cli_helpers-1.1.0[${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-2.0.6[${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.4.0[${PYTHON_USEDEP}] - ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] ) +RDEPEND="$(python_gen_cond_dep ' + >=dev-python/cli_helpers-1.1.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/click-7.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/configobj-5.0.6[${PYTHON_MULTI_USEDEP}] + >=dev-python/cryptography-1.0.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/prompt_toolkit-3.0.0[${PYTHON_MULTI_USEDEP}] + <dev-python/prompt_toolkit-4.0.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/pygments-2.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/pymysql-0.9.2[${PYTHON_MULTI_USEDEP}] + >=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}] + <dev-python/sqlparse-0.4.0[${PYTHON_MULTI_USEDEP}] + ssh? ( dev-python/paramiko[${PYTHON_MULTI_USEDEP}] )') " -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] ${RDEPEND} )" +DEPEND="${RDEPEND}" + +distutils_enable_tests pytest + +BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_MULTI_USEDEP}]') )" + +PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" ) python_test() { pytest --capture=sys \
