From: Oleg Broytman Date: Sun, 18 Sep 2022 14:26:23 +0000 (+0300) Subject: CI(GHActions): Python 3.10 X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=38fd71112379459e7c2e239538f16e0a60e37c46;p=sqlconvert.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 331228e..4bd43ad 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9] + python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"] include: - os: ubuntu-latest os-name: Linux @@ -48,7 +48,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 935cc08..e9716a9 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' ppu diff --git a/tox.ini b/tox.ini index 6ba46d0..925ad72 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 3.15 -envlist = py27,py3{4,5,6,7,8,9}{,-sqlite},py{27,39}-flake8 +envlist = py27,py3{4,5,6,7,8,9,10}{,-sqlite},py{27,39}-flake8 # Base test environment settings [testenv] @@ -12,24 +12,21 @@ basepython = py37: {env:TOXPYTHON:python3.7} py38: {env:TOXPYTHON:python3.8} py39: {env:TOXPYTHON:python3.9} + py310: {env:TOXPYTHON:python3.10} commands = {envpython} --version {envpython} -c "import struct; print(struct.calcsize('P') * 8)" deps = - pip < 19.2 - setuptools < 44 -rdevscripts/requirements/requirements_tests.txt postgres: psycopg2-binary passenv = PGPASSWORD -setenv = - VIRTUALENV_PIP = 19.1.1 platform = linux|win32 # Don't fail or warn on uninstalled commands whitelist_externals = createdb dropdb -[testenv:{py27,py34,py35,py36,py37,py38,py39}] +[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}] commands = {[testenv]commands} {envpython} -m pytest @@ -37,14 +34,14 @@ commands = cmp.py -i tests/mysql2sql/test.out test.out rm.py -f test.out -[testenv:{py27,py34,py35,py36,py37,py38,py39}-sqlite] +[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-sqlite] commands = {[testenv]commands} -rm.py -f /tmp/test.sqdb {envpython} -m pytest -D sqlite:///tmp/test.sqdb rm.py -f /tmp/test.sqdb -[testenv:{py27,py34,py35,py36,py37,py38,py39}-sqlite-w32] +[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-sqlite-w32] platform = win32 commands = {[testenv]commands} @@ -52,7 +49,7 @@ commands = pytest -D sqlite:/{env:TEMP}/test.sqdb?debug=1 rm.py -f {env:TEMP}/test.sqdb -[testenv:{py27,py34,py35,py36,py37,py38,py39}-postgres{,-w32}] +[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-postgres{,-w32}] commands = {[testenv]commands} -dropdb --username=runner test @@ -61,7 +58,7 @@ commands = dropdb --username=runner test # flake8 -[testenv:{py27,py34,py35,py36,py37,py38,py39}-flake8] +[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-flake8] deps = flake8 commands =