From 6cf21ec53319607351b83b824f8cf63c81ebec1a Mon Sep 17 00:00:00 2001 From: Ken Struys Date: Thu, 13 Mar 2014 17:38:16 -0700 Subject: [PATCH] fixing build --- .travis.yml | 5 +++++ tests/conftest.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6e98e9d5..976fde03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,3 +6,8 @@ python: install: pip install virtualenv script: make + + +before_install: + - git config --global user.name "Travis CI" + - git config --global user.email "user@example.com" diff --git a/tests/conftest.py b/tests/conftest.py index 30cdf8ab..377a7bb5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,7 +14,7 @@ def empty_git_dir(tmpdir): def add_and_commit(): local['git']['add', '.']() - local['git']['commit', '-m', 'random commit', '--author', 'A U Thor ']() + local['git']['commit', '-m', 'random commit']() @pytest.yield_fixture