Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-core/
Date: Fri, 17 Mar 2023 15:29:23
Message-Id: 1679066949.99dec4c03bc998e7ebbde2689f90b092d743e4a1.mgorny@gentoo
1 commit: 99dec4c03bc998e7ebbde2689f90b092d743e4a1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 17 12:07:54 2023 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 17 15:29:09 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99dec4c0
7
8 app-admin/ansible-core: Sync the live ebuild
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 app-admin/ansible-core/ansible-core-9999.ebuild | 23 ++++++++---------------
13 1 file changed, 8 insertions(+), 15 deletions(-)
14
15 diff --git a/app-admin/ansible-core/ansible-core-9999.ebuild b/app-admin/ansible-core/ansible-core-9999.ebuild
16 index 1cec22f8239c..e9f5858cfb36 100644
17 --- a/app-admin/ansible-core/ansible-core-9999.ebuild
18 +++ b/app-admin/ansible-core/ansible-core-9999.ebuild
19 @@ -5,6 +5,7 @@ EAPI=8
20
21 PYTHON_COMPAT=( python3_{10..11} )
22 DISTUTILS_USE_SETUPTOOLS=bdepend
23 +PYPI_NO_NORMALIZE=1
24
25 inherit distutils-r1
26
27 @@ -16,13 +17,12 @@ if [[ ${PV} == 9999 ]]; then
28 EGIT_REPO_URI="https://github.com/ansible/ansible.git"
29 EGIT_BRANCH="devel"
30 else
31 - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
32 + inherit pypi
33 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
34 fi
35
36 LICENSE="GPL-3"
37 SLOT="0"
38 -IUSE="test"
39 RESTRICT="test"
40
41 RDEPEND="
42 @@ -35,27 +35,20 @@ RDEPEND="
43 dev-python/netaddr[${PYTHON_USEDEP}]
44 dev-python/pexpect[${PYTHON_USEDEP}]
45 >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
46 - <dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
47 + <dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}]
48 net-misc/sshpass
49 virtual/ssh
50 "
51 -DEPEND="
52 +BDEPEND="
53 >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
54 test? (
55 - ${RDEPEND}
56 - dev-python/bcrypt[${PYTHON_USEDEP}]
57 - dev-python/nose[${PYTHON_USEDEP}]
58 - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
59 - dev-python/passlib[${PYTHON_USEDEP}]
60 - dev-python/coverage[${PYTHON_USEDEP}]
61 - dev-vcs/git
62 + dev-python/botocore[${PYTHON_USEDEP}]
63 + dev-python/pytz[${PYTHON_USEDEP}]
64 )"
65
66 +distutils_enable_tests pytest
67 +
68 python_compile() {
69 export ANSIBLE_SKIP_CONFLICT_CHECK=1
70 distutils-r1_python_compile
71 }
72 -
73 -python_test() {
74 - nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
75 -}