Drop testing for Python < 3.6.

This commit is contained in:
Omer Katz 2020-07-30 16:43:51 +03:00
parent 57de7d3976
commit 6134d80270
2 changed files with 11 additions and 41 deletions

View File

@ -28,19 +28,12 @@ _integration_job: &integration_job
jobs:
include:
- python: 2.7
env: TOXENV=2.7-unit
- python: 3.5
env: TOXENV=3.5-unit
- python: 3.6
env: TOXENV=3.6-unit
- python: 3.7
env: TOXENV=3.7-linux-unit
- python: 3.8
env: TOXENV=3.8-linux-unit
- python: pypy2.7-7.1.1
env: TOXENV=pypy-unit
dist: xenial
- python: pypy3.5-7.0
env: TOXENV=pypy3-unit
dist: xenial
@ -48,18 +41,12 @@ jobs:
stage: lint
- env: TOXENV=flakeplus
stage: lint
- python: '3.6'
- python: '3.8'
env: TOXENV=apicheck
stage: lint
- python: '3.6'
- python: '3.8'
env: TOXENV=pydocstyle
stage: lint
- python: 2.7
<<: *integration_job
env: TOXENV=2.7-integration-py-amqp
- python: 3.5
<<: *integration_job
env: TOXENV=3.5-integration-py-amqp
- python: 3.6
<<: *integration_job
env: TOXENV=3.6-integration-py-amqp
@ -69,18 +56,9 @@ jobs:
- python: 3.8
<<: *integration_job
env: TOXENV=3.8-linux-integration-py-amqp
- python: pypy2.7-7.1.1
<<: *integration_job
env: TOXENV=pypy-integration-py-amqp
- python: pypy3.5-7.0
<<: *integration_job
env: TOXENV=pypy3-integration-py-amqp
- python: 2.7
<<: *integration_job
env: TOXENV=2.7-integration-redis
- python: 3.5
<<: *integration_job
env: TOXENV=3.5-integration-redis
- python: 3.6
<<: *integration_job
env: TOXENV=3.6-integration-redis
@ -90,9 +68,6 @@ jobs:
- python: 3.8
<<: *integration_job
env: TOXENV=3.8-linux-integration-redis
- python: pypy2.7-7.1.1
<<: *integration_job
env: TOXENV=pypy-integration-redis
- python: pypy3.5-7.0
<<: *integration_job
env: TOXENV=pypy3-integration-redis

23
tox.ini
View File

@ -1,8 +1,8 @@
[tox]
envlist =
{2.7,pypy,pypy3,3.5,3.6,3.7-{linux,windows},3.8{linux,windows}}-unit
{2.7,pypy,pypy3,3.5,3.6,3.7-{linux,windows},3.8{linux,windows}}-integration-py-amqp
{2.7,pypy,pypy3,3.5,3.6,3.7-{linux,windows},3.8{linux,windows}}-integration-redis
{pypy3,3.6,3.7-{linux,windows},3.8{linux,windows}}-unit
{pypy3,3.6,3.7-{linux,windows},3.8{linux,windows}}-integration-py-amqp
{pypy3,3.6,3.7-{linux,windows},3.8{linux,windows}}-integration-redis
flake8
flakeplus
apicheck
@ -17,10 +17,9 @@ passenv =
DISTUTILS_USE_SDK
deps=
-r{toxinidir}/requirements/dev.txt
apicheck,2.7,pypy,pypy3,3.5,3.6,3.7-linux,3.7-windows,3.8-linux,3.8-windows: -r{toxinidir}/requirements/default.txt
apicheck,2.7,pypy,pypy3,3.5,3.6,3.7-linux,3.7-windows,3.8-linux,3.8-windows: -r{toxinidir}/requirements/test.txt
apicheck,2.7,pypy,pypy3,3.5,3.6,3.7-linux,3.8-linux: -r{toxinidir}/requirements/test-ci.txt
2.7,pypy: -r{toxinidir}/requirements/test-ci-py2.txt
apicheck,pypy3,3.6,3.7-linux,3.7-windows,3.8-linux,3.8-windows: -r{toxinidir}/requirements/default.txt
apicheck,pypy3,3.6,3.7-linux,3.7-windows,3.8-linux,3.8-windows: -r{toxinidir}/requirements/test.txt
apicheck,pypy3,3.6,3.7-linux,3.8-linux: -r{toxinidir}/requirements/test-ci.txt
3.7-windows: -r{toxinidir}/requirements/test-ci-windows.txt
apicheck,linkcheck: -r{toxinidir}/requirements/docs.txt
flake8,flakeplus,pydocstyle: -r{toxinidir}/requirements/pkgutils.txt
@ -31,12 +30,12 @@ commands =
integration-redis: py.test -xv -E redis t/integration {posargs:-n2}
basepython =
2.7,flakeplus,flake8,linkcheck,cov: python2.7
flake8,linkcheck,cov: python3.8
3.5: python3.5
3.6,apicheck,pydocstyle: python3.6
3.6,apicheck,pydocstyle: python3.8
3.7: python3.7
3.8: python3.8
pypy,pypy3: pypy
pypy3: pypy
install_command = python -m pip --disable-pip-version-check install {opts} {packages}
@ -76,10 +75,6 @@ commands = pip install -U -r{toxinidir}/requirements/dev.txt
commands =
flake8 -j2 {toxinidir}/kombu {toxinidir}/t
[testenv:flakeplus]
commands =
flakeplus --2.7 {toxinidir}/kombu {toxinidir}/t
[testenv:pydocstyle]
commands =
pydocstyle {toxinidir}/kombu