diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-09 19:09:05 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-09 19:09:05 -0600 |
| commit | 588b0acac807f4aaa6da564be7f0363626415d4b (patch) | |
| tree | edb7131a6f11a5ef525c77a583ceaaa19e2119a6 /.travis | |
| parent | 79a230f81ff702d590ebc36169dc11392019839f (diff) | |
| parent | 3d5913d223ecac8e130c8b2a8fcb25a715f57f3b (diff) | |
| download | cryptography-588b0acac807f4aaa6da564be7f0363626415d4b.tar.gz cryptography-588b0acac807f4aaa6da564be7f0363626415d4b.tar.bz2 cryptography-588b0acac807f4aaa6da564be7f0363626415d4b.zip | |
Merge branch 'master' into common-crypto-binding
* master:
temporary workaround for travis-ci bug
Style nit
easy_install is awful, don't use it
Simplify the authors section
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/install.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index d25ed941..8d6840f2 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -15,12 +15,14 @@ if [[ "$(uname -s)" == "Darwin" ]]; then if which pyenv > /dev/null; then eval "$(pyenv init -)"; fi case "${TOX_ENV}" in py26) - sudo easy_install pip + curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py + sudo python get-pip.py sudo pip install setuptools --no-use-wheel --upgrade sudo pip install virtualenv ;; py27) - sudo easy_install pip + curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py + sudo python get-pip.py sudo pip install setuptools --no-use-wheel --upgrade sudo pip install virtualenv ;; |