diff options
| author | Donald Stufft <donald@stufft.io> | 2015-06-09 18:31:12 -0400 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2015-06-09 18:31:12 -0400 |
| commit | 717cfc6ac05fbd83adc639a7bbd5111fdfa792ec (patch) | |
| tree | 77c9e735188e14699619d418db882d26c240f559 /.travis | |
| parent | 72025dbad1e02a01fefad1be7df5c843c1c98983 (diff) | |
| download | pip-717cfc6ac05fbd83adc639a7bbd5111fdfa792ec.tar.gz | |
Don't run diff-cover anymore
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/install.sh | 2 | ||||
| -rwxr-xr-x | .travis/run.sh | 18 |
2 files changed, 1 insertions, 19 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index e36014e9e..467db6dbc 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -6,7 +6,7 @@ git config --global user.email "pypa-dev@googlegroups.com" git config --global user.name "pip" pip install --upgrade setuptools -pip install coverage diff_cover tox +pip install --upgrade tox # If we're running under Python 3.5, then we need to actually go and install # Python 3.5. diff --git a/.travis/run.sh b/.travis/run.sh index 4e3f6b896..ba0b9574e 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -47,21 +47,3 @@ tox -- -m unit --cov pip/ --cov-report xml $TOXARGS # long as we continue to run the unit tests first and in a seperate step # then this should work fine. tox -- -m integration -n 8 $TOXARGS - -if [[ $TRAVIS_PULL_REQUEST != "false" ]] -then - # If this is a pull request then run our diff-cover to get the difference - # in coverage that this PR introduces - if [ -f coverage.xml ] - then - git fetch origin $TRAVIS_BRANCH:refs/remotes/origin/$TRAVIS_BRANCH - diff-cover --compare-branch=origin/$TRAVIS_BRANCH coverage.xml - fi -else - # If this is not a PR, but is being run against a branch, then just report - # the coverage results for the entire code base. - if [ -f .coverage ] - then - coverage report -m - fi -fi |