Run pre-commit on Travis CI (#1081)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5abeb8249cefaf1957662b9ffe307289b0b395f1..a7b40fd63174bb35d0215ac0384e57ae539ade31 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,21 +2,23 @@
 # "Version control integration" in README.md.
 exclude: ^(blib2to3/|profiling/|tests/data/)
 repos:
 # "Version control integration" in README.md.
 exclude: ^(blib2to3/|profiling/|tests/data/)
 repos:

--   repo: local
+  - repo: local

     hooks:
     hooks:

-    - id: black
-      name: black
-      language: system
-      entry: black
-      types: [python]
-    - id: flake8
-      name: flake8
-      language: system
-      entry: flake8
-      types: [python]
-    - id: mypy
-      name: mypy
-      language: system
-      entry: mypy
-      types: [python]
-      exclude: ^docs/conf.py
+      - id: black
+        name: black
+        language: system
+        entry: black
+        require_serial: true
+        types: [python]
+
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.7.8
+    hooks:
+      - id: flake8
+        additional_dependencies: [flake8-bugbear]
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v0.740
+    hooks:
+      - id: mypy
+        exclude: ^docs/conf.py

diff --git a/.travis.yml b/.travis.yml
index a4eb9981b350b54ef2c1da7ace055542a2d04f6e..b6dc6b3be09280c8da7ea2dd98575a9500f77e42 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,12 @@
-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:
 env:
 - TEST_CMD="coverage run tests/test_black.py"
 install:

-- pip install coverage coveralls flake8 flake8-bugbear mypy
+- pip install coverage coveralls pre-commit

 - pip install -e '.[d]'
 script:
 - $TEST_CMD
 - pip install -e '.[d]'
 script:
 - $TEST_CMD


@@ -15,18 +17,10 @@ notifications:
   on_failure: always
 matrix:
   include:
   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"

     - name: "3.6"
       python: 3.6
     - name: "3.7"
     - name: "3.6"
       python: 3.6
     - name: "3.7"