diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-19 14:33:18 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-19 14:33:18 -0800 |
| commit | 5f08308ffd13e952d65f780f6f9b74379d8b868a (patch) | |
| tree | 5aa37f26527a6ea081d34fa8fb310d5e0389752b /.travis.yml | |
| parent | 51cafed29a8b87f58718f55a449a8c4e499addb4 (diff) | |
| parent | 964cb2f122c5cb6776177f099d1d8cdebd849812 (diff) | |
Merge branch '1.18' into 2.0
# Conflicts:
# sites/www/changelog.rst
# tox-requirements.txt
# tox.ini
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 3b7b2b42..af32ba7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ python: - "3.3" - "3.4" - "3.5" + - "pypy-5.4.1" install: # Self-install for setup.py-driven deps - pip install -e . |