aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-11-01 10:03:30 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2016-01-03 21:10:23 -0600
commit667700354c2b59ed6ab4f917d4ee834412404aec (patch)
treeb98a5a15e542a31764d8fcc6200e148769acdc81
parenta7fcdb4d209ec24f1acfaa802963085bc43c2a58 (diff)
downloadcryptography-667700354c2b59ed6ab4f917d4ee834412404aec.tar.gz
cryptography-667700354c2b59ed6ab4f917d4ee834412404aec.tar.bz2
cryptography-667700354c2b59ed6ab4f917d4ee834412404aec.zip
Attempt to enable coverage on pypy
-rwxr-xr-x.travis/upload_coverage.sh2
-rw-r--r--tox.ini8
2 files changed, 1 insertions, 9 deletions
diff --git a/.travis/upload_coverage.sh b/.travis/upload_coverage.sh
index 113dbef8..d5f9027e 100755
--- a/.travis/upload_coverage.sh
+++ b/.travis/upload_coverage.sh
@@ -3,7 +3,7 @@
set -e
set -x
-NO_COVERAGE_TOXENVS=(pypy pypy3 pep8 py3pep8 docs)
+NO_COVERAGE_TOXENVS=(pypy3 pep8 py3pep8 docs)
if ! [[ "${NO_COVERAGE_TOXENVS[*]}" =~ "${TOXENV}" ]]; then
source ~/.venv/bin/activate
codecov --env TRAVIS_OS_NAME,TOXENV,OPENSSL
diff --git a/tox.ini b/tox.ini
index 63f1e4bd..9ce86e4f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,14 +46,6 @@ basepython = python2.7
commands =
sphinx-build -W -b linkcheck docs docs/_build/html
-# Temporarily disable coverage on pypy because of performance problems with
-# coverage.py on pypy.
-[testenv:pypy]
-commands =
- pip list
- python -c "from cryptography.hazmat.backends.openssl.backend import backend; print(backend.openssl_version_text())"
- py.test --capture=no --strict {posargs}
-
# Temporarily disable coverage on pypy3 because of performance problems with
# coverage.py on pypy3.
[testenv:pypy3]