aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-02-15 18:12:12 +0100
committerMaximilian Hils <git@maximilianhils.com>2016-02-15 18:12:12 +0100
commitb7af84552385fa6daf5f594ffa981f8647f7e755 (patch)
tree48fdc83fb5b320578a0242db44c497dfa497ab8a /.travis.yml
parenta1190c369648438811daae70c1baff4e32b198fd (diff)
downloadmitmproxy-b7af84552385fa6daf5f594ffa981f8647f7e755.tar.gz
mitmproxy-b7af84552385fa6daf5f594ffa981f8647f7e755.tar.bz2
mitmproxy-b7af84552385fa6daf5f594ffa981f8647f7e755.zip
fix appveyor, re-introduce requirements.txt
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 2 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 1e7f80aa..f9a6aa66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,8 +22,7 @@ matrix:
- python: 3.5
env: SCOPE="netlib"
- python: 3.5
- env: NO_ALPN=1
- env: SCOPE="netlib"
+ env: NO_ALPN=1 SCOPE="netlib"
- python: 2.7
env: DOCS=1
script: 'cd mitmproxy/docs && make html'
@@ -39,9 +38,7 @@ install:
brew install python
fi
- "pip install -U pip setuptools"
- - "pip install -e ./netlib[dev]"
- - "pip install -e ./pathod[dev]"
- - "pip install -e ./mitmproxy[dev,contentviews,examples]"
+ - "pip install -r requirements.txt"
before_script:
- "openssl version -a"