add test configurations that don't contain python2 optional install (#2190)

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

diff --git a/.travis.yml b/.travis.yml
index d59437364bd1fd51c8988d4f11f41e2e590b1041..e782272e8134995f05f48d34efd6075c744e888d 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,53 +1,31 @@
-dist: xenial

 language: python
 language: python

-cache: pip
+cache:
+  pip: true
+  directories:
+    - $HOME/.cache/pre-commit

 env:
 env:

-- TEST_CMD="coverage run tests/test_black.py"
+  - TEST_CMD="tox -e py"

 install:
 install:

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

 script:
 script:

-- $TEST_CMD
+  - $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:

-    - 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"
+    - name: "lint"

       python: 3.7
       env:
       python: 3.7
       env:

-        - TEST_CMD="flake8 black.py blackd.py tests/test_black.py"
+        - 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.6"
       python: 3.6
     - name: "3.7"
       python: 3.7

-    - name: "3.8-dev"
-      python: 3.8-dev
-  # aiohttp currently has a bug affecting 3.8
-  allow_failures:
-    - 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: python/black
-    tags: true
+    - name: "3.8"
+      python: 3.8
+    - name: "3.9"
+      python: 3.9