summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-11-07 13:47:11 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-11-07 13:47:11 -0800
commit6908c832f4b876ef5e9a8ebf07299c32f73696a7 (patch)
tree60e79801e7de7111a340210414a526851cda6489
parent17286cf21b868b6971c964f9415d14157bbc961b (diff)
parent899434caf5d443209831b761baa3e63d04101e43 (diff)
Merge branch '2.2' into 2.3
-rw-r--r--.travis.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 3d328ada..7f44f384 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,8 @@ python:
- "pypy-5.6.0"
install:
# Ensure modern pip/etc on Python 3.3 workers (not sure WTF, but, eh)
- - pip install pip==9.0.1
+ - pip install pip==9.0.1 setuptools==36.6.0
+ - pip freeze
# Self-install for setup.py-driven deps
- pip install -e .
# Dev (doc/test running) requirements