diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2019-05-31 16:19:40 -0400 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2019-05-31 16:19:40 -0400 |
commit | c51d7c8c3c3494bc1fa8be990ffa816b2d59fd3a (patch) | |
tree | 7c5a11bf838570eb1d51c289c9994b0f41cd7403 | |
parent | 8763ebaf635f3729362fb925388b55c20ae381d7 (diff) | |
parent | fe682a4175b3d03233a162f2a7daf57d8ffe8e54 (diff) |
Merge branch '2.3' into 2.4
-rw-r--r-- | .travis.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 772ff5be..d63d001d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,17 +17,17 @@ matrix: # to whatever the latest default is. include: - python: 2.7 - env: "CRYPTO_BEFORE=1.6" + env: "OLDEST_CRYPTO=1.5" - python: 3.6 - env: "CRYPTO_BEFORE=1.6" + env: "OLDEST_CRYPTO=1.5" install: # Ensure modern pip/etc to avoid some issues w/ older worker environs - pip install pip==9.0.1 setuptools==36.6.0 # Grab a specific version of Cryptography if desired. Doing this before other # installations ensures we don't have to do any downgrading/overriding. - | - if [[ -n "$CRYPTO_BEFORE" ]]; then - pip install "cryptography<${CRYPTO_BEFORE}" + if [[ -n "$OLDEST_CRYPTO" ]]; then + pip install "cryptography==${OLDEST_CRYPTO}" fi # Self-install for setup.py-driven deps - pip install -e . |