aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2014-01-20 20:47:16 -0800
committerDonald Stufft <donald@stufft.io>2014-01-20 20:47:16 -0800
commit272e7487271ed5fb07587e4f90ecfb1ec885a588 (patch)
tree326d19a4046acacb3f1ff4102034e74b4fdcf143
parent9261de94d23c1fd4539d14ff3f2da75dfe3f4924 (diff)
parent597cc64acd54ed9053e9aa0d83092b1ee1ba74e2 (diff)
downloadcryptography-272e7487271ed5fb07587e4f90ecfb1ec885a588.tar.gz
cryptography-272e7487271ed5fb07587e4f90ecfb1ec885a588.tar.bz2
cryptography-272e7487271ed5fb07587e4f90ecfb1ec885a588.zip
Merge pull request #491 from alex/setuptools-installed
Starting now, setuptools should come with pip *fingerscrossed*
-rwxr-xr-x.travis/install.sh2
1 files changed, 0 insertions, 2 deletions
diff --git a/.travis/install.sh b/.travis/install.sh
index 1e3b1702..b6dd5acc 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -29,13 +29,11 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
py26)
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)
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
;;
pypy)