diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-01-30 22:05:37 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-02-04 09:52:27 +0100 |
| commit | 97c2530f90e8ddf0b36539408372f21f5964e9bb (patch) | |
| tree | 2e0db0f2b825cffcb9f64476758415e4f50eb9b3 | |
| parent | ef7b4f56aff3251fd5ae69f5406c17816f5fd558 (diff) | |
| download | mitmproxy-97c2530f90e8ddf0b36539408372f21f5964e9bb.tar.gz mitmproxy-97c2530f90e8ddf0b36539408372f21f5964e9bb.tar.bz2 mitmproxy-97c2530f90e8ddf0b36539408372f21f5964e9bb.zip | |
allow pypy on travis
| -rw-r--r-- | .travis.yml | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 9091887a..2545899c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,6 @@ matrix: fast_finish: true include: - python: 2.7 - - language: generic - os: osx - osx_image: xcode7.1 - python: 2.7 env: OPENSSL=1.0.2 addons: @@ -18,9 +15,6 @@ matrix: - debian-sid packages: - libssl-dev - - python: 2.7 - env: DOCS=1 - script: 'cd docs && make html' - python: pypy - python: pypy env: OPENSSL=1.0.2 @@ -32,10 +26,12 @@ matrix: - debian-sid packages: - libssl-dev - allow_failures: - # We allow pypy to fail until Travis fixes their infrastructure to a pypy - # with a recent enought CFFI library to run cryptography 1.0+. - - python: pypy + - language: generic + os: osx + osx_image: xcode7.1 + - python: 2.7 + env: DOCS=1 + script: 'cd docs && make html' install: - | |