Skip to content

Commit

Permalink
chore(deps): update ansible-core requirement from <2.16,>=2.15 to >=2…
Browse files Browse the repository at this point in the history
….15,<2.17 (#164)

Updates the requirements on
[ansible-core](https://github.com/ansible/ansible) to permit the latest
version.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/ansible/ansible/releases">ansible-core's
releases</a>.</em></p>
<blockquote>
<h2>v2.16.0</h2>
<h1>Changelog</h1>
<p>See the <a
href="https://github.com/ansible/ansible/blob/v2.16.0/changelogs/CHANGELOG-v2.16.rst">full
changelog</a> for the changes included in this release.</p>
<h1>Release Artifacts</h1>
<ul>
<li>Built Distribution: <a
href="https://files.pythonhosted.org/packages/2f/ab/6357d8f3c17fec8c49c6119968292c14d3383c631bd900f6dc5593eb64a9/ansible_core-2.16.0-py3-none-any.whl">ansible_core-2.16.0-py3-none-any.whl</a>
- 2247142 bytes
<ul>
<li>6b4870ac65b708953e1509b8ccca669731a17d2beadabd8208c9f90d189058ca
(SHA256)</li>
</ul>
</li>
<li>Source Distribution: <a
href="https://files.pythonhosted.org/packages/6c/12/c0aec5705ee693986f62755fd3abbaf42ff3963980e42add4a2986ad79b0/ansible-core-2.16.0.tar.gz">ansible-core-2.16.0.tar.gz</a>
- 3155083 bytes
<ul>
<li>b4a6c60fbc2f51e3ae68ec733c931ef957a04d7c8c92aa39242990b0f8adf149
(SHA256)</li>
</ul>
</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/ansible/ansible/commit/704ee70943c3e3ab7aeaa448f208a94220c02e6b"><code>704ee70</code></a>
New release v2.16.0 (<a
href="https://redirect.github.com/ansible/ansible/issues/82141">#82141</a>)</li>
<li><a
href="https://github.com/ansible/ansible/commit/a13df22c028dccab03ed35ed54b827565784f049"><code>a13df22</code></a>
remove args passthru on role runme tests that use grep (<a
href="https://redirect.github.com/ansible/ansible/issues/82060">#82060</a>)
(<a
href="https://redirect.github.com/ansible/ansible/issues/82061">#82061</a>)</li>
<li><a
href="https://github.com/ansible/ansible/commit/31aac52a72aa9664ba464bcd3b8ba6c73a7f9b89"><code>31aac52</code></a>
[stable-2.16] ansible-test - Fix parsing of cgroup entries</li>
<li><a
href="https://github.com/ansible/ansible/commit/00f74e03b24d7853cd0008d1efba526a283ae691"><code>00f74e0</code></a>
[stable-2.16] Fix subversion integration test (<a
href="https://redirect.github.com/ansible/ansible/issues/82029">#82029</a>)</li>
<li><a
href="https://github.com/ansible/ansible/commit/f6fb5b2031bd418e5255036c40c480a14abfb159"><code>f6fb5b2</code></a>
Update Ansible release version to v2.16.0rc1.post0. (<a
href="https://redirect.github.com/ansible/ansible/issues/81987">#81987</a>)</li>
<li><a
href="https://github.com/ansible/ansible/commit/2223709bddc3b8481dc2cc6924b0498a3ebf5de9"><code>2223709</code></a>
New release v2.16.0rc1 (<a
href="https://redirect.github.com/ansible/ansible/issues/81986">#81986</a>)</li>
<li><a
href="https://github.com/ansible/ansible/commit/33248690fe8d8622a85a7bdf2a03521d965fd083"><code>3324869</code></a>
ansible-test - Update base/default containers (<a
href="https://redirect.github.com/ansible/ansible/issues/81956">#81956</a>)</li>
<li><a
href="https://github.com/ansible/ansible/commit/f9dfd28cffb53408477f0b97df1e97d4c0c19071"><code>f9dfd28</code></a>
[stable-2.16] Update default test container Python to 3.12 and support
for Py...</li>
<li><a
href="https://github.com/ansible/ansible/commit/9c91e578d0eb07fd5d591b66345dc82b6d35f0d5"><code>9c91e57</code></a>
[stable-2.16] run_once: unnotify hosts on handlers that are not run (<a
href="https://redirect.github.com/ansible/ansible/issues/81667">#81667</a>)
...</li>
<li><a
href="https://github.com/ansible/ansible/commit/f3f0e6a0f81d1d63450430b5c583fab22b23a860"><code>f3f0e6a</code></a>
[stable-2.16] Properly template tags in parent blocks (<a
href="https://redirect.github.com/ansible/ansible/issues/81624">#81624</a>)
(<a
href="https://redirect.github.com/ansible/ansible/issues/81921">#81921</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/ansible/ansible/compare/v2.15.0...v2.16.0">compare
view</a></li>
</ul>
</details>
<br />


You can trigger a rebase of this PR by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

> **Note**
> Automatic rebases have been disabled on this pull request as it has
been open for over 30 days.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mohamed El Mouctar HAIDARA <[email protected]>
  • Loading branch information
dependabot[bot] and haidaraM authored Jan 28, 2024
1 parent a91eb74 commit 3f64afe
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
11 changes: 9 additions & 2 deletions ansibleplaybookgrapher/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@
from ansible.cli import CLI
from ansible.errors import AnsibleParserError, AnsibleUndefinedVariable, AnsibleError
from ansible.parsing.yaml.objects import AnsibleUnicode
from ansible.playbook import Playbook, Play
from ansible.playbook import Playbook
from ansible.playbook.block import Block
from ansible.playbook.helpers import load_list_of_blocks
from ansible.playbook.play import Play
from ansible.playbook.role import Role
from ansible.playbook.role_include import IncludeRole
from ansible.playbook.task import Task
from ansible.playbook.task_include import TaskInclude
Expand Down Expand Up @@ -213,13 +215,18 @@ def parse(self, *args, **kwargs) -> PlaybookNode:
# loop through the roles
display.v("Parsing roles...")

for role in play.get_roles():
for role in play.get_roles(): # type: Role
# Don't insert tasks from ``import/include_role``, preventing duplicate graphing
if role.from_include:
continue

# the role object doesn't inherit the tags from the play. So we add it manually.
role.tags = role.tags + play.tags

# More context on this line, see here: https://github.com/ansible/ansible/issues/82310
# This seems to work for now.
role._parent = None

if not role.evaluate_tags(
only_tags=self.tags, skip_tags=self.skip_tags, all_vars=play_vars
):
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ansible-core>=2.15,<2.15.5
ansible-core>=2.15,<2.16.1
graphviz>=0.18,<1
colour<1
lxml<6
Expand Down

0 comments on commit 3f64afe

Please sign in to comment.