From cb175069bfa921503d79f12399948173bf247779 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Sat, 3 Jun 2017 08:26:56 -1000
Subject: revert codecov.yml workaround and pin coverage to 4.3.4 (#3662)

* Revert "Attempted workaround for intermittent coverage issues (#3661)"

This reverts commit 84a634c1e7645970382a3a271dfae9ef95685e7a.

* pin coverage to 4.3.4
---
 .travis/install.sh | 2 +-
 Jenkinsfile        | 5 +++--
 codecov.yml        | 9 ---------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index 3b6de00d..6b66f5bf 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -89,4 +89,4 @@ fi
 
 python -m virtualenv ~/.venv
 source ~/.venv/bin/activate
-pip install tox codecov
+pip install tox codecov coverage==4.3.4
diff --git a/Jenkinsfile b/Jenkinsfile
index 29f9a767..36cc0091 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -238,6 +238,7 @@ def build(toxenv, label, imageName, artifacts, artifactExcludes) {
                             IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
                             virtualenv .codecov
                             call .codecov/Scripts/activate
+                            pip install coverage==4.3.4
                             pip install codecov
                             codecov -e JOB_BASE_NAME,LABEL
                         """
@@ -255,7 +256,7 @@ def build(toxenv, label, imageName, artifacts, artifactExcludes) {
                                     tox -r --  --color=yes
                                 virtualenv .venv
                                 source .venv/bin/activate
-                                pip install coverage
+                                pip install coverage==4.3.4
                                 bash <(curl -s https://codecov.io/bash) -e JOB_BASE_NAME,LABEL
                             """
                         }
@@ -274,7 +275,7 @@ def build(toxenv, label, imageName, artifacts, artifactExcludes) {
                                 fi
                                 virtualenv .venv
                                 source .venv/bin/activate
-                                pip install coverage
+                                pip install coverage==4.3.4
                                 bash <(curl -s https://codecov.io/bash) -e JOB_BASE_NAME,LABEL
                             """
                         }
diff --git a/codecov.yml b/codecov.yml
index 02362798..2bfc815b 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -7,12 +7,3 @@ coverage:
         project:
             default:
                 target: '100'
-
-# Workaround for
-# https://bitbucket.org/ned/coveragepy/issues/578/incomplete-file-path-in-xml-report
-fixes:
-    # Label all the files with a `tests/` prefix.
-    - "::tests/"
-    # Move things with a `tests/src/cryptography` prefix back to
-    # `src/cryptography/`
-    - "tests/src/cryptography/::src/cryptography/"
-- 
cgit v1.2.3