diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index 7e84e779..94919e35 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -34,15 +34,15 @@ jobs: Loc_27_210: tox.env: py27-mode_localhost-ansible2.10 - Loc_312_8: + Loc_312_9: python.version: '3.12' - tox.env: py312-mode_localhost-ansible8 + tox.env: py312-mode_localhost-ansible9 Van_27_210: tox.env: py27-mode_localhost-ansible2.10-strategy_linear - Van_312_8: + Van_312_9: python.version: '3.12' - tox.env: py312-mode_localhost-ansible8-strategy_linear + tox.env: py312-mode_localhost-ansible9-strategy_linear - job: Linux pool: @@ -160,3 +160,6 @@ jobs: Ans_312_8: python.version: '3.12' tox.env: py312-mode_ansible-ansible8 + Ans_312_9: + python.version: '3.12' + tox.env: py312-mode_ansible-ansible9 diff --git a/ansible_mitogen/loaders.py b/ansible_mitogen/loaders.py index 11015430..9729b8a1 100644 --- a/ansible_mitogen/loaders.py +++ b/ansible_mitogen/loaders.py @@ -49,7 +49,7 @@ __all__ = [ ANSIBLE_VERSION_MIN = (2, 10) -ANSIBLE_VERSION_MAX = (2, 15) +ANSIBLE_VERSION_MAX = (2, 16) NEW_VERSION_MSG = ( "Your Ansible version (%s) is too recent. The most recent version\n" diff --git a/docs/ansible_detailed.rst b/docs/ansible_detailed.rst index 1f6ac9a6..b395bc25 100644 --- a/docs/ansible_detailed.rst +++ b/docs/ansible_detailed.rst @@ -165,6 +165,8 @@ Noteworthy Differences +-----------------+-----------------+ | 8 | 3.9 - 3.12 | +-----------------+-----------------+ + | 9 | 3.10 - 3.12 | + +-----------------+-----------------+ Verify your installation is running one of these versions by checking ``ansible --version`` output. diff --git a/docs/changelog.rst b/docs/changelog.rst index 8e979a1a..88d78f96 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -23,6 +23,7 @@ Unreleased * :gh:issue:`1021` Support for Ansible 8 (ansible-core 2.15) * tests: Replace uses of ``include:`` & ``import:``, unsupported in Ansible 9 +* :gh:issue:`1053` Support for Ansible 9 (ansible-core 2.16) v0.3.6 (2024-04-04) diff --git a/tox.ini b/tox.ini index 435d5e65..69639233 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ # 2.5 <= 3.7.1 <= 1.4.22 <= 1.3.1 <= 2.1.3 <= 2.8.7 <= 1.6.1 <= 1.9.1 # 2.6 <= 2.6.20 <= 2.12 <= 4.5.4 <= 1.6.11 <= 2.10.3 <= 9.0.3 <= 5.9.0 <= 3.2.5 <= 2.9.1 <= 15.2.0 # 2.7 <= 2.11 <= 5.5 <= 1.11.29 <= 2.11.3 <= 20 <= 4.6.11 <= 3.28 <= 20.15² -# 3.5 <= 2.11 <= 2.13 <= 5.5 <= 2.2.28 <= 2.11.3 <= 20 <= 5.9.5 <= 6.1.0 <= 3.28 <= 20.15² +# 3.5 <= 2.11 <= 2.15 <= 5.5 <= 2.2.28 <= 2.11.3 <= 20 <= 5.9.5 <= 6.1.0 <= 3.28 <= 20.15² # 3.6 <= 2.11 <= 6.2 <= 3.2.20 <= 3.0.3 <= 21 <= 7.0.1 <= 3.28 <= 20.17² # 3.7 <= 2.12 <= 7.2.7 <= 3.2.20 <= 7.4.4 <= 4.8.0 # 3.8 <= 2.12 @@ -57,7 +57,7 @@ envlist = init, py{27,36}-mode_ansible-ansible{2.10,3,4}, py{311}-mode_ansible-ansible{2.10,3,4,5}, - py{312}-mode_ansible-ansible{6,7,8}, + py{312}-mode_ansible-ansible{6,7,8,9}, py{27,36,312}-mode_mitogen-distro_centos{6,7,8}, py{27,36,312}-mode_mitogen-distro_debian{9,10,11}, py{27,36,312}-mode_mitogen-distro_ubuntu{1604,1804,2004}, @@ -85,6 +85,7 @@ deps = ansible6: ansible~=6.0 ansible7: ansible~=7.0 ansible8: ansible~=8.0 + ansible9: ansible~=9.0 install_command = python -m pip --no-python-version-warning --disable-pip-version-check install {opts} {packages} commands_pre = @@ -120,10 +121,12 @@ setenv = distro_ubuntu1804: DISTRO=ubuntu1804 distro_ubuntu2004: DISTRO=ubuntu2004 # Note the plural, only applicable to MODE=ansible - # Ansible >= 6 (ansible-core >= 2.13) require Python 2.7 or >= 3.5 on targets + # Ansible 6 - 8 (ansible-core 2.13 - 2.15) require Python 2.7 or >= 3.5 on targets ansible6: DISTROS=centos7 centos8 debian9 debian10 debian11 ubuntu1604 ubuntu1804 ubuntu2004 ansible7: DISTROS=centos7 centos8 debian9 debian10 debian11 ubuntu1604 ubuntu1804 ubuntu2004 ansible8: DISTROS=centos7 centos8 debian9 debian10 debian11 ubuntu1604 ubuntu1804 ubuntu2004 + # Ansible >= 9 (ansible-core >= 2.16) require Python 2.7 or >= 3.6 on targets + ansible9: DISTROS=centos7 centos8 debian9 debian10 debian11 ubuntu1804 ubuntu2004 distros_centos: DISTROS=centos6 centos7 centos8 distros_centos5: DISTROS=centos5 distros_centos6: DISTROS=centos6