Skip to content

Commit

Permalink
Merge pull request #815 from MDAnalysis/issue-363
Browse files Browse the repository at this point in the history
WIP: Issue 363 - New Topology System
  • Loading branch information
kain88-de committed Nov 7, 2016
2 parents 168e592 + a53c5c3 commit 94f1d75
Show file tree
Hide file tree
Showing 139 changed files with 14,536 additions and 10,016 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Expand Up @@ -5,6 +5,7 @@ branches:
only:
- master
- develop
- issue-363

os:
- linux
Expand Down Expand Up @@ -39,6 +40,7 @@ before_install:
- export PATH=$(pwd)/miniconda/bin:$PATH
- conda config --add channels MDAnalysis
- conda update --yes conda
- conda install --yes pylint
install:
- if [[ $SETUP == 'full' ]]; then conda create --yes -q -n pyenv python=$PYTHON_VERSION numpy scipy nose=1.3.7 sphinx=1.3 griddataformats six scikit-learn; fi
- if [[ $SETUP == 'minimal' ]]; then conda create --yes -q -n pyenv python=$PYTHON_VERSION numpy nose=1.3.7 sphinx=1.3 griddataformats six; fi
Expand Down Expand Up @@ -67,6 +69,8 @@ install:

# command to run tests
script:
- pylint --rcfile=package/.pylintrc package/MDAnalysis
- pylint --rcfile=package/.pylintrc testsuite/MDAnalysisTests
- ./testsuite/MDAnalysisTests/mda_nosetests --with-coverage --cover-package MDAnalysis --processes=2 --process-timeout=400 --with-memleak
- |
test ${TRAVIS_PULL_REQUEST} == "false" && \
Expand Down

0 comments on commit 94f1d75

Please sign in to comment.