diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-01-04 22:42:11 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-01-04 22:42:11 -0500 |
| commit | 262dd383ab1dcc7f98ea0e7ae0a0fa297500312c (patch) | |
| tree | aa2b29c654ce690951107530ff42191ae814f373 | |
| parent | dd74a12711b96eb508f0bb563cd1774b5b3b4ceb (diff) | |
| parent | 11f9f1374bb0c74cd2c34f1d92b28d2e382903e7 (diff) | |
| download | cryptography-262dd383ab1dcc7f98ea0e7ae0a0fa297500312c.tar.gz cryptography-262dd383ab1dcc7f98ea0e7ae0a0fa297500312c.tar.bz2 cryptography-262dd383ab1dcc7f98ea0e7ae0a0fa297500312c.zip | |
Merge pull request #2638 from reaperhulk/travis-pypy
Travis PyPy coverage
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | .travis/install.sh | 4 | ||||
| -rwxr-xr-x | .travis/upload_coverage.sh | 15 | ||||
| -rw-r--r-- | tox.ini | 13 |
4 files changed, 16 insertions, 18 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/install.sh b/.travis/install.sh index 499233d7..f163f217 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -35,7 +35,7 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then pyenv install 3.5.1 pyenv global 3.5.1 ;; - pypy) + pypy*) pyenv install pypy-4.0.1 pyenv global pypy-4.0.1 ;; @@ -53,7 +53,7 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then else # temporary pyenv installation to get latest pypy before container infra upgrade # now using the -latest because of a segfault bug we're encountering in 2.6.1 - if [[ "${TOXENV}" == "pypy" ]]; then + if [[ "${TOXENV}" = pypy* ]]; then git clone https://github.com/yyuu/pyenv.git ~/.pyenv PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/bin:$PATH" diff --git a/.travis/upload_coverage.sh b/.travis/upload_coverage.sh index 113dbef8..5790e954 100755 --- a/.travis/upload_coverage.sh +++ b/.travis/upload_coverage.sh @@ -3,8 +3,13 @@ set -e set -x -NO_COVERAGE_TOXENVS=(pypy pypy3 pep8 py3pep8 docs) -if ! [[ "${NO_COVERAGE_TOXENVS[*]}" =~ "${TOXENV}" ]]; then - source ~/.venv/bin/activate - codecov --env TRAVIS_OS_NAME,TOXENV,OPENSSL -fi +case "${TOXENV}" in + pypy-nocoverage);; + pep8);; + py3pep8);; + docs);; + *) + source ~/.venv/bin/activate + codecov --env TRAVIS_OS_NAME,TOXENV,OPENSSL + ;; +esac @@ -46,17 +46,10 @@ basepython = python2.7 commands = sphinx-build -W -b linkcheck docs docs/_build/html -# Temporarily disable coverage on pypy because of performance problems with +# This target disables 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] +[testenv:pypy-nocoverage] +basepython = pypy commands = pip list python -c "from cryptography.hazmat.backends.openssl.backend import backend; print(backend.openssl_version_text())" |