Add support for py3.10

Related: ansible/ansible#74658 Related: ansible/ansible#74660 Related: ansible/team-devtools#6
ssbarnea · Oct 5, 2021 · 13b79ad · 13b79ad
1 parent af402d0
commit 13b79ad
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 13 deletions.
diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-        - 3.9
+        - "3.9"
         os:
         - ubuntu-20.04
         env:
@@ -105,10 +105,11 @@ jobs:
       matrix:
         python-version:
         # keep list sorted as it determines UI order too
-        - 3.6
-        - 3.7
-        - 3.8
-        - 3.9
+        - "3.6"
+        - "3.7"
+        - "3.8"
+        - "3.9"
+        - "3.10"
         # NOTE: Installing ansible under 3.10-dev is currently not
         # NOTE: possible because compiling cffi explodes.
         os:
@@ -119,24 +120,28 @@ jobs:
         include:
         - tox_env: py36
           os: ubuntu-20.04
-          python-version: 3.6
+          python-version: "3.6"
         - tox_env: py37
           os: ubuntu-20.04
-          python-version: 3.7
+          python-version: "3.7"
         - tox_env: py38
           os: ubuntu-20.04
-          python-version: 3.8
+          python-version: "3.8"
           devel: true
         - tox_env: py39
           os: ubuntu-20.04
-          python-version: 3.9
+          python-version: "3.9"
+          devel: true
+        - tox_env: py310
+          os: ubuntu-20.04
+          python-version: "3.10"
           devel: true
         - tox_env: py36
           os: macOS-latest
-          python-version: 3.6
-        - tox_env: py38
+          python-version: "3.6"
+        - tox_env: py310
           os: macOS-latest
-          python-version: 3.8
+          python-version: "3.10"
 
     env:
       TOX_PARALLEL_NO_SPINNER: 1

diff --git a/pytest.ini b/pytest.ini
@@ -27,6 +27,14 @@ filterwarnings =
 
     # Ansible originated
     ignore:The _yaml extension module is now located at yaml._yaml and its location is subject to change:DeprecationWarning:
+    # Ansible insides on py310:
+    ignore:_SixMetaPathImporter:ImportWarning
+    ignore:_AnsibleCollectionFinder:ImportWarning
+    ignore:_AnsibleCollectionRootPkgLoader:ImportWarning
+    ignore:_AnsibleCollectionNSPkgLoader.exec_module:ImportWarning
+    ignore:_AnsibleCollectionPkgLoader.exec_module:ImportWarning
+    ignore:_AnsiblePathHookFinder.find_spec:ImportWarning
+    ignore:The distutils package is deprecated and slated for removal:DeprecationWarning
 
     # TODO: delete the following ignores once Ansible that we support gets rid of `imp`
     # Ref: https://github.com/ansible-community/ansible-lint/pull/734

diff --git a/setup.cfg b/setup.cfg
@@ -39,6 +39,8 @@ classifiers =
   Programming Language :: Python :: 3.6
   Programming Language :: Python :: 3.7
   Programming Language :: Python :: 3.8
+  Programming Language :: Python :: 3.9
+  Programming Language :: Python :: 3.10
   Programming Language :: Python :: Implementation
   Programming Language :: Python :: Implementation :: CPython
   Programming Language :: Python :: Implementation :: Jython

diff --git a/tox.ini b/tox.ini
@@ -3,7 +3,7 @@ minversion = 3.16.1
 envlist =
   lint
   packaging
-  py{39,38}-{core,ansible29,devel}
+  py{310,39,38}-{core,ansible29,devel}
   py{37,36}-{core,ansible29}
 isolated_build = true
 requires =