Skip to content

Commit cbed840

Browse files
committed
Merge pull request #709 from satra/fix/reporting
few more updates including coveralls support
2 parents 869b2c3 + 5c7496a commit cbed840

File tree

11 files changed

+165
-87
lines changed

11 files changed

+165
-87
lines changed

.coveragerc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[run]
2+
branch = True
3+
source = nipype
4+
include = */nipype/*
5+
omit =
6+
*/nipype/external/*
7+
*/nipype/workflows/*
8+
*/nipype/fixes/*
9+
*/setup.py

.travis.yml

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,40 @@
11
language: python
22
python:
3-
- "2.7"
3+
- 2.7
4+
# Setup anaconda
45
before_install:
5-
- deactivate
6-
- sudo rmdir /dev/shm
7-
- sudo ln -Tsf /{run,dev}/shm
8-
- sudo apt-get update -qq
9-
- sudo apt-get install lsb-release
10-
- source /etc/lsb-release
11-
- echo ${DISTRIB_CODENAME}
12-
- wget -O- http://neuro.debian.net/lists/${DISTRIB_CODENAME}.us-nh.full | sudo tee /etc/apt/sources.list.d/neurodebian.sources.list
13-
- sudo apt-key adv --recv-keys --keyserver pgp.mit.edu 2649A5A9
14-
- sudo apt-get update -qq
15-
- sudo apt-get install -qq python-scipy python-nose
16-
- sudo apt-get install -qq python-networkx python-traits python-setuptools
17-
- sudo apt-get install -qq python-nibabel
18-
- sudo apt-get install -qq --no-install-recommends fsl afni
19-
- sudo apt-get install -qq fsl-atlases
20-
- source /etc/fsl/fsl.sh
21-
- virtualenv --system-site-packages ~/virtualenv/this
22-
- source ~/virtualenv/this/bin/activate
23-
- pip install https://github.com/RDFLib/rdflib/archive/master.zip
24-
- pip install https://github.com/satra/prov/archive/enh/rdf.zip
6+
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-2.0.3-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-2.0.3-Linux-x86_64.sh -O miniconda.sh; fi
7+
- chmod +x miniconda.sh
8+
- ./miniconda.sh -b
9+
- export PATH=/home/travis/anaconda/bin:$PATH
10+
# The next couple lines fix a crash with multiprocessing on Travis
11+
- sudo rm -rf /dev/shm
12+
- sudo ln -s /run/shm /dev/shm
13+
- sudo apt-get update -qq
14+
- sudo apt-get install lsb-release
15+
- source /etc/lsb-release
16+
- echo ${DISTRIB_CODENAME}
17+
- wget -O- http://neuro.debian.net/lists/${DISTRIB_CODENAME}.us-nh.full | sudo tee /etc/apt/sources.list.d/neurodebian.sources.list
18+
- sudo apt-key adv --recv-keys --keyserver pgp.mit.edu 2649A5A9
19+
- sudo apt-get update -qq
20+
- sudo apt-get install -qq --no-install-recommends fsl afni
21+
- sudo apt-get install -qq fsl-atlases
22+
- source /etc/fsl/fsl.sh
23+
24+
# Install packages
2525
install:
26-
- source ~/virtualenv/this/bin/activate
27-
- python setup.py build_ext --inplace
26+
- conda install --yes pip python=$TRAVIS_PYTHON_VERSION numpy scipy nose traits networkx dateutil
27+
- pip install nibabel --use-mirrors
28+
- pip install python-coveralls --use-mirrors
29+
- pip install nose-cov --use-mirrors
30+
- pip install https://github.com/RDFLib/rdflib/archive/master.zip
31+
- pip install https://github.com/satra/prov/archive/enh/rdf.zip
32+
- python setup.py install
33+
34+
# Run test
2835
script:
29-
- source ~/virtualenv/this/bin/activate
30-
- make test
36+
- nosetests --with-doctest --with-cov --cov nipype --cov-config .coveragerc --logging-level=INFO
3137

38+
# Calculate coverage
39+
after_success:
40+
- coveralls --config_file .coveragerc

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ test-doc:
5757
--doctest-fixtures=_fixture doc/
5858

5959
test-coverage:
60-
$(NOSETESTS) -s --with-doctest --with-coverage --cover-erase --cover-html \
61-
--cover-html-dir=coverage --cover-package=nipype nipype
60+
$(NOSETESTS) -s --with-doctest --with-coverage --cover-package=nipype \
61+
--config=.coveragerc
6262

6363
test: clean test-code
6464

README.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
NIPYPE: Neuroimaging in Python: Pipelines and Interfaces
33
========================================================
44

5+
.. image:: https://travis-ci.org/nipy/nipype.png?branch=master
6+
:target: https://travis-ci.org/nipy/nipype
7+
8+
.. image:: https://coveralls.io/repos/nipy/nipype/badge.png
9+
:target: https://coveralls.io/r/nipy/nipype
10+
511

612
Current neuroimaging software offer users an incredible opportunity to
713
analyze data using a variety of different algorithms. However, this has

doc/_templates/indexsidebar.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ <h3>{{ _('Links') }}</h3>
66
<li>Code: <a href="http://github.com/nipy/nipype">Github</a> · <a href="http://github.com/nipy/nipype/issues">Bugs-Requests</a></li>
77
<li>Forum: <a href="http://groups.google.com/group/nipy-user">User</a> · <a href="http://projects.scipy.org/mailman/listinfo/nipy-devel">Developer</a></li>
88
<li>Info: <a href="http://nipy.org/software/license/index.html">License</a> · <a href="http://nipy.org/about/funding.html">Funding</a></li>
9+
<li><a href="https://travis-ci.org/nipy/nipy"><img src="https://travis-ci.org/nipy/nipype.png?branch=master" alt="travis"></a> · <a href='https://coveralls.io/r/nipy/nipype'><img src='https://coveralls.io/repos/nipy/nipype/badge.png' alt='Coverage Status' /></a></li>
910
</ul>
1011

1112
{% endblock %}

doc/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
# General information about the project.
5757
project = u'nipype'
58-
copyright = u'2009-12, Neuroimaging in Python team'
58+
copyright = u'2009-13, Neuroimaging in Python team'
5959

6060
# The version info for the project you're documenting, acts as replacement for
6161
# |version| and |release|, also used in various other places throughout the

0 commit comments

Comments
 (0)