aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2017-06-03 08:26:56 -1000
committerAlex Gaynor <alex.gaynor@gmail.com>2017-06-03 14:26:56 -0400
commitcb175069bfa921503d79f12399948173bf247779 (patch)
tree3050269701e5e66e62463411281bb7daa736906a
parent84a634c1e7645970382a3a271dfae9ef95685e7a (diff)
downloadcryptography-cb175069bfa921503d79f12399948173bf247779.tar.gz
cryptography-cb175069bfa921503d79f12399948173bf247779.tar.bz2
cryptography-cb175069bfa921503d79f12399948173bf247779.zip
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
-rwxr-xr-x.travis/install.sh2
-rw-r--r--Jenkinsfile5
-rw-r--r--codecov.yml9
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/"