cleanup

Makefile

@@ -46,14 +46,17 @@ test: in
 	rm -f .coverage
 	$(NOSETESTS) -a '!ultra_slow_test' mne
 
+test-full: in
+	rm -f .coverage
+	$(NOSETESTS) mne
+
 test-no-network: in
 	sudo unshare -n -- sh -c 'MNE_SKIP_NETWORK_TESTS=1 nosetests mne'
 
 test-no-testing-data: in
 	@MNE_SKIP_TESTING_DATASET_TESTS=true \
 	$(NOSETESTS) mne
 
-
 test-no-sample-with-coverage: in testing_data
 	rm -rf coverage .coverage
 	@MNE_SKIP_SAMPLE_DATASET_TESTS=true \

mne/datasets/sample/__init__.py

@@ -1,5 +1,4 @@
 """MNE sample dataset
 """
 
-from .sample import (data_path, has_sample_data, get_version,
-                     requires_sample_data)
+from .sample import data_path, has_sample_data, get_version

mne/datasets/sample/sample.py

@@ -3,9 +3,7 @@
 #          Eric Larson <[email protected]>
 # License: BSD Style.
 
-import numpy as np
-
-from ...utils import verbose, get_config
+from ...utils import verbose
 from ...fixes import partial
 from ..utils import (has_dataset, _data_path, _data_path_doc,
                      _get_version, _version_doc)
@@ -29,14 +27,3 @@ def get_version():
     return _get_version('sample')
 
 get_version.__doc__ = _version_doc.format(name='sample')
-
-
-# Allow forcing of sample dataset skip
-def _skip_sample_data():
-    skip_sample = (get_config('MNE_SKIP_SAMPLE_DATASET_TESTS', 'false') ==
-                   'true')
-    skip = skip_sample or not has_sample_data()
-    return skip
-
-requires_sample_data = np.testing.dec.skipif(_skip_sample_data,
-                                             'Requires sample dataset')