Make --safe work for Python2.7 syntax, by using typed_ast for safe validation (#840)

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

diff --git a/.travis.yml b/.travis.yml
index 83e07e45bdd415ce06f951aec563972595ccb3b7..d59437364bd1fd51c8988d4f11f41e2e590b1041 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,13 @@
-sudo: required

 dist: xenial
 language: python
 cache: pip
 dist: xenial
 language: python
 cache: pip

+env:
+- TEST_CMD="coverage run tests/test_black.py"

 install:
 - pip install coverage coveralls flake8 flake8-bugbear mypy
 - pip install -e '.[d]'
 script:
 install:
 - pip install coverage coveralls flake8 flake8-bugbear mypy
 - pip install -e '.[d]'
 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:
 - coveralls
 notifications:
 after_success:
 - coveralls
 notifications:


@@ -17,9 +15,28 @@ notifications:
   on_failure: always
 matrix:
   include:
   on_failure: always
 matrix:
   include:

-    - python: 3.6
-    - python: 3.7
-    - python: 3.8-dev
+    - 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"
+      python: 3.7
+      env:
+        - TEST_CMD="flake8 black.py blackd.py tests/test_black.py"
+    - 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
 before_deploy:
   - pip install pyinstaller
   - pyinstaller --clean -F --add-data blib2to3/:blib2to3 black.py


@@ -32,5 +49,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: python/black

     tags: true
     tags: true