diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-01-03 21:09:22 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-01-03 21:10:59 -0600 |
| commit | 1dafc3f9b6e7f2743d1acad876a960c9d6885a80 (patch) | |
| tree | dbd11c54aab763b190139988c879370d4513ef3e | |
| parent | cfd90a268cfd92afa0c820ef276c3a7ecbc4bc05 (diff) | |
| download | cryptography-1dafc3f9b6e7f2743d1acad876a960c9d6885a80.tar.gz cryptography-1dafc3f9b6e7f2743d1acad876a960c9d6885a80.tar.bz2 cryptography-1dafc3f9b6e7f2743d1acad876a960c9d6885a80.zip | |
add a pypy-nocoverage target and use that on OS X
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | .travis/upload_coverage.sh | 2 | ||||
| -rw-r--r-- | tox.ini | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 4a50987a..b45a4d42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,7 @@ matrix: - language: generic os: osx osx_image: xcode7.1 - env: TOXENV=pypy CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 + env: TOXENV=pypy-nocoverage CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 - language: generic os: osx osx_image: xcode7.1 diff --git a/.travis/upload_coverage.sh b/.travis/upload_coverage.sh index 1a3fd4c4..e7a2e51d 100755 --- a/.travis/upload_coverage.sh +++ b/.travis/upload_coverage.sh @@ -3,7 +3,7 @@ set -e set -x -NO_COVERAGE_TOXENVS=(pep8 py3pep8 docs) +NO_COVERAGE_TOXENVS=(pypy-nocoverage pep8 py3pep8 docs) if ! [[ "${NO_COVERAGE_TOXENVS[*]}" =~ "${TOXENV}" ]]; then source ~/.venv/bin/activate codecov --env TRAVIS_OS_NAME,TOXENV,OPENSSL @@ -46,6 +46,14 @@ basepython = python2.7 commands = sphinx-build -W -b linkcheck docs docs/_build/html +# This target disables coverage on pypy because of performance problems with +# coverage.py on pypy. +[testenv:pypy-nocoverage] +commands = + pip list + python -c "from cryptography.hazmat.backends.openssl.backend import backend; print(backend.openssl_version_text())" + py.test --capture=no --strict {posargs} + [testenv:pep8] deps = flake8 |