From 2d4535833838f6589af9d8dfe45728953f803da2 Mon Sep 17 00:00:00 2001 From: opacam Date: Thu, 13 Jun 2019 09:40:39 +0200 Subject: [PATCH 1/2] [travis] Move from `master` to `develop` Because we changed the git flow and now our main branch is `develop` --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 16af18f65e..cd8f7d76c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ services: before_install: # https://github.com/travis-ci/travis-ci/issues/6069#issuecomment-266546552 - - git remote set-branches --add origin master + - git remote set-branches --add origin develop - git fetch env: From dea96f236777961f1f91386cc3cb661e622f3d90 Mon Sep 17 00:00:00 2001 From: opacam Date: Thu, 13 Jun 2019 09:43:01 +0200 Subject: [PATCH 2/2] [travis] Make tox jobs work in parallel --- .travis.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd8f7d76c4..acbb91eb4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,8 @@ env: jobs: include: - - stage: lint - name: "Tox tests and coverage" + - &linting + stage: lint language: python python: 3.7 before_script: @@ -45,6 +45,14 @@ jobs: - tox -- tests/ --ignore tests/test_pythonpackage.py # (we ignore test_pythonpackage.py since these run way too long!! # test_pythonpackage_basic.py will still be run.) + name: "Tox Pep8" + env: TOXENV=pep8 + - <<: *linting + name: "Tox Python 2" + env: TOXENV=py27 + - <<: *linting + name: "Tox Python 3 & Coverage" + env: TOXENV=py3 after_success: - coveralls