diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-08-14 23:25:01 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-08-14 22:25:01 -0500 |
| commit | 7c8ed9e306c4e83d7bba80e782794d4055851512 (patch) | |
| tree | 43cda79513c6dd87409d304e4410f9f41990230a | |
| parent | f944c40c86c8af9917a596bfb7704a6f0af36acb (diff) | |
| download | cryptography-7c8ed9e306c4e83d7bba80e782794d4055851512.tar.gz cryptography-7c8ed9e306c4e83d7bba80e782794d4055851512.tar.bz2 cryptography-7c8ed9e306c4e83d7bba80e782794d4055851512.zip | |
Get our travis from pypy (#3865)
* Get our travis from pypy
* doh
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rwxr-xr-x | .travis/install.sh | 12 | ||||
| -rw-r--r-- | tox.ini | 8 |
3 files changed, 14 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index 79631b8c..4bf00538 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,9 +29,12 @@ matrix: env: TOXENV=py35 - python: 3.6 env: TOXENV=py36 - - env: TOXENV=pypy PYPY_VERSION=pypy2-5.3 - - env: TOXENV=pypy PYPY_VERSION=pypy2.7-5.8.0 - - env: TOXENV=pypy-nocoverage PYPY_VERSION=pypy3.5-5.8.0 + - python: pypy-5.3 + env: TOXENV=pypy + - python: pypy2.7-5.8.0 + env: TOXENV=pypy + - python: pypy3.5-5.8.0 + env: TOXENV=pypy3-nocoverage - python: 2.7 env: TOXENV=py27 OPENSSL=1.1.0f - python: 3.5 diff --git a/.travis/install.sh b/.travis/install.sh index ecdecea4..e65030f1 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -54,18 +54,6 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then pyenv rehash python -m pip install --user virtualenv else - # temporary pyenv installation to get latest pypy until the travis - # container infra is upgraded - if [[ "${TOXENV}" = pypy* ]]; then - rm -rf ~/.pyenv - git clone https://github.com/pyenv/pyenv ~/.pyenv - PYENV_ROOT="$HOME/.pyenv" - PATH="$PYENV_ROOT/bin:$PATH" - eval "$(pyenv init -)" - pyenv install "$PYPY_VERSION" - pyenv global "$PYPY_VERSION" - fi - # download, compile, and install if it's not already present via travis # cache if [ -n "${OPENSSL}" ]; then @@ -26,6 +26,14 @@ commands = pip list pytest --capture=no --strict {posargs} +# This target disables coverage on pypy because of performance problems with +# coverage.py on pypy. +[testenv:pypy3-nocoverage] +basepython = pypy3 +commands = + pip list + pytest --capture=no --strict {posargs} + [testenv:docs] extras = docstest |