From 168647f7e425dcaa78ebde9fca200c295fb6c084 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Wed, 24 Feb 2016 10:40:34 +0100 Subject: [PATCH] use dev-scripts on CI --- .appveyor.yml | 4 ++-- .travis.yml | 6 ++++-- dev.bat | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index d4b688e55..805be7e7e 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 5804b5c7b..ce48ab219 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" diff --git a/dev.bat b/dev.bat index 8336f127b..d979c73b0 100644 --- a/dev.bat +++ b/dev.bat @@ -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