Fix g:black_fast and g:black_(skip)_string_normalization opts

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

diff --git a/.travis.yml b/.travis.yml
index 2e1ebfd452bcec75052b5a01490b7e42362ba144..86cf24df51bf6f2105dc97a743c794350ecd7f2c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,35 +1,47 @@
-sudo: required
-dist: xenial

 language: python
 language: python

-cache: pip
+cache:
+  pip: true
+  directories:
+    - $HOME/.cache/pre-commit
+env:
+  - TEST_CMD="coverage run -m unittest"

 install:
 install:

-- pip install coverage coveralls flake8 flake8-bugbear mypy
-- pip install -e '.[d]'
+  - pip install coverage coveralls pre-commit
+  - pip install -e '.[d]'

 script:
 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:
 after_success:

-- coveralls
+  - coveralls

 notifications:
   on_success: change
   on_failure: always
 matrix:
   include:
 notifications:
   on_success: change
   on_failure: always
 matrix:
   include:

-    - python: 3.6
-    - python: 3.7
-    - python: 3.8-dev
+    - name: "lint"
+      python: 3.7
+      env:
+        - TEST_CMD="pre-commit run --all-files --show-diff-on-failure"
+    - name: "3.6"
+      python: 3.6
+    - name: "3.7"
+      python: 3.7
+    - name: "3.8"
+      python: 3.8
+    - name: "3.9"
+      python: 3.9-dev
+  allow_failures:
+    - python: 3.9-dev

 before_deploy:
   - pip install pyinstaller
 before_deploy:
   - pip install pyinstaller

-  - pyinstaller --clean -F --add-data blib2to3/:blib2to3 black.py
+  - pyinstaller --clean -F --add-data src/blib2to3/:blib2to3 src/black/__init__.py

 deploy:
   provider: releases
   api_key:
 deploy:
   provider: releases
   api_key:

-    secure: HWp0i3tzLox5V+tT5GJ+X6rJATd4dmR6aQe0wpc7FWwrKFKF1fVqQtc8gvzS2e/Wv4Xse/Q0vqze5U6q+aYIysoVkLeZiRJ3YzBHV40/J058MG7PMjyJ1hfxsctVEUIsvKSlF9br21k5C6efem2FrfmuavbRN4sdged5HlFpPYrH65G41Wt/3msdF7NNhDaeup3vne+hVrSdYkLj3qSN5a0htLhWSeT12f5hruBqFN32dVVJrtsI9OeOvy4ASrMm2V3S9+QsR0xQFkCCwFxNF95BVzjRKIT7jcVfKsQ15uJLUonZCLMRqZ0pYfVc11J0yxVIUZ8SK0AU3tW4Fh/+LCHgifHDF9Ua5q6l+YSVZq0aVWZq21m2z/KdlTM6EdBOsAjzvYpY55SLWDCsX0Bkn6QX//E+MnPf0H2oTJ7zm5pOgCCJWXIZnX2+FsnM1W23yc3Uvwld9I33+D3dC5ZOssDpYPTzrVZWOcDYyIQCT3FvgM18xii1uajb8WJQS8Le+oJQAv5UQAB57G+Nr4iKlzpqTcPkRZSKLlTBFfh/lVU+UAMQDQgrUk+4PSOIsYxuQDK3kxdwFYJMI/BztqPidRfCHq/qR2pya/+79dp9VDCe5g2acZ40jIISqVgrezKrjFNKvYmrca8jU9iCOO4QvPiIp9qxcGJCYvctNguAD5A=
-  file: dist/black
+    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'
   skip_cleanup: true
   on:
     condition: $TRAVIS_PYTHON_VERSION == '3.6'

-    repo: cxong/black
+    repo: psf/black

     tags: true
     tags: true