diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-02-24 10:40:34 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-02-25 18:01:59 +0100 |
| commit | 168647f7e425dcaa78ebde9fca200c295fb6c084 (patch) | |
| tree | f5afe9a44be7202151d089f33175c1755265fa29 | |
| parent | 7e55a2128714deaa66526360e617beb8076c505b (diff) | |
| download | mitmproxy-168647f7e425dcaa78ebde9fca200c295fb6c084.tar.gz mitmproxy-168647f7e425dcaa78ebde9fca200c295fb6c084.tar.bz2 mitmproxy-168647f7e425dcaa78ebde9fca200c295fb6c084.zip | |
use dev-scripts on CI
| -rw-r--r-- | .appveyor.yml | 4 | ||||
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | dev.bat | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index d4b688e5..805be7e7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,8 +13,8 @@ environment: SNAPSHOT_PASS: secure: LPjrtFrWxYhOVGXzfPRV1GjtZE/wHoKq9m/PI6hSalfysUK5p2DxTG9uHlb4Q9qV install: - - "pip install --user -U pip setuptools" - - "pip install --user -r requirements.txt" + - "pip install --user -U virtualenv" + - "dev.bat" - "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\"" test_script: - "py.test" diff --git a/.travis.yml b/.travis.yml index 5804b5c7..ce48ab21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,11 +37,13 @@ install: brew outdated openssl || brew upgrade openssl brew install python fi - - "pip install -U pip setuptools" - - "pip install -r requirements.txt" + - pip install -U virtualenv + - ./dev.sh + - source ./venv/bin/activate before_script: - "openssl version -a" + - "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\"" script: - "py.test ./test/$SCOPE" @@ -12,4 +12,3 @@ echo. echo * Created virtualenv environment in %VENV%. echo * Installed all dependencies into the virtualenv. echo * Activated virtualenv environment. -pause
\ No newline at end of file |