From 64f238e43b41eda299f0c44ad3010a4f7d664a45 Mon Sep 17 00:00:00 2001 From: Alexander Loechel Date: Mon, 2 Sep 2019 18:19:12 +0200 Subject: [PATCH] Fix problems on CI, conventions are not checked. (#173) * fix problems in CI for conventions. On CI (Travis and Appveyor) the lint Checks does not run and therefore the master is dirty. --- .travis.yml | 5 ++++- appveyor.yml | 6 +++--- setup.cfg | 2 ++ tox.ini | 3 +-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e7ff85..7e7631c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ matrix: include: - name: "docs,lint" python: "3.6" - env: TOXENV=docs,lint + env: TOXENV=docs,lint-py36 before_install: after_success: - python: "2.7" @@ -18,8 +18,10 @@ matrix: env: TOXENV=py37,py37-datetime - python: "3.8-dev" env: TOXENV=py38,py38-datetime + before_install: - travis_retry pip install -U -c constraints.txt coveralls coverage + install: - travis_retry pip install -U pip setuptools - travis_retry pip install -U -c constraints.txt tox @@ -33,5 +35,6 @@ after_success: notifications: email: false + cache: pip: true diff --git a/appveyor.yml b/appveyor.yml index 64b1258..90b1108 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,9 +2,9 @@ environment: matrix: - - PROFILE: py27-conventions - PYTHON_VERSION: "2.7" - TOXENV: "lint,docs" + - PROFILE: conventions + PYTHON_VERSION: "3.6" + TOXENV: "docs,lint-py36" - PROFILE: py27 PYTHON_VERSION: "2.7" TOXENV: "py27,py27-datetime" diff --git a/setup.cfg b/setup.cfg index fbc0930..445e090 100644 --- a/setup.cfg +++ b/setup.cfg @@ -46,6 +46,8 @@ source = . [coverage:report] precision = 2 +#fail_under = 100 +skip_covered = True show_missing = True sort = Name diff --git a/tox.ini b/tox.ini index 412cf66..3f0ea50 100644 --- a/tox.ini +++ b/tox.ini @@ -48,10 +48,9 @@ commands = coverage combine coverage html coverage xml - coverage report --skip-covered --show-missing --fail-under=100.0 + coverage report --fail-under=100.0 [testenv:isort-apply] -basepython = python2.7 skip_install = true deps = -cconstraints.txt