From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B6DF21382C5 for ; Mon, 1 Jun 2020 12:28:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98390E08EB; Mon, 1 Jun 2020 12:28:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E5D6E08EB for ; Mon, 1 Jun 2020 12:28:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C626434F1D0 for ; Mon, 1 Jun 2020 12:28:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D60EE1C8 for ; Mon, 1 Jun 2020 12:28:39 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1591014496.073053b178cc8c52c09fa0a3128642b276cee423.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvm-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild X-VCS-Directories: net-analyzer/gvm-tools/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 073053b178cc8c52c09fa0a3128642b276cee423 X-VCS-Branch: master Date: Mon, 1 Jun 2020 12:28:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c2ada169-6dff-47ac-aa13-5890e8c158d4 X-Archives-Hash: 07ffdbb100cd2a809c215d39766a1c11 commit: 073053b178cc8c52c09fa0a3128642b276cee423 Author: Jonas Licht fem tu-ilmenau de> AuthorDate: Mon Apr 20 07:43:26 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Mon Jun 1 12:28:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=073053b1 net-analyzer/gvm-tools: add python3.7 and 3.8 correct dependencies and tests Closes: https://bugs.gentoo.org/718420 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Jonas Licht fem.tu-ilmenau.de> Closes: https://github.com/gentoo/gentoo/pull/15439 Signed-off-by: Joonas Niilola gentoo.org> net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild b/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild index ba3a4b6f72f..d7688b80766 100644 --- a/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild +++ b/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7,8} ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 @@ -17,20 +17,24 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=" - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/pythondialog:0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] + net-analyzer/python-gvm[${PYTHON_USEDEP}] !net-analyzer/openvas-cli !net-analyzer/openvas-tools" DEPEND=" ${RDEPEND}" +distutils_enable_tests unittest + src_prepare() { - distutils-r1_python_prepare_all + distutils-r1_src_prepare # Exlude tests & correct FHS/Gentoo policy paths - sed -i "s/packages=find_packages(),.*/packages=find_packages(exclude=['tests*', 'docs']),/" "$S"/setup.py || die - sed -i -e "s*''*'/usr/share/doc/${P}'*g" "$S"/setup.py || die + sed -i "s/packages=find_packages(),.*/packages=find_packages(exclude=['tests*', 'docs']),/" setup.py || die + sed -i -e "s*''*'/usr/share/doc/${P}'*g" setup.py || die + + # Fixing tests + # Use correct socket path + sed -i "s/\/usr\/local\/var\/run\/gvmd.sock/\/var\/run\/gvmd.sock/g" tests/test_parser.py || die + # ignore help formating + sed -i "s/class HelpFormatting/@unittest.skip('ignoring help formatting')\nclass HelpFormatting/g" tests/test_parser.py || die }