diff --git a/Makefile b/Makefile index 0e1e927232..095452210a 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,6 @@ # rsync -e ssh nipype-0.1-py2.5.egg cburns,nipy@frs.sourceforge.net:/home/frs/project/n/ni/nipy/nipype/nipype-0.1/ PYTHON ?= python -NOSETESTS=`which nosetests` .PHONY: zipdoc sdist egg upload_to_pypi trailing-spaces clean-pyc clean-so clean-build clean-ctags clean in inplace test-code test-coverage test html specs check-before-commit check gen-base-dockerfile gen-main-dockerfile gen-dockerfiles diff --git a/Vagrantfile b/Vagrantfile index 1ee1103ca7..3cd69befe9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -27,7 +27,7 @@ echo "export PATH=$HOME/miniconda3/bin:\\$PATH" >> .bashrc # install nipype dependencies $HOME/miniconda3/bin/conda update --yes conda -$HOME/miniconda3/bin/conda install --yes pip scipy nose networkx lxml future simplejson +$HOME/miniconda3/bin/conda install --yes pip scipy networkx lxml future simplejson $HOME/miniconda3/bin/conda install --yes python-dateutil jupyter matplotlib $HOME/miniconda3/bin/pip install nibabel $HOME/miniconda3/bin/pip install prov diff --git a/doc/links_names.txt b/doc/links_names.txt index bd33e1b672..1197917cba 100644 --- a/doc/links_names.txt +++ b/doc/links_names.txt @@ -56,7 +56,6 @@ .. _doctest-mode: http://www.cis.upenn.edu/~edloper/projects/doctestmode/ .. _bazaar: http://bazaar-vcs.org/ .. _subversion: http://subversion.tigris.org/ -.. _nose: http://nose.readthedocs.io/en/latest/ .. _`python coverage tester`: http://nedbatchelder.com/code/modules/coverage.html .. Other python projects diff --git a/nipype/pipeline/plugins/tests/test_base.py b/nipype/pipeline/plugins/tests/test_base.py index 49928cfe4b..cdc55b668b 100644 --- a/nipype/pipeline/plugins/tests/test_base.py +++ b/nipype/pipeline/plugins/tests/test_base.py @@ -16,7 +16,7 @@ def test_scipy_sparse(): ''' Can use the following code to test that a mapnode crash continues successfully -Need to put this into a nose-test with a timeout +Need to put this into a unit-test with a timeout import nipype.interfaces.utility as niu import nipype.pipeline.engine as pe diff --git a/nipype/pipeline/plugins/tests/test_tools.py b/nipype/pipeline/plugins/tests/test_tools.py index 49b2de63dc..ee9b2e4de7 100644 --- a/nipype/pipeline/plugins/tests/test_tools.py +++ b/nipype/pipeline/plugins/tests/test_tools.py @@ -38,7 +38,7 @@ def test_report_crash(): ''' Can use the following code to test that a mapnode crash continues successfully -Need to put this into a nose-test with a timeout +Need to put this into a unit-test with a timeout import nipype.interfaces.utility as niu import nipype.pipeline.engine as pe