summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2018-12-15 09:12:13 -0800
committerJeff Forcier <jeff@bitprophet.org>2018-12-15 09:12:13 -0800
commit26fad8064190fe2620a7ac2fc02dd39a40cc8d02 (patch)
tree64147291a0e548a6c3f1b5a4be752a65d2878cab
parentbcdf37ea9ce8a8e07aa17a4f690630fc48d3690d (diff)
parent2584ab7540364a520285af4844b1eb2caf65b74b (diff)
Merge branch '2.0' into 2.1
-rw-r--r--.travis.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index d002950f..24511c8d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,12 +36,14 @@ install:
# downgrading/overriding.
- "if [[ $CRYPTO == '1.1' ]]; then pip install 'cryptography<1.2'; fi"
- "if [[ $CRYPTO == '1.5' ]]; then pip install 'cryptography<1.6'; fi"
- # Self-install for setup.py-driven deps
- - pip install -e .
# Dev (doc/test running) requirements
# TODO: use pipenv + whatever contexty-type stuff it has
- pip install codecov # For codecov specifically
- pip install -r dev-requirements.txt
+ # Self-install for setup.py-driven deps. Comes after dev-requirements so that
+ # is able to 'pre-pin' certain libs to lower versions (eg for py2.6 support
+ # on Paramiko <2.4).
+ - pip install -e .
script: |
# NOTE: the below hilarity should only exist in 2.0-2.3, 2.4+ should've gone
# back to vague normalcy!