]> git.phdru.name Git - ppu.git/commitdiff
CI(GHActions): Python 3.10
authorOleg Broytman <phd@phdru.name>
Sun, 18 Sep 2022 14:24:01 +0000 (17:24 +0300)
committerOleg Broytman <phd@phdru.name>
Sun, 18 Sep 2022 14:24:01 +0000 (17:24 +0300)
Fix versions for newer Pythons.

.github/workflows/run-tests.yaml
devscripts/requirements/requirements_tests.txt
tox.ini

index 8387a9dd5c5ed5959364708216e10c569f9ca470..198f8f80b0c77110fa2d1459b4239a4aa9a26f16 100644 (file)
@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        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"]
         include:
         - os: ubuntu-latest
           os-name: Linux
@@ -38,7 +38,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
       - name: Set TOXENV
index 9d6475355aa449fcf19c7dbb8ad5b6bedfe9f37b..c3ea6a13b2edafd295c4693c41ee2a585349ad5a 100644 (file)
@@ -1,5 +1,5 @@
 -r requirements.txt
 
 pytest < 5.0; python_version == '2.7' or python_version == '3.4'
-pytest; python_version >= '3.5'
+pytest < 7.0; python_version >= '3.5'
 pytest-cov
diff --git a/tox.ini b/tox.ini
index eddc5cd03f0fb8ccadb5a0cc143460837af2047b..50cefb2204c1040a41a6cfd55c0058246a9908f6 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.15
-envlist = py27,py3{4,5,6,7,8,9},pypy,py{27,39}-flake8
+envlist = py27,py3{4,5,6,7,8,9,10},pypy,py{27,39}-flake8
 
 # Base test environment settings
 [testenv]
@@ -12,23 +12,20 @@ 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}
 commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
 deps =
-    pip < 19.2
-    setuptools < 44
     -rdevscripts/requirements/requirements_tests.txt
-setenv =
-    VIRTUALENV_PIP = 19.1.1
 
-[testenv:{py27,py34,py35,py36,py37,py38,py39,pypy}]
+[testenv:{py27,py34,py35,py36,py37,py38,py39,py310,pypy}]
 commands =
     {[testenv]commands}
     {envpython} -m pytest
 
-[testenv:{py27,py34,py35,py36,py37,py38,py39}-flake8]
+[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-flake8]
 deps =
     flake8
 commands =