Update to accomodate isort 5 release changes. (#1559)

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

diff --git a/.travis.yml b/.travis.yml
index c0cd5abe12e65493b8e21787f87e454db0418b93..86cf24df51bf6f2105dc97a743c794350ecd7f2c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,45 +1,39 @@
-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="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:

-- $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
+    - name: "3.8"
+      python: 3.8
+    - name: "3.9"
+      python: 3.9-dev

   allow_failures:
   allow_failures:

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


@@ -49,5 +43,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