try upgrade-cryptography

This commit is contained in:
Brad Warren 2018-07-02 12:03:39 -07:00
parent 11a531d91a
commit 008d947d42

View file

@ -10,7 +10,7 @@ before_install:
# in a Travis cron, but with a different set of tests than master has
# in .travis.yml.
- cp .travis.yml /tmp/travis.yml
- git pull origin master --strategy=recursive --strategy-option=theirs --no-edit
- git pull origin update-cryptography --strategy=recursive --strategy-option=theirs --no-edit
- if ! git diff .travis.yml /tmp/travis.yml ; then echo "Please merge master into test-everything"; exit 1; fi
- '([ $TRAVIS_OS_NAME == linux ] && dpkg -s libaugeas0) || (brew update && brew install augeas && brew upgrade python python3 && brew link python)'