aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2018-09-04 09:45:17 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2018-09-04 10:45:17 -0400
commit636ad6052ef0d51dc55ae4dc2b38af15d06ea220 (patch)
treefed22b25d102facb25d25a106e86c8af9a265a9d
parent26c425dd74d941b0d010325f8f150d898585a015 (diff)
downloadcryptography-636ad6052ef0d51dc55ae4dc2b38af15d06ea220.tar.gz
cryptography-636ad6052ef0d51dc55ae4dc2b38af15d06ea220.tar.bz2
cryptography-636ad6052ef0d51dc55ae4dc2b38af15d06ea220.zip
unpin coverage (#4458)
of course, if this works it might just be luck
-rwxr-xr-x.travis/install.sh4
-rw-r--r--Jenkinsfile6
-rw-r--r--tox.ini2
3 files changed, 6 insertions, 6 deletions
diff --git a/.travis/install.sh b/.travis/install.sh
index 4dc9301e..0aecb2bd 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -49,5 +49,5 @@ pip install virtualenv
python -m virtualenv ~/.venv
source ~/.venv/bin/activate
-# This coverage pin must be kept in sync with tox.ini
-pip install tox codecov coverage==4.3.4
+# If we pin coverage it must be kept in sync with tox.ini and Jenkinsfile
+pip install tox codecov coverage
diff --git a/Jenkinsfile b/Jenkinsfile
index 26a46f19..f89728f3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -196,7 +196,7 @@ def build(toxenv, label, imageName, artifacts, artifactExcludes) {
virtualenv .codecov
call .codecov/Scripts/activate
REM this pin must be kept in sync with tox.ini
- pip install coverage==4.3.4
+ pip install coverage
pip install codecov
codecov -e JOB_BASE_NAME,LABEL,TOXENV
"""
@@ -215,7 +215,7 @@ def build(toxenv, label, imageName, artifacts, artifactExcludes) {
virtualenv .venv
source .venv/bin/activate
# This pin must be kept in sync with tox.ini
- pip install coverage==4.3.4
+ pip install coverage
bash <(curl -s https://codecov.io/bash) -e JOB_BASE_NAME,LABEL,TOXENV
"""
}
@@ -228,7 +228,7 @@ def build(toxenv, label, imageName, artifacts, artifactExcludes) {
virtualenv .venv
source .venv/bin/activate
# This pin must be kept in sync with tox.ini
- pip install coverage==4.3.4
+ pip install coverage
bash <(curl -s https://codecov.io/bash) -e JOB_BASE_NAME,LABEL,TOXENV,IMAGE_NAME
"""
}
diff --git a/tox.ini b/tox.ini
index cb882a8a..a6227c0f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ extras =
test
deps =
# This must be kept in sync with Jenkinsfile and .travis/install.sh
- coverage==4.3.4
+ coverage
./vectors
passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH USERNAME
commands =