summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-06-15 10:23:54 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-06-15 10:23:54 -0700
commit842caba00262a81975cbfd186b846c83f72354e3 (patch)
tree5adad24d5c751c7e49a67217615e76fd56b0ec09
parent5bc431b2a69d8e325f00ecf199c6ea76a313b176 (diff)
parentb8768b2a30597fad033cc8cf6fe12d6a9b9fc569 (diff)
downloadparamiko-842caba00262a81975cbfd186b846c83f72354e3.tar.gz
Merge branch '2.2'
-rw-r--r--.travis.yml2
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 .