Fix missed cases in the `# type: ignore` logic (#1059)

[etc/vim.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index f37d6df4458a249db48dbed2f7cce26ce12e25f6..c2b8d058396d3b5e08b0b9aa633322d96b89ce89 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,13 @@
-sudo: required
 dist: xenial
 language: python
 cache: pip
-before_install:
-- if [[ $TRAVIS_PYTHON_VERSION == '3.7-dev' ]]; then sudo add-apt-repository ppa:deadsnakes/ppa -y; fi
-- if [[ $TRAVIS_PYTHON_VERSION == '3.7-dev' ]]; then sudo sudo apt-get update; fi
+env:
+- TEST_CMD="coverage run tests/test_black.py"
 install:
-- if [[ $TRAVIS_PYTHON_VERSION == '3.7-dev' ]]; then source .travis_py37_workaround.sh; fi
 - pip install coverage coveralls flake8 flake8-bugbear mypy
-- pip install -e .
+- pip install -e '.[d]'
 script:
-- coverage run tests/test_black.py
-- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then mypy black.py tests/test_black.py; fi
-- if [[ $TRAVIS_PYTHON_VERSION == '3.6-dev' ]]; then flake8 black.py tests/test_black.py; fi
+- $TEST_CMD
 after_success:
 - coveralls
 notifications:
@@ -20,6 +15,35 @@ notifications:
   on_failure: always
 matrix:
   include:
-    - python: 3.6
-    - python: 3.6-dev
-    - python: 3.7-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
+deploy:
+  provider: releases
+  api_key:
+    secure: chYvcmnRqRKtfBcAZRj62rEv0ziWuHMl6MnfQbd1MOVQ4njntI8+CCPk118dW6MWSfwTqyMFy+t9gAgQYhjkLEHMS2aK9Z2wCWki1MkBrkMw5tYoLFvPu0KQ9rIVihxsr93a/am6Oh/Hp+1uuc4zWPUf1ubX+QlCzsxjCzVso1kTJjjdN04UxvkcFR+sY2d9Qyy9WcdifChnLwdmIJKIoVOE7Imm820nzImJHkJh8iSnjBjL98gvPPeC/nWTltsbErvf2mCv4NIjzjQZvHa87c7rSJGbliNrAxCSyyvBX+JNeS8U2fGLE83do0HieyjdPbTuc27e2nsrrihgPh+hXbiJerljclfp5hsJ5qGz5sS9MU1fR7sSLiQQ2v0TYB5RRwd34TgGiLwFAZZmgZOfMUCtefCKvP8qvELMSNd99+msfPEHiuhADF0bKPTbCUa6BgUHNr6woOLmHerjPHd6NI/a8Skz/uQB4xr3spLSmfUmX0fEqyYUDphkGPNH8IsvC1/F2isecW9kOzEWmB5oCmpMTGm4TIf3C01Nx+9PVwB2Z+30hhbfIEBxD4loRFmh/hU5TIQEpneF8yoIfe9EnMaoZbq86xhADZXvLIZvpXUdm1NQZDG6na2S1fwyOUKQsW6BWLcfoZZwZlrXrViD1jBsHBV++s+lxShTeTCszlo=
+  file:
+    - dist/black
+  skip_cleanup: true
+  on:
+    condition: $TRAVIS_PYTHON_VERSION == '3.6'
+    repo: psf/black
+    tags: true