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 f37d6df4458a249db48dbed2f7cce26ce12e25f6..e782272e8134995f05f48d34efd6075c744e888d 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,31 @@
-sudo: required
-dist: xenial

 language: python
 language: python

-cache: pip
-before_install:
-- if [[ $TRAVIS_PYTHON_VERSION == '3.7-dev' ]]; then sudo add-apt-repository ppa:deadsnakes/ppa -y; fi
-- if [[ $TRAVIS_PYTHON_VERSION == '3.7-dev' ]]; then sudo sudo apt-get update; fi
+cache:
+  pip: true
+  directories:
+    - $HOME/.cache/pre-commit
+env:
+  - TEST_CMD="tox -e py"

 install:
 install:

-- if [[ $TRAVIS_PYTHON_VERSION == '3.7-dev' ]]; then source .travis_py37_workaround.sh; fi
-- pip install coverage coveralls flake8 flake8-bugbear mypy
-- pip install -e .
+  - pip install coverage coveralls pre-commit tox
+  - pip install -e '.[d]'

 script:
 script:

-- coverage run tests/test_black.py
-- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then mypy black.py tests/test_black.py; fi
-- if [[ $TRAVIS_PYTHON_VERSION == '3.6-dev' ]]; then flake8 black.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.6-dev
-    - python: 3.7-dev
+    - name: "lint"
+      python: 3.7
+      env:
+        - 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.8"
+      python: 3.8
+    - name: "3.9"
+      python: 3.9