diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-09 13:54:31 -0800 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-09 13:54:31 -0800 |
| commit | 5b721884d70d110c405aa10cdfae667eccd81f81 (patch) | |
| tree | c176eaa239b7917d8cd4847845ed0aad1084a7de | |
| parent | e450f3f0629d57e51d995392732fa1634a1891e7 (diff) | |
| parent | 4af88912575473a02c590680ff25402a87a3b758 (diff) | |
| download | cryptography-5b721884d70d110c405aa10cdfae667eccd81f81.tar.gz cryptography-5b721884d70d110c405aa10cdfae667eccd81f81.tar.bz2 cryptography-5b721884d70d110c405aa10cdfae667eccd81f81.zip | |
Merge pull request #443 from alex/no-easy-install
easy_install is awful, don't use it
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | .travis/install.sh | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 92ee221b..d28fef5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ install: - ./.travis/install.sh script: - - if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)";fi && source ~/.venv/bin/activate && tox -e $TOX_ENV + - if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)"; fi && source ~/.venv/bin/activate && tox -e $TOX_ENV after_success: - coveralls 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 ;; |