diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-06-15 10:23:54 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-06-15 10:23:54 -0700 |
| commit | 9969ad493a1a95420039fdd597f47932d9f83ea8 (patch) | |
| tree | 87837a529e700af87db688f81558ac8ac244e8f3 | |
| parent | 6ba72bca1047b6ed484f27e6adfbfce2f0909eb5 (diff) | |
| parent | 853a37f5a47ce1b0a9719e8e201e0ee48207631e (diff) | |
Merge branch '2.0' into 2.1
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 7ca8db09..0e46ec84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ python: - "3.4" - "3.5" - "3.6" - - "pypy-5.4.1" + - "pypy-5.6.0" install: # Self-install for setup.py-driven deps - pip install -e . |