From 779b8070a8e240e188997bd8f5924e87b78622d9 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Tue, 3 Sep 2019 15:00:32 +0200 Subject: [PATCH] Simplify Travis-CI configuration This removes the indirection of setting environment variables to install and run tests. Also, use an explicit version for running mypy with typed-ast. --- .travis.yml | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2d96621b8e9e..0a315e7668d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,34 +2,24 @@ dist: bionic language: python python: 3.7 -matrix: +jobs: include: - name: "pytype" python: 3.6 - env: - - TEST_CMD="./tests/pytype_test.py" - - INSTALL="test" + install: pip install -r requirements-tests-py3.txt + script: ./tests/pytype_test.py - name: "mypy (typed-ast)" - env: - - TEST_CMD="./tests/mypy_test.py" - - INSTALL="mypy" + python: 3.7 + install: pip install -U git+git://github.com/python/mypy git+git://github.com/python/typed_ast + script: ./tests/mypy_test.py - name: "mypy (ast)" python: 3.8-dev - env: - - TEST_CMD="./tests/mypy_test.py" - - INSTALL="mypy" + install: pip install -U git+git://github.com/python/mypy + script: ./tests/mypy_test.py - name: "mypy self test" - env: TEST_CMD="./tests/mypy_selftest.py" + script: ./tests/mypy_selftest.py - name: "check file consistency" - env: TEST_CMD="./tests/check_consistent.py" + script: ./tests/check_consistent.py - name: "flake8" - env: - - TEST_CMD="flake8" - - INSTALL="test" - -install: - - if [[ $INSTALL == 'test' ]]; then pip install -r requirements-tests-py3.txt; fi - - if [[ $INSTALL == 'mypy' ]]; then pip install -U git+git://github.com/python/mypy git+git://github.com/python/typed_ast; fi - -script: - - $TEST_CMD + install: pip install -r requirements-tests-py3.txt + script: flake8