imove tox and add python3 linter

This commit is contained in:
Kay0u 2020-08-17 23:54:20 +02:00
parent e35d806ae1
commit 93bff46bc3
No known key found for this signature in database
GPG key ID: AE1DCADB6415A156
2 changed files with 27 additions and 24 deletions

View file

@ -3,20 +3,36 @@
######################################## ########################################
# later we must fix lint and format-check jobs and remove "allow_failure" # later we must fix lint and format-check jobs and remove "allow_failure"
lint: lint27:
stage: lint stage: lint
image: "before-install" image: "before-install"
needs: [] needs: []
allow_failure: true allow_failure: true
script: script:
- tox -e lint - tox -e py27-lint
invalidcode: lint37:
stage: lint
image: "before-install"
needs: []
allow_failure: true
script:
- tox -e py37-lint
invalidcode27:
stage: lint stage: lint
image: "before-install" image: "before-install"
needs: [] needs: []
script: script:
- tox -e invalidcode - tox -e py27-invalidcode
invalidcode37:
stage: lint
image: "before-install"
allow_failure: true
needs: []
script:
- tox -e py37-invalidcode
format-check: format-check:
stage: lint stage: lint
@ -24,4 +40,4 @@ format-check:
needs: [] needs: []
allow_failure: true allow_failure: true
script: script:
- black --check --diff src doc data tests - tox -e py37-black

25
tox.ini
View file

@ -1,25 +1,12 @@
[tox] [tox]
envlist = envlist = py{27,37}-{lint,invalidcode},py37-black
py27
lint
skipdist = True
[testenv] [testenv]
skip_install=True skip_install=True
deps = deps =
pytest >= 4.6.3, < 5.0 py{27,37}-{lint,invalidcode}: flake8
pyyaml >= 5.1.2, < 6.0 py37-black: black
flake8 >= 3.7.9, < 3.8
urllib3
commands = commands =
pytest {posargs} py{27,37}-lint: flake8 src doc data tests
py{27,37}-invalidcode: flake8 src data --exclude src/yunohost/tests --select F --ignore F401,F841
[testenv:lint] py37-black: black --check --diff src doc data tests
skip_install=True
commands = flake8 src doc data tests
deps = flake8
[testenv:invalidcode]
skip_install=True
commands = flake8 src data --exclude src/yunohost/tests --select F --ignore F401,F841
deps = flake8