aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-07-09 11:50:30 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-07-09 11:50:30 +0200
commit3a3d9f65e693ff0e0c6eb35c872d7a8b43f06dce (patch)
tree61b2448adc2934276d2efdb8bf5312041f7b12c5
parent3fe5b47cf9f5292aaba13077bf70937d5237bf26 (diff)
downloadmitmproxy-3a3d9f65e693ff0e0c6eb35c872d7a8b43f06dce.tar.gz
mitmproxy-3a3d9f65e693ff0e0c6eb35c872d7a8b43f06dce.tar.bz2
mitmproxy-3a3d9f65e693ff0e0c6eb35c872d7a8b43f06dce.zip
upgrade pip on osx travis
-rw-r--r--.travis.yml2
-rw-r--r--requirements.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 21e99f1f..3aa2e75c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,6 +43,8 @@ install:
brew update || brew update # try again if it fails
brew outdated openssl || brew upgrade openssl
brew install python python3
+ pip install -U pip setuptools wheel
+ pip3 install -U pip3 setuptools wheel
fi
- pip install tox
diff --git a/requirements.txt b/requirements.txt
index ead8d1c2..f6fdfda9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
-https://maximilianhils.com/upload/2016-06/lxml-3.6.0-cp35-cp35m-win32.whl; (sys_platform == 'win32' and python_version == '3.5')
+https://maximilianhils.com/upload/2016-06/lxml-3.6.0-cp35-cp35m-win32.whl; sys_platform == 'win32' and python_version == '3.5'
-e .[dev,examples,contentviews]
-e ./release