Merge pull request #230 from satra/fix/docbuilding

doc: cleaned doc building to not depend on underlying software closes gh-230

Author: satra

Makefile

@@ -54,14 +54,17 @@ inplace:
 
 test-code: in
 	$(NOSETESTS) -s nipype --with-doctest
+	stty sane
 
 test-doc:
 	$(NOSETESTS) -s --with-doctest --doctest-tests --doctest-extension=rst \
 	--doctest-fixtures=_fixture doc/
+	stty sane
 
 test-coverage:
 	$(NOSETESTS) -s --with-doctest --with-coverage --cover-html --cover-html-dir=coverage \
 	--cover-package=nipype nipype
+	stty sane
 
 test: test-code
 

doc/Makefile

@@ -23,7 +23,6 @@ help:
 	      		"items (ChangeLog)"
 	@echo "  linkcheck check all external links for integrity"
 	@echo "  doctest   run all doctests embedded in the documentation"
-	@echo "  sf_cburns copy html files to sourceforge (cburns only)"
 	@echo "  sf_satra copy html files to sourceforge (satra only)"
 
 clean:
@@ -43,6 +42,7 @@ api:
 
 html: examples2rst api htmlonly
 	@echo "Build HTML and API finished."
+	stty sane
 
 examples2rst:
 	python ../tools/ex2rst \
@@ -104,10 +104,6 @@ gitwash-update:
 # Sourceforge doesn't appear to have a way of copying the files
 # without specifying a username.  So we'll probably have one target
 # for each project admin
-sf_cburns:
-	@echo "Copying html files to sourceforge..."
-	scp -r _build/html/* cburns,[email protected]:htdocs/nipype/
-
 sf_satra_nightly: html
 	@echo "Copying html files to sourceforge..."
 	scp -r _build/html/* satra,[email protected]:htdocs/nipype-nightly/

nipype/interfaces/fsl/__init__.py

@@ -33,14 +33,3 @@
                                          ApplyMask, IsotropicSmooth, TemporalFilter,
                                          DilateImage, ErodeImage, SpatialFilter,
                                          UnaryMaths, BinaryMaths, MultiImageMaths)
-
-import nose
-
-
-def setup():
-    print 'test setup'
-    if no_fsl():
-        raise nose.SkipTest
-
-def teardown():
-    print 'test teardown'