Merge pull request #978 from Kriechi/dev-ci

use dev-scripts on CI

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"
diff --git a/dev.bat b/dev.bat
index 8336f127..d979c73b 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