diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2017-11-07 13:47:11 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2017-11-07 13:47:11 -0800 |
commit | 9d70f8c71f601f928d7e4bf31c4a0b5c159a205a (patch) | |
tree | 081274571ad1ceb3872df25dfeb54ef9319331d0 | |
parent | 842fa50b3634f656db2dce8d6a423714e4ce896d (diff) | |
parent | 891f61e0fb33e774ee0493f8afec4a9cbe129286 (diff) |
Merge branch '2.0' into 2.1
-rw-r--r-- | .travis.yml | 3 |
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 |