From dfc3c7d5164355d1d873a86a1c601bd127fe7a09 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 13 Dec 2022 08:57:37 -0700 Subject: [PATCH] ansible_mitogen: Add Ansible 7 support Co-authored-by: Orion Poplawski --- .ci/azure-pipelines.yml | 11 +++++++---- ansible_mitogen/loaders.py | 2 +- docs/ansible_detailed.rst | 2 +- docs/changelog.rst | 2 ++ docs/contributors.rst | 1 + tox.ini | 6 ++++-- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index 3630f83e..468fd5bf 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -27,15 +27,15 @@ jobs: Loc_27_210: tox.env: py27-mode_localhost-ansible2.10 - Loc_312_6: + Loc_312_7: python.version: '3.12' - tox.env: py312-mode_localhost-ansible6 + tox.env: py312-mode_localhost-ansible7 Van_27_210: tox.env: py27-mode_localhost-ansible2.10-strategy_linear - Van_312_6: + Van_312_7: python.version: '3.12' - tox.env: py312-mode_localhost-ansible6-strategy_linear + tox.env: py312-mode_localhost-ansible7-strategy_linear - job: Linux pool: @@ -147,3 +147,6 @@ jobs: Ans_312_6: python.version: '3.12' tox.env: py312-mode_ansible-ansible6 + Ans_312_7: + python.version: '3.12' + tox.env: py312-mode_ansible-ansible7 diff --git a/ansible_mitogen/loaders.py b/ansible_mitogen/loaders.py index 1f4d8fc6..754ec6cb 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, 13) +ANSIBLE_VERSION_MAX = (2, 14) 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 cb83aa71..09db3cd8 100644 --- a/docs/ansible_detailed.rst +++ b/docs/ansible_detailed.rst @@ -150,7 +150,7 @@ Noteworthy Differences - Ansible 2.10, 3, and 4; with Python 2.7, or 3.6-3.11 - Ansible 5; with Python 3.8-3.11 - - Ansible 6; with Python 3.8-3.12 + - Ansible 6 and 7; with Python 3.8-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 1087604e..f5fd7a4b 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -20,6 +20,8 @@ To avail of fixes in an unreleased version, please download a ZIP file Unreleased ---------- +* :gh:issue:`974` Support Ansible 7 + v0.3.5 (2024-03-17) ------------------- diff --git a/docs/contributors.rst b/docs/contributors.rst index 61a9eb1b..207e4d7b 100644 --- a/docs/contributors.rst +++ b/docs/contributors.rst @@ -130,6 +130,7 @@ sponsorship and outstanding future-thinking of its early adopters.
  • luto
  • Mayeu a.k.a Matthieu Maury
  • @nathanhruby
    • +
  • Orion Poplawski
  • Ramy
  • Scott Vokes
  • Tom Eichhorn
    • diff --git a/tox.ini b/tox.ini index 4a1772a0..f2b46413 100644 --- a/tox.ini +++ b/tox.ini @@ -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}, + py{312}-mode_ansible-ansible{6,7}, 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}, @@ -83,6 +83,7 @@ deps = ansible4: ansible==4.10.0 ansible5: ansible~=5.0 ansible6: ansible~=6.0 + ansible7: ansible~=7.0 install_command = python -m pip --no-python-version-warning --disable-pip-version-check install {opts} {packages} commands_pre = @@ -118,8 +119,9 @@ setenv = distro_ubuntu1804: DISTRO=ubuntu1804 distro_ubuntu2004: DISTRO=ubuntu2004 # Note the plural, only applicable to MODE=ansible - # Ansible 6 (ansible-core 2.13) requires Python >= 2.7 or >= 3.5 on targets + # Ansible >= 6 (ansible-core >= 2.13) 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 distros_centos: DISTROS=centos6 centos7 centos8 distros_centos5: DISTROS=centos5 distros_centos6: DISTROS=centos6