1 |
commit: 5c6373f480026fd01f163ee8fbb7c69d54a761cf |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 11 22:59:33 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 11 23:00:32 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c6373f4 |
7 |
|
8 |
dev-python/pytest-salt: fix RDEPEND for salt/tornado |
9 |
|
10 |
Closes: https://bugs.gentoo.org/740882 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
...-salt-2020.1.27-r2.ebuild => pytest-salt-2020.1.27-r3.ebuild} | 9 +++++++-- |
14 |
1 file changed, 7 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/dev-python/pytest-salt/pytest-salt-2020.1.27-r2.ebuild b/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild |
17 |
similarity index 81% |
18 |
rename from dev-python/pytest-salt/pytest-salt-2020.1.27-r2.ebuild |
19 |
rename to dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild |
20 |
index f3d2b483cbd..8258e36ca9e 100644 |
21 |
--- a/dev-python/pytest-salt/pytest-salt-2020.1.27-r2.ebuild |
22 |
+++ b/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild |
23 |
@@ -17,22 +17,27 @@ SLOT="0" |
24 |
KEYWORDS="amd64 ~arm x86" |
25 |
IUSE="test" |
26 |
|
27 |
+# See bug #740882 re salt/tornado dependency |
28 |
RDEPEND=" |
29 |
>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}] |
30 |
>=dev-python/psutil-4.2.0[${PYTHON_USEDEP}] |
31 |
dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
32 |
dev-python/pytest-tempdir[${PYTHON_USEDEP}] |
33 |
dev-python/msgpack[${PYTHON_USEDEP}] |
34 |
+ || ( |
35 |
+ app-admin/salt[${PYTHON_USEDEP}] |
36 |
+ www-servers/tornado[${PYTHON_USEDEP}] |
37 |
+ ) |
38 |
" |
39 |
#BDEPEND=" |
40 |
-# test? ( app-admin/salt[${PYTHON_USEDEP}] ) |
41 |
+# test? ( app-admin/salt[${PYTHON_USEDEP}] ) |
42 |
#" |
43 |
|
44 |
PATCHES=( |
45 |
"${FILESDIR}/${PN}-2020.1.27-r2.patch" |
46 |
) |
47 |
|
48 |
-# tests need network access |
49 |
+# Tests need network access |
50 |
RESTRICT="test" |
51 |
|
52 |
distutils_enable_tests pytest |