diff --git a/.travis.yml b/.travis.yml index 13248d3..86c47f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,20 @@ language: python -env: - - TOX_ENV=py27 - - TOX_ENV=py27-configparser - - TOX_ENV=py32 - - TOX_ENV=py33 - - TOX_ENV=py34 - - TOX_ENV=pypy +matrix: + include: + - python: 2.7 + env: TOXENV=py27 + - python: 2.7 + env: TOXENV=py27-configparser + - python: 3.3 + env: TOXENV=py33 + - python: 3.4 + env: TOXENV=py34 + - python: 3.5 + env: TOXENV=py35 + - python: pypy + env: TOXENV=pypy + install: - git config --global user.email "bumpversion-test-git@travis.ci" - git config --global user.name "Testing Git on Travis CI" @@ -17,5 +25,5 @@ install: - pip install --upgrade pytest tox script: - - tox -e $TOX_ENV + - tox -e $TOXENV diff --git a/tests/test_cli.py b/tests/test_cli.py index 7067472..d45aec7 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -1164,7 +1164,7 @@ def test_subjunctive_dry_run_logging(tmpdir, vcs): info|Would add changes in file 'dont_touch_me.txt' to Git| info|Would add changes in file '.bumpversion.cfg' to Git| info|Would commit to Git with message 'Bump version: 0.8 \u2192 0.8.1'| - info|Would tag 'v0.8.1' with message 'Bump version: 0.8 \u2192 0.8.1' in Git| + info|Would tag 'v0.8.1' with message 'Bump version: 0.8 \u2192 0.8.1' in Git and not signing| """).strip() if vcs == "hg": @@ -1230,7 +1230,7 @@ def test_log_commitmessage_if_no_commit_tag_but_usable_vcs(tmpdir, vcs): info|Would add changes in file 'please_touch_me.txt' to Git| info|Would add changes in file '.bumpversion.cfg' to Git| info|Would commit to Git with message 'Bump version: 0.3.3 \u2192 0.3.4'| - info|Would tag 'v0.3.4' with message 'Bump version: 0.3.3 \u2192 0.3.4' in Git| + info|Would tag 'v0.3.4' with message 'Bump version: 0.3.3 \u2192 0.3.4' in Git and not signing| """).strip() if vcs == "hg":