From ae64e847a517d726145152144091df1585b464c0 Mon Sep 17 00:00:00 2001 From: Satrajit Ghosh Date: Fri, 9 Sep 2011 17:40:42 -0400 Subject: [PATCH] doc: cleaned doc building to not depend on underlying software --- Makefile | 3 +++ doc/Makefile | 6 +----- nipype/interfaces/fsl/__init__.py | 11 ----------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 9a390a8dfa..3357027505 100644 --- a/Makefile +++ b/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 diff --git a/doc/Makefile b/doc/Makefile index 85a4664fdd..a74b134537 100644 --- a/doc/Makefile +++ b/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,nipy@web.sourceforge.net:htdocs/nipype/ - sf_satra_nightly: html @echo "Copying html files to sourceforge..." scp -r _build/html/* satra,nipy@web.sourceforge.net:htdocs/nipype-nightly/ diff --git a/nipype/interfaces/fsl/__init__.py b/nipype/interfaces/fsl/__init__.py index cff0ce9930..f3b5361078 100644 --- a/nipype/interfaces/fsl/__init__.py +++ b/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'