Simplify some code flow

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

diff --git a/.travis.yml b/.travis.yml
index 83e07e45bdd415ce06f951aec563972595ccb3b7..ec2417258560b4b01af626b540caf9f0ca2ae3aa 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,32 @@
-sudo: required
-dist: xenial

 language: python
 language: python

-cache: pip
+cache:
+  pip: true
+  directories:
+    - $HOME/.cache/pre-commit
+env:
+  - TEST_CMD="coverage run tests/test_black.py"

 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"
+    - name: "3.6"
+      python: 3.6
+    - name: "3.7"
+      python: 3.7
+    - name: "3.8"
+      python: 3.8

 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


@@ -32,5 +39,5 @@ deploy:
   skip_cleanup: true
   on:
     condition: $TRAVIS_PYTHON_VERSION == '3.6'
   skip_cleanup: true
   on:
     condition: $TRAVIS_PYTHON_VERSION == '3.6'

-    repo: ambv/black
+    repo: psf/black

     tags: true
     tags: true