From 1d5973e69cc5b464d67e8a03c9cdfa31faf38d0e Mon Sep 17 00:00:00 2001 From: Thomas Schultz Date: Mon, 20 Jun 2016 16:23:48 -0400 Subject: [PATCH 1/4] Switch to codecov.io closes #1872 --- .travis.yml | 2 +- README.rst | 4 ++-- tox.ini | 17 +++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 675a063c64ea..3771f99c5e48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ script: - scripts/update_docs.sh after_success: - - tox -e coveralls + - tox -e codecov deploy: provider: pypi diff --git a/README.rst b/README.rst index 0cab79fee119..6cf9cb83f99b 100644 --- a/README.rst +++ b/README.rst @@ -212,8 +212,8 @@ Apache 2.0 - See `LICENSE`_ for more information. .. |build| image:: https://travis-ci.org/GoogleCloudPlatform/gcloud-python.svg?branch=master :target: https://travis-ci.org/GoogleCloudPlatform/gcloud-python -.. |coverage| image:: https://coveralls.io/repos/GoogleCloudPlatform/gcloud-python/badge.png?branch=master - :target: https://coveralls.io/r/GoogleCloudPlatform/gcloud-python?branch=master +.. |coverage| image:: http://codecov.io/github/googlecloudplatform/gcloud-python/coverage.svg?branch=master + :target: https://codecov.io/github/googlecloudplatform/gcloud-python .. |pypi| image:: https://img.shields.io/pypi/v/gcloud.svg :target: https://pypi.python.org/pypi/gcloud .. |versions| image:: https://img.shields.io/pypi/pyversions/gcloud.svg diff --git a/tox.ini b/tox.ini index 4d01e63b5d72..6592fca3b06b 100644 --- a/tox.ini +++ b/tox.ini @@ -61,18 +61,19 @@ deps = setenv = PYTHONPATH = -[testenv:coveralls] -basepython = {[testenv:cover]basepython} -commands = - pip install gcloud[grpc] - {[testenv]covercmd} - coveralls +[testenv:codecov] +basepython = + {[testenv:cover]basepython} +passenv = + CI TRAVIS_* deps = {[testenv:cover]deps} - coveralls + codecov>=1.4.0 +commands = + {[testenv:cover]commands} + codecov setenv = PYTHONPATH = -passenv = {[testenv:system-tests]passenv} [testenv:docs] basepython = From 8967379d188700b200e7b9efd127c148d7156d3c Mon Sep 17 00:00:00 2001 From: Thomas Schultz Date: Mon, 20 Jun 2016 18:28:56 -0400 Subject: [PATCH 2/4] Update badge url. --- README.rst | 4 ++-- tox.ini | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 6cf9cb83f99b..c0c7eadba66e 100644 --- a/README.rst +++ b/README.rst @@ -212,8 +212,8 @@ Apache 2.0 - See `LICENSE`_ for more information. .. |build| image:: https://travis-ci.org/GoogleCloudPlatform/gcloud-python.svg?branch=master :target: https://travis-ci.org/GoogleCloudPlatform/gcloud-python -.. |coverage| image:: http://codecov.io/github/googlecloudplatform/gcloud-python/coverage.svg?branch=master - :target: https://codecov.io/github/googlecloudplatform/gcloud-python +.. |coverage| image:: https://codecov.io/gh/GoogleCloudPlatform/gcloud-python/branch/master/graph/badge.svg + :target: https://codecov.io/gh/GoogleCloudPlatform/gcloud-python .. |pypi| image:: https://img.shields.io/pypi/v/gcloud.svg :target: https://pypi.python.org/pypi/gcloud .. |versions| image:: https://img.shields.io/pypi/pyversions/gcloud.svg diff --git a/tox.ini b/tox.ini index 6592fca3b06b..6aa190ff55dd 100644 --- a/tox.ini +++ b/tox.ini @@ -65,7 +65,15 @@ setenv = basepython = {[testenv:cover]basepython} passenv = - CI TRAVIS_* + CI + TRAVIS_BUILD_ID + TRAVIS + TRAVIS_BRANCH + TRAVIS_JOB_NUMBER + TRAVIS_PULL_REQUEST + TRAVIS_JOB_ID + TRAVIS_REPO_SLUG + TRAVIS_COMMIT deps = {[testenv:cover]deps} codecov>=1.4.0 From d6db37b965a7f24fc25974d167a50c3877c7428a Mon Sep 17 00:00:00 2001 From: Thomas Schultz Date: Mon, 20 Jun 2016 20:00:07 -0400 Subject: [PATCH 3/4] Add codecov.yml to trigger status check. Change codecov settings. --- codecov.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 codecov.yml diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 000000000000..2bfc815b8319 --- /dev/null +++ b/codecov.yml @@ -0,0 +1,9 @@ +comment: false +coverage: + status: + patch: + default: + target: '100' + project: + default: + target: '100' From 58cdf26c67af3ca76e90dc31f69e22010cf0f316 Mon Sep 17 00:00:00 2001 From: Thomas Schultz Date: Thu, 14 Jul 2016 11:54:29 -0400 Subject: [PATCH 4/4] Add coveralls back while testing codecov. --- .travis.yml | 1 + tox.ini | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3771f99c5e48..a60dcd35a199 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ script: - scripts/update_docs.sh after_success: + - tox -e coveralls - tox -e codecov deploy: diff --git a/tox.ini b/tox.ini index 6aa190ff55dd..e88d2f3fb3bf 100644 --- a/tox.ini +++ b/tox.ini @@ -61,6 +61,19 @@ deps = setenv = PYTHONPATH = +[testenv:coveralls] +basepython = {[testenv:cover]basepython} +commands = + pip install gcloud[grpc] + {[testenv]covercmd} + coveralls +deps = + {[testenv:cover]deps} + coveralls +setenv = + PYTHONPATH = +passenv = {[testenv:system-tests]passenv} + [testenv:codecov] basepython = {[testenv:cover]basepython}