diff --git a/.travis.yml b/.travis.yml index 90ed92e8..6d190892 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,18 @@ env: # These should match the tox env list - TOXENV=py33 - TOXENV=py34 - TOXENV=pypy -install: pip install coveralls tox --use-mirrors +install: pip install coveralls tox script: tox # Special snowflake. Our tests depend on making real commits. before_install: - - git config --global user.name "Travis CI" - - git config --global user.email "user@example.com" - # Our tests inspect some of *our* git history - - git fetch --unshallow + - git config --global user.name "Travis CI" + - git config --global user.email "user@example.com" + # Our tests inspect some of *our* git history + - git fetch --unshallow after_success: - coveralls sudo: false +cache: + directories: + - $HOME/.cache/pip + - $HOME/.pre-commit diff --git a/testing/resources/ruby_1_9_3_hooks_repo/hooks.yaml b/testing/resources/ruby_1_9_3_hooks_repo/hooks.yaml index 8bcf4629..a3286048 100644 --- a/testing/resources/ruby_1_9_3_hooks_repo/hooks.yaml +++ b/testing/resources/ruby_1_9_3_hooks_repo/hooks.yaml @@ -2,5 +2,5 @@ name: Ruby Hook entry: ruby_hook language: ruby - language_version: 1.9.3-p484 + language_version: 1.9.3-p551 files: \.rb$ diff --git a/tests/repository_test.py b/tests/repository_test.py index f5a653fa..798cff67 100644 --- a/tests/repository_test.py +++ b/tests/repository_test.py @@ -146,7 +146,7 @@ def test_run_versioned_ruby_hook(tempdir_factory, store): tempdir_factory, store, 'ruby_1_9_3_hooks_repo', 'ruby_hook', ['/dev/null'], - b'1.9.3\n484\nHello world from a ruby hook\n', + b'1.9.3\n551\nHello world from a ruby hook\n', ) diff --git a/tox.ini b/tox.ini index b68d9272..f4fa0b08 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,6 @@ project = pre_commit envlist = py26,py27,py33,py34,pypy [testenv] -install_command = pip install --use-wheel {opts} {packages} deps = -rrequirements-dev.txt passenv = HOME HOMEPATH LANG TERM commands =