aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-06-03 12:46:48 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-06-03 12:46:48 +1200
commit0d4a9303977a9556feb037ec277678f11c983a39 (patch)
tree0b0c6ea4ea15f920884afa69bac45b12098877fc
parente584ef0c56885032220479b3aea2daf386123cdf (diff)
downloadmitmproxy-0d4a9303977a9556feb037ec277678f11c983a39.tar.gz
mitmproxy-0d4a9303977a9556feb037ec277678f11c983a39.tar.bz2
mitmproxy-0d4a9303977a9556feb037ec277678f11c983a39.zip
Try not updating OpenSSL for now
-rw-r--r--.travis.yml2
-rwxr-xr-xdev.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 5ec8b3bd..9147e5e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ install:
if [[ $TRAVIS_OS_NAME == "osx" ]]
then
brew update || brew update # try again if it fails
- brew outdated openssl || brew upgrade openssl
+ # brew outdated openssl || brew upgrade openssl
brew install python
fi
- pip install -U virtualenv
diff --git a/dev.sh b/dev.sh
index b692b036..111f09bc 100755
--- a/dev.sh
+++ b/dev.sh
@@ -9,7 +9,7 @@ echo "Creating dev environment in $VENV using Python $PYVERSION"
python$PYVERSION -m virtualenv "$VENV" --always-copy
. "$VENV/bin/activate"
pip$PYVERSION install -q -U pip setuptools
-pip$PYVERSION install -r requirements.txt
+pip$PYVERSION install -q -r requirements.txt
echo ""
echo "* Virtualenv created in $VENV and all dependencies installed."