Skip to content

Commit

Permalink
Reorganize lint travis builds (#10670)
Browse files Browse the repository at this point in the history
* tox cleanup

* 1 tox step

* Revert pytest sugar changes

* Tox: make pylint its own task

* Bump Travis to 30 minutes timeout
  • Loading branch information
balloob authored Nov 20, 2017
1 parent fb32cc3 commit 3f5c748
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 14 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ matrix:
include:
- python: "3.4.2"
env: TOXENV=lint
- python: "3.4.2"
env: TOXENV=pylint
- python: "3.4.2"
env: TOXENV=py34
# - python: "3.5"
# env: TOXENV=typing
- python: "3.5"
- python: "3.5.3"
env: TOXENV=py35
- python: "3.6"
env: TOXENV=py36
# - python: "3.6-dev"
# env: TOXENV=py36
- python: "3.4.2"
env: TOXENV=requirements
# allow_failures:
# - python: "3.5"
# env: TOXENV=typing
Expand All @@ -29,5 +29,5 @@ cache:
- $HOME/.cache/pip
install: pip install -U tox coveralls
language: python
script: travis_wait tox
script: travis_wait 30 tox --develop
after_success: coveralls
1 change: 0 additions & 1 deletion script/setup
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
set -e

cd "$(dirname "$0")/.."
git submodule init
script/bootstrap

pip3 install -e .
5 changes: 1 addition & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ testpaths = tests
norecursedirs = .git testing_config

[flake8]
exclude = .venv,.git,.tox,docs,www_static,venv,bin,lib,deps,build

[pydocstyle]
match_dir = ^((?!\.|www_static).)*$
exclude = .venv,.git,.tox,docs,venv,bin,lib,deps,build

[isort]
# https://github.com/timothycrosley/isort
Expand Down
11 changes: 6 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,29 @@ setenv =
whitelist_externals = /usr/bin/env
install_command = /usr/bin/env LANG=C.UTF-8 pip install {opts} {packages}
commands =
py.test --timeout=30 --duration=10 --cov --cov-report= {posargs}
py.test --timeout=15 --duration=10 --cov --cov-report= {posargs}
deps =
-r{toxinidir}/requirements_test_all.txt
-c{toxinidir}/homeassistant/package_constraints.txt

[testenv:lint]
[testenv:pylint]
basepython = python3
ignore_errors = True
deps =
-r{toxinidir}/requirements_all.txt
-r{toxinidir}/requirements_test.txt
-c{toxinidir}/homeassistant/package_constraints.txt
commands =
flake8
pylint homeassistant
pydocstyle homeassistant tests

[testenv:requirements]
[testenv:lint]
basepython = python3
deps =
-r{toxinidir}/requirements_test.txt
commands =
python script/gen_requirements_all.py validate
flake8
pydocstyle homeassistant tests

[testenv:typing]
basepython = python3
Expand Down

0 comments on commit 3f5c748

Please sign in to comment.