| 1 |
commit: 9f3fe052899954cb779b76434f8796f726c716a0 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 26 09:09:54 2021 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 26 09:16:22 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f3fe052 |
| 7 |
|
| 8 |
app-admin/ansible-molecule: remove pyyaml version cap from setup.cfg |
| 9 |
|
| 10 |
I haven't been able to reproduce this on any of my systems (yes, |
| 11 |
including outside Docker this time) but as ago's tinderbox shows, |
| 12 |
version caps from setup.cfg _can_ sometimes be honoured. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/827362 |
| 15 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 16 |
|
| 17 |
app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild | 4 ++++ |
| 18 |
.../files/ansible-molecule-3.5.2_pyyaml6.patch | 11 +++++++++++ |
| 19 |
2 files changed, 15 insertions(+) |
| 20 |
|
| 21 |
diff --git a/app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild b/app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild |
| 22 |
index 21dc93e1196d..90b97115e875 100644 |
| 23 |
--- a/app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild |
| 24 |
+++ b/app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild |
| 25 |
@@ -54,6 +54,10 @@ BDEPEND="$(python_gen_cond_dep ' |
| 26 |
) |
| 27 |
')" |
| 28 |
|
| 29 |
+PATCHES=( |
| 30 |
+ "${FILESDIR}"/${PN}-3.5.2_pyyaml6.patch |
| 31 |
+) |
| 32 |
+ |
| 33 |
S="${WORKDIR}"/${MY_P} |
| 34 |
|
| 35 |
distutils_enable_sphinx docs '>=dev-python/sphinx-notfound-page-0.7.1' '<dev-python/sphinx_ansible_theme-0.9.0' |
| 36 |
|
| 37 |
diff --git a/app-admin/ansible-molecule/files/ansible-molecule-3.5.2_pyyaml6.patch b/app-admin/ansible-molecule/files/ansible-molecule-3.5.2_pyyaml6.patch |
| 38 |
new file mode 100644 |
| 39 |
index 000000000000..80a7d8b7a87d |
| 40 |
--- /dev/null |
| 41 |
+++ b/app-admin/ansible-molecule/files/ansible-molecule-3.5.2_pyyaml6.patch |
| 42 |
@@ -0,0 +1,11 @@ |
| 43 |
+--- a/setup.cfg |
| 44 |
++++ b/setup.cfg |
| 45 |
+@@ -74,7 +74,7 @@ |
| 46 |
+ packaging |
| 47 |
+ paramiko >= 2.5.0, < 3 |
| 48 |
+ pluggy >= 0.7.1, < 2.0 |
| 49 |
+- PyYAML >= 5.1, < 6 |
| 50 |
++ PyYAML >= 5.1 |
| 51 |
+ rich >= 9.5.1 |
| 52 |
+ subprocess-tee >= 0.3.5 |
| 53 |
+ selinux; sys_platform=="linux2" |
Archives