From 3f5c7485600a34c39f02787cb633bcc723515d33 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Sun, 19 Nov 2017 17:39:24 -0800
Subject: [PATCH] Reorganize lint travis builds (#10670)
* tox cleanup
* 1 tox step
* Revert pytest sugar changes
* Tox: make pylint its own task
* Bump Travis to 30 minutes timeout
---
.travis.yml | 8 ++++----
script/setup | 1 -
setup.cfg | 5 +----
tox.ini | 11 ++++++-----
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index fdc5650db22..3d6789ea586 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
@@ -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
diff --git a/script/setup b/script/setup
index f554efe9153..554389e063e 100755
--- a/script/setup
+++ b/script/setup
@@ -5,7 +5,6 @@
set -e
cd "$(dirname "$0")/.."
-git submodule init
script/bootstrap
pip3 install -e .
diff --git a/setup.cfg b/setup.cfg
index f6cc8bd45b9..d6dfdfe0ea5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -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
diff --git a/tox.ini b/tox.ini
index e3063af8f40..f3e58ce8889 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,12 +12,12 @@ 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 =
@@ -25,15 +25,16 @@ deps =
-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
--
GitLab