Skip to content

Commit

Permalink
Use pytest on circle as well.
Browse files Browse the repository at this point in the history
  • Loading branch information
arokem committed Nov 22, 2016
1 parent a019eaf commit e75334a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ before_install:
- conda install python=$PYTHON_VERSION
- pip install $PIP_DEPS


install:
- python setup.py install
script:
Expand Down
15 changes: 7 additions & 8 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Customize the test machine on circleci
machine:
machine:
timezone:
America/New_York
python:
Expand All @@ -9,12 +9,12 @@ machine:
CIRCLE_ENV: test
COVERAGE: 1
COVERALLS_REPO_TOKEN: DoqUKyhEKXo6d8DS0y2Bs3klwdzhnz51y

## Customize dependencies
dependencies:
pre:
- pip install --upgrade pip
- pip install nose
- pip install pytest
- pip install pillow
- pip install numpy
- pip install nibabel
Expand All @@ -24,18 +24,17 @@ dependencies:
- pip install matplotlib
- pip install sharedmem
- pip install statsmodels
- if [ "${COVERAGE}" == "1" ];then pip install coverage;pip install coveralls;fi
- if [ "${COVERAGE}" == "1" ];then pip install pytest-cov; pip install coveralls;fi
- sudo mkdir tests_dir
- sudo cp .coveragerc tests_dir/.coveragerc

## Customize the tests
test:
pre:
- if [ "${COVERAGE}" == "1" ];then COVER_ARGS="--with-coverage --cover-package popeye";fi
- if [ "${COVERAGE}" == "1" ];then COVER_ARGS="--cov-report term-missing --cov=popeye";fi
override:
- nosetests --with-doctest --verbose $COVER_ARGS popeye:
- py.test --pyargs popeye $COVER_ARGS:
pwd:
tests_dir
post:
- coveralls

0 comments on commit e75334a

Please sign in to comment.