From 8b4ab222bb55d5b384c97c11aa492bd098a16f11 Mon Sep 17 00:00:00 2001
From: Oleg Broytman <phd@phdru.name>
Date: Sun, 18 Sep 2022 17:21:31 +0300
Subject: [PATCH] CI(GHActions): Python 3.10

Fix versions for newer Pythons.
---
 .github/workflows/run-tests.yaml | 4 ++--
 tox.ini                          | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index 4bf76a0..d89de76 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 'pypy-2.7']
+        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "pypy-2.7"]
 
     name: Python ${{ matrix.python-version }}
     runs-on: ubuntu-latest
@@ -31,7 +31,7 @@ jobs:
       - name: Install dependencies
         run: |
           python --version
-          python -m pip install --upgrade "pip<21.0" "setuptools<45" wheel
+          python -m pip install --upgrade pip setuptools wheel
           pip --version
           pip install --upgrade virtualenv tox tox-gh-actions
 
diff --git a/tox.ini b/tox.ini
index d428fda..7c4123d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py27,py3{4,5,6,7,8,9},pypy
+envlist = py27,py3{4,5,6,7,8,9,10},pypy
 
 [testenv]
 basepython =
@@ -11,10 +11,9 @@ basepython =
     py37: {env:TOXPYTHON:python3.7}
     py38: {env:TOXPYTHON:python3.8}
     py39: {env:TOXPYTHON:python3.9}
+    py310: {env:TOXPYTHON:python3.10}
     pypy: {env:TOXPYTHON:pypy}
 deps =
-    pip < 19.2
-    setuptools < 44
     -rdevscripts/requirements/requirements_tests.txt
 changedir = test
 commands =
@@ -22,8 +21,6 @@ commands =
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
     ./test_all
 passenv = HOME
-setenv =
-    VIRTUALENV_PIP = 19.1.1
 
 [gh-actions]
 python =
@@ -33,4 +30,5 @@ python =
     3.7: py37
     3.8: py38
     3.9: py39
+    3.10: py310
     pypy-2.7: pypy
-- 
2.39.2