Skip to content
Merged
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
25 changes: 14 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,26 @@ env:
# Set default python version to avoid repetition later
- PYTHON_VERSION=3.5
- BUILD_DOCS=false
- COVERALLS=false
- CODECOV=false
- PYTEST_FLAGS="--disable-pytest-warnings --numprocesses 2 --durations=50"
- PYTEST_LIST="testsuite/MDAnalysisTests"
- MAIN_CMD="pytest ${PYTEST_LIST}"
- SETUP_CMD="${PYTEST_FLAGS}"
- BUILD_CMD="pip install -v package/ && pip install testsuite/"
- CONDA_MIN_DEPENDENCIES="mmtf-python mock six biopython networkx cython joblib matplotlib scipy griddataformats hypothesis gsd"
- CONDA_DEPENDENCIES="${CONDA_MIN_DEPENDENCIES} seaborn>=0.7.0 clustalw=2.1 netcdf4 scikit-learn coveralls"
- CONDA_MIN_DEPENDENCIES="mmtf-python mock six biopython networkx cython joblib matplotlib scipy griddataformats hypothesis gsd codecov"
- CONDA_DEPENDENCIES="${CONDA_MIN_DEPENDENCIES} seaborn>=0.7.0 clustalw=2.1 netcdf4 scikit-learn"
- CONDA_CHANNELS='biobuilds conda-forge'
- CONDA_CHANNEL_PRIORITY=True
- PIP_DEPENDENCIES="duecredit sphinx-sitemap"
- PIP_DEPENDENCIES="duecredit"
- NUMPY_VERSION=stable
- INSTALL_HOLE="true"

matrix:
# Run a coverage test
- COVERALLS="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
- PYTHON_VERSION=3.6
- PYTHON_VERSION=3.4
- PYTHON_VERSION=2.7
# Run a coverage test for most versions
- CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
- PYTHON_VERSION=3.6 CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
- PYTHON_VERSION=3.4 CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
- PYTHON_VERSION=2.7 CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
- NUMPY_VERSION=1.10.4
- NUMPY_VERSION=dev EVENT_TYPE="cron"

Expand All @@ -53,6 +53,7 @@ matrix:
BUILD_DOCS=true
BUILD_CMD="cd ${TRAVIS_BUILD_DIR}/package && python setup.py build_ext --inplace"
INSTALL_HOLE="false"
PIP_DEPENDENCIES="${PIP_DEPENDENCIES} sphinx-sitemap"

- env: NAME="Lint"
PYLINTRC="${TRAVIS_BUILD_DIR}/package/.pylintrc"
Expand All @@ -71,6 +72,8 @@ matrix:
- env: NAME='minimal'
CONDA_DEPENDENCIES=${CONDA_MIN_DEPENDENCIES}
INSTALL_HOLE="false"
CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"

allow_failures:
- env: NUMPY_VERSION=dev EVENT_TYPE="cron"

Expand Down Expand Up @@ -104,8 +107,8 @@ script:

after_success:
- |
if [[ $COVERALLS == 'true' ]]; then \
coveralls; \
if [[ $CODECOV == 'true' ]]; then \
codecov; \
fi
# can't use test here since this leads to travis fails even though the build passes
- if [[ ${TRAVIS_PULL_REQUEST} == "false" ]] && [[ ${BUILD_DOCS} == "true" ]] && [[ ${TRAVIS_BRANCH} == ${GH_DOC_BRANCH} ]]; then
Expand Down
18 changes: 9 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,17 @@ to find uncovered code.
:target: https://www.mdanalysis.org/mdanalysis/

.. |build| image:: https://travis-ci.org/MDAnalysis/mdanalysis.svg?branch=develop
:alt: Build Status
:target: https://travis-ci.org/MDAnalysis/mdanalysis
:alt: Build Status
:target: https://travis-ci.org/MDAnalysis/mdanalysis

.. |cov| image:: https://coveralls.io/repos/MDAnalysis/mdanalysis/badge.svg?branch=develop
:alt: Coverage Status
:target: https://coveralls.io/r/MDAnalysis/mdanalysis?branch=develop
.. |cov| image:: https://codecov.io/gh/MDAnalysis/mdanalysis/branch/develop/graph/badge.svg
:alt: Coverage Status
:target: https://codecov.io/gh/MDAnalysis/mdanalysis

.. |anaconda| image:: https://anaconda.org/conda-forge/mdanalysis/badges/version.svg
:alt: Anaconda
:target: https://anaconda.org/conda-forge/mdanalysis
:alt: Anaconda
:target: https://anaconda.org/conda-forge/mdanalysis

.. |mybinder| image:: https://mybinder.org/badge.svg
:alt: My Binder
:target: https://mybinder.org/v2/gh/MDAnalysis/binder-notebook/master
:alt: My Binder
:target: https://mybinder.org/v2/gh/MDAnalysis/binder-notebook/master
18 changes: 9 additions & 9 deletions package/SUMMARY.txt
Original file line number Diff line number Diff line change
Expand Up @@ -121,18 +121,18 @@ For citations of included algorithms and sub-modules please see the references_.
:target: https://docs.mdanalysis.org

.. |build| image:: https://travis-ci.org/MDAnalysis/mdanalysis.svg?branch=develop
:alt: Build Status
:target: https://travis-ci.org/MDAnalysis/mdanalysis
:alt: Build Status
:target: https://travis-ci.org/MDAnalysis/mdanalysis

.. |cov| image:: https://coveralls.io/repos/MDAnalysis/mdanalysis/badge.svg?branch=develop
:alt: Coverage Status
:target: https://coveralls.io/r/MDAnalysis/mdanalysis?branch=develop
.. |cov| image:: https://codecov.io/gh/MDAnalysis/mdanalysis/branch/develop/graph/badge.svg
:alt: Coverage Status
:target: https://codecov.io/gh/MDAnalysis/mdanalysis

.. |anaconda| image:: https://anaconda.org/conda-forge/mdanalysis/badges/version.svg
:alt: Anaconda
:target: https://anaconda.org/conda-forge/mdanalysis
:alt: Anaconda
:target: https://anaconda.org/conda-forge/mdanalysis

.. |mybinder| image:: https://mybinder.org/badge.svg
:alt: My Binder
:target: https://mybinder.org/v2/gh/MDAnalysis/binder-notebook/master
:alt: My Binder
:target: https://mybinder.org/v2/gh/MDAnalysis/binder-notebook/master

10 changes: 5 additions & 5 deletions testsuite/README
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ Help is also available through the mailing list at https://groups.google.com/gro
.. badges

.. |build| image:: https://travis-ci.org/MDAnalysis/mdanalysis.svg?branch=develop
:alt: Build Status
:target: https://travis-ci.org/MDAnalysis/mdanalysis
:alt: Build Status
:target: https://travis-ci.org/MDAnalysis/mdanalysis

.. |cov| image:: https://coveralls.io/repos/MDAnalysis/mdanalysis/badge.svg?branch=develop
:alt: Coverage Status
:target: https://coveralls.io/r/MDAnalysis/mdanalysis?branch=develop
.. |cov| image:: https://codecov.io/gh/MDAnalysis/mdanalysis/branch/develop/graph/badge.svg
:alt: Coverage Status
:target: https://codecov.io/gh/MDAnalysis/mdanalysis

.. |devdocs| image:: https://img.shields.io/badge/docs-development-yellow.svg
:alt: Documentation (development version)
Expand Down
2 changes: 1 addition & 1 deletion testsuite/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def dynamic_author_list():
download_url='https://github.com/MDAnalysis/mdanalysis/releases',
project_urls={'Documentation': 'https://github.com/MDAnalysis/mdanalysis/wiki/UnitTests',
'CI Tests': 'https://travis-ci.org/MDAnalysis/mdanalysis',
'CI Coverage': 'https://coveralls.io/r/MDAnalysis/mdanalysis?branch=develop',
'CI Coverage': 'https://codecov.io/gh/MDAnalysis/mdanalysis',
'Developer Group': 'https://groups.google.com/forum/#!forum/mdnalysis-devel',
'Issue Tracker': 'https://github.com/mdanalysis/mdanalysis/issues',
'Source': 'https://github.com/mdanalysis/mdanalysis',
Expand Down