Merge e2938dbd79 into 0ce9ffc464

3 weeks ago · 10e8e3b462
parent 0ce9ffc464 e2938dbd79
commit 10e8e3b462
5 changed files with 74 additions and 53 deletions
--- a/.ci/azure-pipelines-steps.yml
+++ b/.ci/azure-pipelines-steps.yml
@ -12,6 +12,7 @@ steps:
  inputs:
    githubToken: '$(GITHUB_PYVER_TOKEN)'
    versionSpec: '$(python.version)'
+    allowUnstable: $(python.allowUnstable)'
  condition: ne(variables['python.version'], '')

 - script: |
--- a/.ci/azure-pipelines.yml
+++ b/.ci/azure-pipelines.yml
@ -28,21 +28,24 @@ jobs:
    matrix:
      Mito_27:
        tox.env: py27-mode_mitogen
-      Mito_312:
-        python.version: '3.12'
-        tox.env: py312-mode_mitogen
+      Mito_313:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_mitogen

      Loc_27_210:
        tox.env: py27-mode_localhost-ansible2.10
-      Loc_312_9:
-        python.version: '3.12'
-        tox.env: py312-mode_localhost-ansible9
+      Loc_313_9:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_localhost-ansible9

      Van_27_210:
        tox.env: py27-mode_localhost-ansible2.10-strategy_linear
-      Van_312_9:
-        python.version: '3.12'
-        tox.env: py312-mode_localhost-ansible9-strategy_linear
+      Van_313_9:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_localhost-ansible9-strategy_linear

 - job: Linux
  pool:
@ -99,33 +102,42 @@ jobs:
        python.version: '3.6'
        tox.env: py36-mode_mitogen-distro_ubuntu2004

-      Mito_312_centos6:
-        python.version: '3.12'
-        tox.env: py312-mode_mitogen-distro_centos6
-      Mito_312_centos7:
-        python.version: '3.12'
-        tox.env: py312-mode_mitogen-distro_centos7
-      Mito_312_centos8:
-        python.version: '3.12'
-        tox.env: py312-mode_mitogen-distro_centos8
-      Mito_312_debian9:
-        python.version: '3.12'
-        tox.env: py312-mode_mitogen-distro_debian9
-      Mito_312_debian10:
-        python.version: '3.12'
-        tox.env: py312-mode_mitogen-distro_debian10
-      Mito_312_debian11:
-        python.version: '3.12'
-        tox.env: py312-mode_mitogen-distro_debian11
-      Mito_312_ubuntu1604:
-        python.version: '3.12'
-        tox.env: py312-mode_mitogen-distro_ubuntu1604
-      Mito_312_ubuntu1804:
-        python.version: '3.12'
-        tox.env: py312-mode_mitogen-distro_ubuntu1804
-      Mito_312_ubuntu2004:
-        python.version: '3.12'
-        tox.env: py312-mode_mitogen-distro_ubuntu2004
+      Mito_313_centos6:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_mitogen-distro_centos6
+      Mito_313_centos7:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_mitogen-distro_centos7
+      Mito_313_centos8:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_mitogen-distro_centos8
+      Mito_313_debian9:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_mitogen-distro_debian9
+      Mito_313_debian10:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_mitogen-distro_debian10
+      Mito_313_debian11:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_mitogen-distro_debian11
+      Mito_313_ubuntu1604:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_mitogen-distro_ubuntu1604
+      Mito_313_ubuntu1804:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_mitogen-distro_ubuntu1804
+      Mito_313_ubuntu2004:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_mitogen-distro_ubuntu2004

      Ans_27_210:
        tox.env: py27-mode_ansible-ansible2.10
@ -151,15 +163,19 @@ jobs:
      Ans_311_5:
        python.version: '3.11'
        tox.env: py311-mode_ansible-ansible5
-      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
-      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
+      Ans_313_6:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_ansible-ansible6
+      Ans_313_7:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_ansible-ansible7
+      Ans_313_8:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_ansible-ansible8
+      Ans_313_9:
+        python.version: '3.13.0-beta.1'
+        python.allUnstable: true
+        tox.env: py313-mode_ansible-ansible9
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@ -25,6 +25,7 @@ Unreleased
 * :gh:issue:`957` Fix Ansible exception when executing against 10s of hosts
  "ValueError: filedescriptor out of range in select()"
 * :gh:issue:`1066` Support Ansible `ansible_host_key_checking` & `ansible_ssh_host_key_checking`
+* :gh:issue:`1073` Python 3.13 support


 v0.3.7 (2024-04-08)
--- a/setup.py
+++ b/setup.py
@ -79,6 +79,7 @@ setup(
        'Programming Language :: Python :: 3.10',
        'Programming Language :: Python :: 3.11',
        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
        'Programming Language :: Python :: Implementation :: CPython',
        'Topic :: System :: Distributed Computing',
        'Topic :: System :: Systems Administration',
--- a/tox.ini
+++ b/tox.ini
@ -3,7 +3,8 @@
 #
 #   sudo add-apt-repository ppa:deadsnakes/ppa
 #   sudo apt update
-#   sudo apt install awscli lib{ldap2,sasl2,ssl}-dev python{2,2.7,3} python3.{6..13}{,-venv} python-is-python3 sshpass tox
+#   sudo apt install awscli lib{ldap2,sasl2,ssl}-dev sshpass tox
+#   sudo apt install python{2,2.7}{,-dev} python{3,3.{6..13}}{,-dev,-venv} python-is-python3

 # Py   A cntrllr  A target   coverage   Django     Jinja2     pip        psutil     pytest     tox        virtualenv
 # ==== ========== ========== ========== ========== ========== ========== ========== ========== ========== ==========
@ -57,10 +58,10 @@ 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,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},
+    py{313}-mode_ansible-ansible{6,7,8,9},
+    py{27,36,313}-mode_mitogen-distro_centos{6,7,8},
+    py{27,36,313}-mode_mitogen-distro_debian{9,10,11},
+    py{27,36,313}-mode_mitogen-distro_ubuntu{1604,1804,2004},
    report,

 [testenv]
@ -75,6 +76,7 @@ basepython =
    py310: python3.10
    py311: python3.11
    py312: python3.12
+    py313: python3.13
 deps =
    -r{toxinidir}/tests/requirements.txt
    mode_ansible: -r{toxinidir}/tests/ansible/requirements.txt