| 1 |
commit: bbb5a7c4846019466e561e8db6150bfdc57f62ea |
| 2 |
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 22 10:28:58 2021 +0000 |
| 4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 22 10:28:58 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbb5a7c4 |
| 7 |
|
| 8 |
dev-db/mycli: enable py3.10, add missing test deps |
| 9 |
|
| 10 |
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-db/mycli/mycli-1.24.1.ebuild | 24 +++++++++++++++--------- |
| 13 |
dev-db/mycli/mycli-9999.ebuild | 27 ++++++++++++++++----------- |
| 14 |
2 files changed, 31 insertions(+), 20 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-db/mycli/mycli-1.24.1.ebuild b/dev-db/mycli/mycli-1.24.1.ebuild |
| 17 |
index b42d206497b..d20a269fdd0 100644 |
| 18 |
--- a/dev-db/mycli/mycli-1.24.1.ebuild |
| 19 |
+++ b/dev-db/mycli/mycli-1.24.1.ebuild |
| 20 |
@@ -3,7 +3,7 @@ |
| 21 |
|
| 22 |
EAPI=7 |
| 23 |
|
| 24 |
-PYTHON_COMPAT=( python3_{8..9} ) |
| 25 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 26 |
DISTUTILS_SINGLE_IMPL=yes |
| 27 |
inherit distutils-r1 |
| 28 |
|
| 29 |
@@ -35,17 +35,23 @@ RDEPEND=" |
| 30 |
<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}] |
| 31 |
ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )') |
| 32 |
" |
| 33 |
+BDEPEND=" |
| 34 |
+ test? ( $(python_gen_cond_dep ' |
| 35 |
+ dev-python/mock[${PYTHON_USEDEP}] |
| 36 |
+ dev-python/paramiko[${PYTHON_USEDEP}] |
| 37 |
+ ') ) |
| 38 |
+" |
| 39 |
distutils_enable_tests pytest |
| 40 |
|
| 41 |
PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" ) |
| 42 |
|
| 43 |
python_test() { |
| 44 |
- epytest --capture=sys \ |
| 45 |
- --doctest-modules \ |
| 46 |
- --doctest-ignore-import-errors \ |
| 47 |
- --ignore=setup.py \ |
| 48 |
- --ignore=mycli/magic.py \ |
| 49 |
- --ignore=mycli/packages/parseutils.py \ |
| 50 |
- --ignore=test/features \ |
| 51 |
- --ignore=mycli/packages/paramiko_stub/__init__.py |
| 52 |
+ local EPYTEST_IGNORE=( |
| 53 |
+ setup.py |
| 54 |
+ mycli/magic.py |
| 55 |
+ mycli/packages/parseutils.py |
| 56 |
+ test/features |
| 57 |
+ mycli/packages/paramiko_stub/__init__.py |
| 58 |
+ ) |
| 59 |
+ epytest --capture=sys --doctest-modules --doctest-ignore-import-errors |
| 60 |
} |
| 61 |
|
| 62 |
diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild |
| 63 |
index 544eb50eeb4..272605957e9 100644 |
| 64 |
--- a/dev-db/mycli/mycli-9999.ebuild |
| 65 |
+++ b/dev-db/mycli/mycli-9999.ebuild |
| 66 |
@@ -3,18 +3,16 @@ |
| 67 |
|
| 68 |
EAPI=7 |
| 69 |
|
| 70 |
-PYTHON_COMPAT=( python3_{8..9} ) |
| 71 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 72 |
DISTUTILS_SINGLE_IMPL=yes |
| 73 |
EGIT_REPO_URI="https://github.com/dbcli/mycli.git" |
| 74 |
inherit distutils-r1 git-r3 |
| 75 |
|
| 76 |
DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting" |
| 77 |
HOMEPAGE="https://www.mycli.net" |
| 78 |
-SRC_URI="" |
| 79 |
|
| 80 |
LICENSE="BSD MIT" |
| 81 |
SLOT="0" |
| 82 |
-KEYWORDS="" |
| 83 |
IUSE="ssh" |
| 84 |
|
| 85 |
RDEPEND=" |
| 86 |
@@ -33,17 +31,24 @@ RDEPEND=" |
| 87 |
<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}] |
| 88 |
ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )') |
| 89 |
" |
| 90 |
+BDEPEND=" |
| 91 |
+ test? ( $(python_gen_cond_dep ' |
| 92 |
+ dev-python/mock[${PYTHON_USEDEP}] |
| 93 |
+ dev-python/paramiko[${PYTHON_USEDEP}] |
| 94 |
+ ') ) |
| 95 |
+" |
| 96 |
+ |
| 97 |
distutils_enable_tests pytest |
| 98 |
|
| 99 |
PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" ) |
| 100 |
|
| 101 |
python_test() { |
| 102 |
- epytest --capture=sys \ |
| 103 |
- --doctest-modules \ |
| 104 |
- --doctest-ignore-import-errors \ |
| 105 |
- --ignore=setup.py \ |
| 106 |
- --ignore=mycli/magic.py \ |
| 107 |
- --ignore=mycli/packages/parseutils.py \ |
| 108 |
- --ignore=test/features \ |
| 109 |
- --ignore=mycli/packages/paramiko_stub/__init__.py |
| 110 |
+ local EPYTEST_IGNORE=( |
| 111 |
+ setup.py |
| 112 |
+ mycli/magic.py |
| 113 |
+ mycli/packages/parseutils.py |
| 114 |
+ test/features |
| 115 |
+ mycli/packages/paramiko_stub/__init__.py |
| 116 |
+ ) |
| 117 |
+ epytest --capture=sys --doctest-modules --doctest-ignore-import-errors |
| 118 |
} |
Archives