aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2013-09-12 10:27:20 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2013-09-12 10:27:20 -0700
commitb3137ff089f1750e1a5da003aecbbf0aeba63890 (patch)
treebc0edec39540d022c40f3412dafa8f9033f8ca65
parentdd3c783d59010faddb1cbc1d2d16e5792b913ecf (diff)
parentccf8871e2865ee472741f8fb653eb91919281c74 (diff)
downloadcryptography-b3137ff089f1750e1a5da003aecbbf0aeba63890.tar.gz
cryptography-b3137ff089f1750e1a5da003aecbbf0aeba63890.tar.bz2
cryptography-b3137ff089f1750e1a5da003aecbbf0aeba63890.zip
Merge pull request #62 from dstufft/test-pypy
Enable testing on PyPy
-rw-r--r--.travis.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 24a3a4dc..defcd77b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,16 @@ env:
- TOX_ENV=py27
- TOX_ENV=py32
- TOX_ENV=py33
+ - TOX_ENV=pypy
- TOX_ENV=docs
- TOX_ENV=pep8
install:
+ - "[[ ${TOX_ENV} == pypy ]] && sudo add-apt-repository -y ppa:pypy/ppa || true"
+ - "[[ ${TOX_ENV} == pypy ]] && sudo apt-get -y update && sudo apt-get -y install pypy || true"
+ # This is required because we need to get rid of the Travis installed PyPy
+ # or it'll take precedence over the PPA installed one.
+ - "[[ ${TOX_ENV} == pypy ]] && sudo rm -rf /usr/local/pypy/bin || true"
- pip install tox coveralls
script: