Fix tox.ini

- Fix ansible-lint tox environment to run on python3.
- Ignore '306' lint check
- Remove python36, python35, only test on python37 (standard)

Change-Id: I75000b21dc4562d443e41ac93473a152acb53fe4
Signed-off-by: Charles Short <chucks@redhat.com>
This commit is contained in:
Charles Short 2019-10-29 10:23:22 -04:00
parent 5155cd8777
commit c335d6439b
3 changed files with 4 additions and 11 deletions

View File

@ -3,6 +3,7 @@ parseable: true
skip_list: skip_list:
- '204' # [E204] Lines should be no longer than 120 chars - '204' # [E204] Lines should be no longer than 120 chars
- '206' # [E206] Variables should have spaces before and after: {{ var_name }} - '206' # [E206] Variables should have spaces before and after: {{ var_name }}
- '306'
- '405' - '405'
- '503' # [E503] Tasks that run when changed should likely be handlers - '503' # [E503] Tasks that run when changed should likely be handlers
- '504' - '504'

View File

@ -9,7 +9,7 @@ repos:
- id: check-merge-conflict - id: check-merge-conflict
- id: debug-statements - id: debug-statements
- repo: https://github.com/ansible/ansible-lint - repo: https://github.com/ansible/ansible-lint
rev: v4.0.1 rev: 49372c5c3822567f36a809b20e0273020f024ed7
hooks: hooks:
- id: ansible-lint - id: ansible-lint
files: \.(yaml|yml)$ files: \.(yaml|yml)$

12
tox.ini
View File

@ -1,6 +1,6 @@
[tox] [tox]
minversion = 2.0 minversion = 3.1.1
envlist = py27,py35,py36,py37,linters,dist,insights envlist = py27,py37,linters,dist,insights
skipsdist = True skipsdist = True
[testenv] [testenv]
@ -55,14 +55,6 @@ commands = {posargs}
basepython = python2.7 basepython = python2.7
commands = pytest {posargs} commands = pytest {posargs}
[testenv:py35]
basepython = python3.5
commands = pytest {posargs}
[testenv:py36]
basepython = python3.6
commands = pytest {posargs}
[testenv:py37] [testenv:py37]
basepython = python3.7 basepython = python3.7
commands = pytest {posargs} commands = pytest {posargs}