From: Oleg Broytman Date: Sun, 18 Sep 2022 14:24:01 +0000 (+0300) Subject: CI(GHActions): Python 3.10 X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=e59993738affbb44651c0b160b6b6bd1131629e7;p=ppu.git CI(GHActions): Python 3.10 Fix versions for newer Pythons. --- diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index 8387a9d..198f8f8 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -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 diff --git a/devscripts/requirements/requirements_tests.txt b/devscripts/requirements/requirements_tests.txt index 9d64753..c3ea6a1 100644 --- a/devscripts/requirements/requirements_tests.txt +++ b/devscripts/requirements/requirements_tests.txt @@ -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 eddc5cd..50cefb2 100644 --- 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 =