summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-11-07 13:48:30 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-11-07 13:48:30 -0800
commit88ef01885315176a73320e5dc858f05d89e7797d (patch)
tree52d343666f354576ef14dedd13ceedd6a522c19a
parentf6719400e8da079b4ce1a425c1a87b91ca018fe1 (diff)
parentf324c83eba454d06d43bfd2e6fd4a52f1d6e04f4 (diff)
Merge branch '2.3'
-rw-r--r--.travis.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index f41c9777..77b5cfce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,8 @@ python:
- "3.7-dev"
- "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 setuptools==36.6.0
# Self-install for setup.py-driven deps
- pip install -e .
# Dev (doc/test running) requirements