Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .ci/travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
fi

pip install --upgrade pip
pip install wheel coverage==3.7.1 python-coveralls mock
pip install --upgrade setuptools
pip install -r requirements_test.txt
python setup.py develop
pip freeze
21 changes: 12 additions & 9 deletions .ci/travis/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@

if [[ "$READTHEDOCS" == "1" ]]; then
make -C docs html
fi

if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
if which pyenv > /dev/null; then
eval "$(pyenv init -)"
else
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
if which pyenv > /dev/null; then
eval "$(pyenv init -)"
fi
pyenv activate virtualenv
coverage run --branch $VIRTUAL_ENV/bin/trial tests
else
coverage run --branch `which trial` tests/
fi
pyenv activate virtualenv
coverage run --branch $VIRTUAL_ENV/bin/trial tests

else
coverage run --branch `which trial` tests/
# Upload code coverage to codecov.io
coverage xml
codecov --required
fi
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,3 @@ install:

script:
- ./.ci/travis/test.sh

after_success:
- coveralls
3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,15 @@ checkout the configuration files used to run the tests on Travis and Appveyor:

virtualenv env
. env/bin/activate
pip install -r requirements_test.txt
pip install -e . --egg
trial tests

**Windows**::

virtualenv env
env\Scripts\activate
%VIRTUALE_ENV%\Scripts\pip.exe install wheel
%VIRTUALE_ENV%\Scripts\pip.exe -r requirements_test.txt
%VIRTUALE_ENV%\Scripts\pip.exe install -e . --egg
%VIRTUALE_ENV%\Scripts\python.exe %VIRTUALE_ENV%\Scripts\trial.py tests

Expand Down
8 changes: 5 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ clone_folder: c:\\project
test_script:
- ps: cd C:\\project

- "%WITH_COMPILER% %PYTHON%\\Scripts\\pip.exe install wheel mock coverage"
- "%WITH_COMPILER% %PYTHON%\\Scripts\\pip.exe install -r C:\\project\\requirements_test.txt"
- "%WITH_COMPILER% %PYTHON%\\Scripts\\pip.exe install ."

# Twisted's trial does not build entrypoints on Windows so we have
Expand All @@ -29,7 +29,9 @@ test_script:

after_test:
- "%WITH_COMPILER% %PYTHON%\\python.exe setup.py bdist_wheel"
- "%PYTHON%\\Scripts\\coverage.exe report"
- "%PYTHON%\\Scripts\\coverage.exe xml"
- "%PYTHON%\\Scripts\\codecov.exe --required"

artifacts:
- path: dist\*
- path: dist\.whl
- path: .coverage
4 changes: 4 additions & 0 deletions requirements_test.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
codecov
coverage==3.7.1
mock
wheel