Skip to content

Commit

Permalink
fix problems in CI for conventions.
Browse files Browse the repository at this point in the history
On CI (Travis and Appveyor) the lint Checks does not run and therefore the master is dirty.
  • Loading branch information
loechel committed Aug 30, 2019
1 parent c04efab commit c4682c0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -33,5 +35,6 @@ after_success:

notifications:
email: false

cache:
pip: true
6 changes: 3 additions & 3 deletions appveyor.yml
Expand Up @@ -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"
Expand Down
6 changes: 2 additions & 4 deletions tox.ini
Expand Up @@ -33,7 +33,7 @@ deps =
pytest-html

[testenv:coverage]
basepython = python2.7
#basepython = python2.7
skip_install = true

deps =
Expand All @@ -48,10 +48,9 @@ commands =
coverage combine
coverage html
coverage xml
coverage report --skip-covered --show-missing --fail-under=100.0
coverage report --show-missing --fail-under=100.0

[testenv:isort-apply]
basepython = python2.7
skip_install = true
deps =
-cconstraints.txt
Expand Down Expand Up @@ -107,7 +106,6 @@ commands = {[lint]commands}
whitelist_externals = {[lint]whitelist_externals}

[testenv:docs]
basepython = python3.6
deps =
-cconstraints.txt
Sphinx
Expand Down

0 comments on commit c4682c0

Please sign in to comment.