| 1 |
commit: 5c8a871809894c0f740af2959afe69d8e1c2277d |
| 2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 3 22:48:41 2022 +0000 |
| 4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 3 22:49:14 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c8a8718 |
| 7 |
|
| 8 |
net-analyzer/wapiti: sync live ebuild |
| 9 |
|
| 10 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
| 11 |
|
| 12 |
net-analyzer/wapiti/wapiti-9999.ebuild | 26 +++++++++++++++++--------- |
| 13 |
1 file changed, 17 insertions(+), 9 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild |
| 16 |
index 95c1263aa07a..e9d25d0eedfd 100644 |
| 17 |
--- a/net-analyzer/wapiti/wapiti-9999.ebuild |
| 18 |
+++ b/net-analyzer/wapiti/wapiti-9999.ebuild |
| 19 |
@@ -1,9 +1,9 @@ |
| 20 |
-# Copyright 1999-2021 Gentoo Authors |
| 21 |
+# Copyright 1999-2022 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI=7 |
| 25 |
+EAPI=8 |
| 26 |
|
| 27 |
-PYTHON_COMPAT=( python3_{7..9} ) |
| 28 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 29 |
PYTHON_REQ_USE='xml' |
| 30 |
|
| 31 |
inherit distutils-r1 git-r3 |
| 32 |
@@ -15,25 +15,33 @@ EGIT_REPO_URI="https://git.code.sf.net/p/wapiti/git wapiti-git" |
| 33 |
LICENSE="GPL-2" |
| 34 |
SLOT="0" |
| 35 |
KEYWORDS="" |
| 36 |
-IUSE="kerberos ntlm" |
| 37 |
+# Requires httpx-ntlm (to package) |
| 38 |
+#IUSE="ntlm" |
| 39 |
|
| 40 |
+# httpx requires brotli and socks, so depending on |
| 41 |
+# dev-python/socksio and dev-python/brotlicffi |
| 42 |
RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}] |
| 43 |
+ dev-python/brotlicffi[${PYTHON_USEDEP}] |
| 44 |
+ dev-python/httpx[${PYTHON_USEDEP}] |
| 45 |
dev-python/lxml[${PYTHON_USEDEP}] |
| 46 |
dev-python/mako[${PYTHON_USEDEP}] |
| 47 |
>=dev-python/requests-1.2.3[${PYTHON_USEDEP}] |
| 48 |
+ dev-python/socksio[${PYTHON_USEDEP}] |
| 49 |
dev-python/tld[${PYTHON_USEDEP}] |
| 50 |
- dev-python/yaswfp[${PYTHON_USEDEP}] |
| 51 |
- kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] ) |
| 52 |
- ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )" |
| 53 |
+ dev-python/yaswfp[${PYTHON_USEDEP}]" |
| 54 |
|
| 55 |
distutils_enable_tests --install pytest |
| 56 |
-BDEPEND+=" test? ( dev-python/responses[${PYTHON_USEDEP}] )" |
| 57 |
+# Tests also require unpackaged respx |
| 58 |
+BDEPEND+=" test? ( |
| 59 |
+ dev-python/pytest-asyncio[${PYTHON_USEDEP}] |
| 60 |
+ dev-python/pytest-cov[${PYTHON_USEDEP}] |
| 61 |
+ dev-python/responses[${PYTHON_USEDEP}] |
| 62 |
+ )" |
| 63 |
# Many tests require execution of local test php server |
| 64 |
RESTRICT="test" |
| 65 |
|
| 66 |
python_prepare_all() { |
| 67 |
sed -e 's/"pytest-runner"//' \ |
| 68 |
- -e "/find_packages/s/()/(exclude=['tests*'])/" \ |
| 69 |
-e "/DOC_DIR =/s/wapiti/${PF}/" \ |
| 70 |
-i setup.py || die |
| 71 |
distutils-r1_python_prepare_all |
Archives