From 06a14a367bb90168087d2cf6102d993aa659e6a7 Mon Sep 17 00:00:00 2001 From: Nick Maludy Date: Tue, 21 Jul 2020 11:18:12 -0400 Subject: [PATCH 1/2] Use upstream codecov instead of our own fork --- CHANGELOG.rst | 1 + scripts/travis/submit-codecov-coverage.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c3cd7089df..91c05d3087 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -55,6 +55,7 @@ Removed * Removed ``CentOS 6``/``RHEL 6`` support #4984 Contributed by Amanda McGuinness (@amanda11 Ammeon Solutions) +* Removed our fork of ``codecov-python`` and have switched back to the upstream version 3.2.0 - April 27, 2020 ---------------------- diff --git a/scripts/travis/submit-codecov-coverage.sh b/scripts/travis/submit-codecov-coverage.sh index 0452e860a5..6bc160b72f 100755 --- a/scripts/travis/submit-codecov-coverage.sh +++ b/scripts/travis/submit-codecov-coverage.sh @@ -19,7 +19,9 @@ if [ ${TRAVIS_TEST_RESULT} -eq 0 ]; then # NOTE: We need eventlet installed so coverage can be correctly combined. This is needed because we are covering code which utilizes eventlet. # Without eventlet being available to the coverage command it will fail with "Couldn't trace with concurrency=eventlet, the module isn't installed." pip install eventlet - pip install -e "git+https://github.com/StackStorm/codecov-python.git@better_error_output#egg=codecov" + # NOTE: codecov only supports coverage==4.5.2 + pip install coverage<5.0 + pip install codecov # 2. Combine coverage report and submit coverage report to codecovs.io codecov --required From 2b977e40394fd716e1af0659aad6bd0be98dfb4b Mon Sep 17 00:00:00 2001 From: Nick Maludy Date: Thu, 23 Jul 2020 08:33:48 -0400 Subject: [PATCH 2/2] Update CHANGELOG.rst Co-authored-by: Eugen C. --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 91c05d3087..d58affb614 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -55,7 +55,7 @@ Removed * Removed ``CentOS 6``/``RHEL 6`` support #4984 Contributed by Amanda McGuinness (@amanda11 Ammeon Solutions) -* Removed our fork of ``codecov-python`` and have switched back to the upstream version +* Removed our fork of ``codecov-python`` for CI and have switched back to the upstream version (improvement) #5002 3.2.0 - April 27, 2020 ----------------------