Refactor Travis (#614)

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

diff --git a/.travis.yml b/.travis.yml
index 83e07e45bdd415ce06f951aec563972595ccb3b7..cb28debf5039f7cbadd60681888c2bf6f2048de0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,14 +2,13 @@ sudo: required
 dist: xenial
 language: python
 cache: pip
 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:
 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:
 after_success:
 - coveralls
 notifications:


@@ -17,9 +16,24 @@ notifications:
   on_failure: always
 matrix:
   include:
   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
 before_deploy:
   - pip install pyinstaller
   - pyinstaller --clean -F --add-data blib2to3/:blib2to3 black.py

diff --git a/tests/test_black.py b/tests/test_black.py
index 6ff5840bc0096afe1104b6d06d0403762bcd0fc8..30bb6fdd73aa6479225d993fbe1a6b2fe1202c31 100644 (file)
--- a/tests/test_black.py
+++ b/tests/test_black.py
@@ -1291,7 +1291,7 @@ class BlackTestCase(unittest.TestCase):
         try:
             list(black.gen_python_files_in_dir(path, root, include, exclude, report))
         except ValueError as ve:
         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()
         path.iterdir.assert_called_once()
         child.resolve.assert_called_once()
         child.is_symlink.assert_called_once()