Skip to content

Commit e8ad12e

Browse files
committed
Ansible 6 support
fixes #929
1 parent 195b400 commit e8ad12e

File tree

5 files changed

+11
-3
lines changed

5 files changed

+11
-3
lines changed

.ci/azure-pipelines.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,3 +202,6 @@ jobs:
202202
Ans_310_5:
203203
python.version: '3.10'
204204
tox.env: py310-mode_ansible-ansible5
205+
Ans_310_6:
206+
python.version: '3.10'
207+
tox.env: py310-mode_ansible-ansible6

ansible_mitogen/loaders.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949

5050
ANSIBLE_VERSION_MIN = (2, 10)
51-
ANSIBLE_VERSION_MAX = (2, 12)
51+
ANSIBLE_VERSION_MAX = (2, 13)
5252

5353
NEW_VERSION_MSG = (
5454
"Your Ansible version (%s) is too recent. The most recent version\n"

docs/ansible_detailed.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Noteworthy Differences
148148
* Mitogen 0.2.x supports Ansible 2.3-2.9; with Python 2.6, 2.7, or 3.6.
149149
Mitogen 0.3.1+ supports
150150
- Ansible 2.10, 3, and 4; with Python 2.7, or 3.6-3.10
151-
- Ansible 5; with Python 3.8-3.10
151+
- Ansible 5 and 6; with Python 3.8-3.10
152152
Verify your installation is running one of these versions by checking
153153
``ansible --version`` output.
154154

docs/changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ To avail of fixes in an unreleased version, please download a ZIP file
2020
v0.3.4.dev0
2121
-------------------
2222

23+
* :gh:issue:`929` Support Ansible 6 and ansible-core 2.13
2324
* :gh:issue:`832` Fix runtime error when using the ansible.builtin.dnf module multiple times
2425

2526
v0.3.3 (2022-06-03)

tox.ini

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
# ansible == 3.* ansible-base ~= 2.10.0
2727
# ansible == 4.* ansible-core ~= 2.11.0
2828
# ansible == 5.* ansible-core ~= 2.12.0
29+
# ansible == 6.* ansible-core ~= 2.13.0
2930

3031
# pip --no-python-version-warning
3132
# pip --disable-pip-version-check
@@ -36,7 +37,7 @@
3637
envlist =
3738
init,
3839
py{27,36}-mode_ansible-ansible{2.10,3,4},
39-
py{310}-mode_ansible-ansible{2.10,3,4,5},
40+
py{310}-mode_ansible-ansible{2.10,3,4,5,6},
4041
py{27,36,310}-mode_mitogen-distro_centos{6,7,8},
4142
py{27,36,310}-mode_mitogen-distro_debian{9,10,11},
4243
py{27,36,310}-mode_mitogen-distro_ubuntu{1604,1804,2004},
@@ -61,6 +62,7 @@ deps =
6162
ansible3: ansible==3.4.0
6263
ansible4: ansible==4.10.0
6364
ansible5: ansible==5.8.0
65+
ansible6: ansible==6.0.0
6466
install_command =
6567
python -m pip --no-python-version-warning --disable-pip-version-check install {opts} {packages}
6668
commands_pre =
@@ -97,6 +99,8 @@ setenv =
9799
distro_ubuntu1804: DISTRO=ubuntu1804
98100
distro_ubuntu2004: DISTRO=ubuntu2004
99101
# Note the plural, only applicable to MODE=ansible
102+
# Ansible 6 (ansible-core 2.13) requires Python >= 2.7 or >= 3.5 on targets
103+
ansible6: DISTROS=centos7 centos8 debian9 debian10 debian11 ubuntu1604 ubuntu1804 ubuntu2004
100104
distros_centos: DISTROS=centos6 centos7 centos8
101105
distros_centos5: DISTROS=centos5
102106
distros_centos6: DISTROS=centos6

0 commit comments

Comments
 (0)