add python 3.10 to CI & fix other issues (#1402)

* add python 3.10 to CI & fix other issues

* try pypy3.7

1 files changed, 10 insertions, 9 deletions

diff --git a/tox.ini b/tox.ini
index 97cd2d78..a73ffa96 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,14 +1,14 @@
 [tox]
 envlist =
-    {pypy3,3.7,3.8,3.9}-unit
-    {pypy3,3.7,3.8,3.9}-linux-integration-py-amqp
-    {pypy3,3.7,3.8,3.9}-linux-integration-redis
+    {pypy3,3.7,3.8,3.9,3.10}-unit
+    {pypy3,3.7,3.8,3.9,3.10}-linux-integration-py-amqp
+    {pypy3,3.7,3.8,3.9,3.10}-linux-integration-redis
     flake8
     flakeplus
     apicheck
     pydocstyle
 
-requires = tox-docker>=2.0
+requires = tox-docker>=3.0
 
 [testenv]
 sitepackages = False
@@ -17,10 +17,10 @@ passenv =
   DISTUTILS_USE_SDK
 deps=
     -r{toxinidir}/requirements/dev.txt
-    apicheck,pypy3,3.7,3.8,3.9: -r{toxinidir}/requirements/default.txt
-    apicheck,pypy3,3.7,3.8,3.9: -r{toxinidir}/requirements/test.txt
-    apicheck,pypy3,3.7-linux,3.8-linux,3.9-linux: -r{toxinidir}/requirements/test-ci.txt
-    3.7-windows,3.8-windows,3.9-windows: -r{toxinidir}/requirements/test-ci-windows.txt
+    apicheck,pypy3,3.7,3.8,3.9,3.10: -r{toxinidir}/requirements/default.txt
+    apicheck,pypy3,3.7,3.8,3.9,3.10: -r{toxinidir}/requirements/test.txt
+    apicheck,pypy3,3.7-linux,3.8-linux,3.9-linux,3.10-linux: -r{toxinidir}/requirements/test-ci.txt
+    3.7-windows,3.8-windows,3.9-windows,3.10-windows: -r{toxinidir}/requirements/test-ci-windows.txt
     apicheck,linkcheck: -r{toxinidir}/requirements/docs.txt
     flake8,flakeplus,pydocstyle: -r{toxinidir}/requirements/pkgutils.txt
 
@@ -33,7 +33,8 @@ basepython =
     3.7: python3.7
     3.8: python3.8
     3.9,apicheck,pydocstyle,flake8,linkcheck,cov: python3.9
-    pypy3: pypy
+    pypy3: pypy3.7
+    3.10: python3.10
 
 install_command = python -m pip --disable-pip-version-check install {opts} {packages}