Skip to content

Commit

Permalink
Refactor Travis (#614)
Browse files Browse the repository at this point in the history
Fixes #305 

- Run separate jobs for mypy, self-formatting, flake8, and test runs.
- Don't run flake8 in 3.8 because it is broken (and we can't really expect flake8 to always keep up with 3.8 development).
- Fix unused variable in test
  • Loading branch information
JelleZijlstra committed Nov 20, 2018
1 parent e4e59f8 commit 8d58827
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 8 deletions.
28 changes: 21 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,38 @@ sudo: required
dist: xenial
language: python
cache: pip
env:
- TEST_CMD="coverage run tests/test_black.py"
install:
- pip install coverage coveralls flake8 flake8-bugbear mypy
- pip install -e '.[d]'
script:
- coverage run tests/test_black.py
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then mypy black.py blackd.py tests/test_black.py; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then black --check --verbose .; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.8-dev' ]]; then flake8 black.py blackd.py tests/test_black.py; fi
- $TEST_CMD
after_success:
- coveralls
notifications:
on_success: change
on_failure: always
matrix:
include:
- python: 3.6
- python: 3.7
- python: 3.8-dev
- name: "mypy"
python: 3.6
env:
- TEST_CMD="mypy black.py blackd.py tests/test_black.py"
- name: "black"
python: 3.7
env:
- TEST_CMD="black --check --verbose ."
- name: "flake8"
python: 3.7
env:
- TEST_CMD="flake8 black.py blackd.py tests/test_black.py"
- name: "3.6"
python: 3.6
- name: "3.7"
python: 3.7
- name: "3.8-dev"
python: 3.8-dev
before_deploy:
- pip install pyinstaller
- pyinstaller --clean -F --add-data blib2to3/:blib2to3 black.py
Expand Down
2 changes: 1 addition & 1 deletion tests/test_black.py
Original file line number Diff line number Diff line change
Expand Up @@ -1291,7 +1291,7 @@ def test_symlink_out_of_root_directory(self) -> None:
try:
list(black.gen_python_files_in_dir(path, root, include, exclude, report))
except ValueError as ve:
self.fail("`get_python_files_in_dir()` failed: {ve}")
self.fail(f"`get_python_files_in_dir()` failed: {ve}")
path.iterdir.assert_called_once()
child.resolve.assert_called_once()
child.is_symlink.assert_called_once()
Expand Down

0 comments on commit 8d58827

Please sign in to comment.