Merge pull request #978 from Kriechi/dev-ci

use dev-scripts on CI
This commit is contained in:
Maximilian Hils 2016-02-26 22:06:18 +01:00
commit 5950587f27
3 changed files with 6 additions and 5 deletions

View File

@ -13,8 +13,8 @@ environment:
SNAPSHOT_PASS: SNAPSHOT_PASS:
secure: LPjrtFrWxYhOVGXzfPRV1GjtZE/wHoKq9m/PI6hSalfysUK5p2DxTG9uHlb4Q9qV secure: LPjrtFrWxYhOVGXzfPRV1GjtZE/wHoKq9m/PI6hSalfysUK5p2DxTG9uHlb4Q9qV
install: install:
- "pip install --user -U pip setuptools" - "pip install --user -U virtualenv"
- "pip install --user -r requirements.txt" - "dev.bat"
- "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\"" - "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\""
test_script: test_script:
- "py.test" - "py.test"

View File

@ -37,11 +37,13 @@ install:
brew outdated openssl || brew upgrade openssl brew outdated openssl || brew upgrade openssl
brew install python brew install python
fi fi
- "pip install -U pip setuptools" - pip install -U virtualenv
- "pip install -r requirements.txt" - ./dev.sh
- source ./venv/bin/activate
before_script: before_script:
- "openssl version -a" - "openssl version -a"
- "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\""
script: script:
- "py.test ./test/$SCOPE" - "py.test ./test/$SCOPE"

View File

@ -12,4 +12,3 @@ echo.
echo * Created virtualenv environment in %VENV%. echo * Created virtualenv environment in %VENV%.
echo * Installed all dependencies into the virtualenv. echo * Installed all dependencies into the virtualenv.
echo * Activated virtualenv environment. echo * Activated virtualenv environment.
pause