updated python versiions in CI (#1663)

* updated python versiions in CI

* updated python versiions in CI with

* updated tox

* updated ci

* Update .github/workflows/ci.yaml

* Update .github/workflows/ci.yaml

* Update .github/workflows/ci.yaml

2 files changed, 24 insertions, 24 deletions

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 92233b17..cdab2e01 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7,3.8,3.9]
+        python-version: [3.7,3.8,3.9,"3.10"]
     steps:
       - name: Install system packages
         run: sudo apt update && sudo apt-get install libcurl4-openssl-dev libssl-dev
@@ -29,12 +29,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7,3.8,3.9]
+        python-version: [3.8,3.9,"3.10"]
         experimental: [false]
         include:
-          - python-version: pypy-3.7
-            experimental: true
-          - python-version: pypy-3.8
+          - python-version: pypy-3.9
             experimental: true
     steps:
       - name: Install system packages
@@ -48,7 +46,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: pip install --upgrade pip setuptools wheel tox tox-docker
-      # Tox fails if a Python versions contains a hyphen, this changes "pypy-3.8" to "pypy3.8".
+      # Tox fails if a Python versions contains a hyphen, this changes "pypy-3.9" to "pypy3.9".
       - name: Determine Python version
         run: echo PYTHON_VERSION=$(echo ${{ matrix.python-version }} | sed s/-//) >> $GITHUB_ENV
       - name: Run AMQP integration tests
@@ -58,7 +56,7 @@ jobs:
       - name: Run MongoDB integration tests
         run: tox -v -e ${{ env.PYTHON_VERSION }}-linux-integration-py-mongodb -- -v
       - name: Run kafka integration tests
-        if: ${{ env.PYTHON_VERSION != 'pypy3.7' && env.PYTHON_VERSION != 'pypy3.8' }}
+        if: ${{ env.PYTHON_VERSION != 'pypy3.9'}}
         run: tox -v -e ${{ env.PYTHON_VERSION }}-linux-integration-py-kafka -- -v
 
   #################### Linters and checkers ####################
@@ -67,7 +65,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: ["3.10"]
     steps:
       - name: Install system packages
         run: sudo apt update && sudo apt-get install libcurl4-openssl-dev libssl-dev
diff --git a/tox.ini b/tox.ini
index 34bc5b26..1636d63a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
 envlist =
-    {pypy3.7,pypy3.8,3.7,3.8,3.9,3.10}-unit
-    {pypy3.7,pypy3.8,3.7,3.8,3.9,3.10}-linux-integration-py-amqp
-    {pypy3.7,pypy3.8,3.7,3.8,3.9,3.10}-linux-integration-redis
-    {pypy3.7,pypy3.8,3.7,3.8,3.9,3.10}-linux-integration-mongodb
-    {3.7,3.8,3.9,3.10}-linux-integration-kafka
+    {pypy3.9,3.7,3.8,3.9,3.10,3.11}-unit
+    {pypy3.9,3.7,3.8,3.9,3.10,3.11}-linux-integration-py-amqp
+    {pypy3.9,3.7,3.8,3.9,3.10,3.11}-linux-integration-redis
+    {pypy3.9,3.7,3.8,3.9,3.10,3.11}-linux-integration-mongodb
+    {3.7,3.8,3.9,3.10,3.11}-linux-integration-kafka
     flake8
     apicheck
     pydocstyle
@@ -17,6 +17,7 @@ python =
     3.8: py38
     3.9: py39
     3.10: py310, mypy
+    3.11: py311
 
 [testenv]
 sitepackages = False
@@ -25,28 +26,29 @@ passenv =
   DISTUTILS_USE_SDK
 deps=
     -r{toxinidir}/requirements/dev.txt
-    apicheck,pypy3.7,pypy3.8,3.7,3.8,3.9,3.10: -r{toxinidir}/requirements/default.txt
-    apicheck,pypy3.7,pypy3.8,3.7,3.8,3.9,3.10: -r{toxinidir}/requirements/test.txt
-    apicheck,pypy3.7,pypy3.8,3.7-linux,3.8-linux,3.9-linux,3.10-linux: -r{toxinidir}/requirements/test-ci.txt
-    apicheck,3.7-linux,3.8-linux,3.9-linux,3.10-linux: -r{toxinidir}/requirements/extras/confluentkafka.txt
-    3.7-windows,3.8-windows,3.9-windows,3.10-windows: -r{toxinidir}/requirements/test-ci-windows.txt
+    apicheck,pypy3.9,3.7,3.8,3.9,3.10,3.11: -r{toxinidir}/requirements/default.txt
+    apicheck,pypy3.9,3.7,3.8,3.9,3.10,3.11: -r{toxinidir}/requirements/test.txt
+    apicheck,pypy3.9,3.7-linux,3.8-linux,3.9-linux,3.10-linux,3.11-linux: -r{toxinidir}/requirements/test-ci.txt
+    apicheck,3.7-linux,3.8-linux,3.9-linux,3.10-linux,3.11-linux: -r{toxinidir}/requirements/extras/confluentkafka.txt
+    3.8-windows,3.9-windows,3.10-windows,3.11-windows: -r{toxinidir}/requirements/test-ci-windows.txt
     apicheck,linkcheck: -r{toxinidir}/requirements/docs.txt
-    flake8,flakeplus,pydocstyle,mypy: -r{toxinidir}/requirements/pkgutils.txt
+    flake8,pydocstyle,mypy: -r{toxinidir}/requirements/pkgutils.txt
 
 commands =
     unit: python -bb -m pytest -rxs -xv --cov=kombu --cov-report=xml --no-cov-on-fail {posargs}
-    integration-py-amqp: py.test -xv -E py-amqp t/integration {posargs:-n2}
-    integration-redis: py.test -xv -E redis t/integration {posargs:-n2}
-    integration-mongodb: py.test -xv -E mongodb t/integration {posargs:-n2}
-    integration-kafka: py.test -xv -E kafka t/integration {posargs:-n2}
+    integration-py-amqp: pytest -xv -E py-amqp t/integration {posargs:-n2}
+    integration-redis: pytest -xv -E redis t/integration {posargs:-n2}
+    integration-mongodb: pytest -xv -E mongodb t/integration {posargs:-n2}
+    integration-kafka: pytest -xv -E kafka t/integration {posargs:-n2}
 
 basepython =
-    pypy3.7: pypy3.7
+    pypy3.9: pypy3.9
     pypy3.8: pypy3.8
     3.7: python3.7
     3.8,mypy: python3.8
     3.9,apicheck,pydocstyle,flake8,linkcheck,cov: python3.9
     3.10: python3.10
+    3.11: python3.11
 
 install_command = python -m pip --disable-pip-version-check install {opts} {packages}