Skip to content

Commit

Permalink
ci: Enforce black format
Browse files Browse the repository at this point in the history
  • Loading branch information
bdarnell committed Oct 7, 2018
1 parent 72026c5 commit 1c7deeb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ install:
# version supported. But Python 3.7 requires slower-to-start VMs,
# so we run it on 3.6 to minimize total CI run time.
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then travis_retry pip install -r docs/requirements.txt; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then travis_retry pip install flake8 mypy==0.630; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then travis_retry pip install flake8 mypy==0.630 black; fi
# On travis the extension should always be built
- if [[ $TRAVIS_PYTHON_VERSION != 'pypy'* ]]; then export TORNADO_EXTENSION=1; fi
- travis_retry python setup.py install
Expand Down Expand Up @@ -94,6 +94,7 @@ script:
- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then (cd ../docs && mkdir sphinx-out && sphinx-build -E -n -W -b html . sphinx-out); fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then (cd ../docs && mkdir sphinx-doctest-out && sphinx-build -E -n -b doctest . sphinx-out); fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then (cd .. && flake8); fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then (cd .. && black --check --diff tornado); fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then (cd .. && mypy tornado); fi

after_success:
Expand Down
7 changes: 5 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ deps =
{py3,py35,py36,py37}-full: pycares
sphinx: -r{toxinidir}/docs/requirements.txt
lint: flake8
lint: black
mypy: mypy==0.630

setenv =
# The extension is mandatory on cpython.
Expand Down Expand Up @@ -123,10 +125,11 @@ commands =
sphinx-build -q -E -n -b doctest . {envtmpdir}/doctest

[testenv:py3-lint]
commands = flake8 {posargs:}
commands =
flake8 {posargs:}
black --check --diff {posargs:tornado}
changedir = {toxinidir}

[testenv:py3-mypy]
commands = mypy {posargs:tornado}
changedir = {toxinidir}
deps = mypy==0.630

0 comments on commit 1c7deeb

Please sign in to comment.