Merge remote-tracking branch 'upstream/master' into test

.gitignore

@@ -47,6 +47,7 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
+cov.xml
 
 # Translations
 *.mo

bids/layout/tests/test_layout_on_examples.py

@@ -46,7 +46,7 @@ def test_layout_on_examples_with_derivatives(dataset, nb_files, bids_examples):
         ("asl005", 10),
         ("ds001", 134), # with anat and func data
         ("eeg_cbm", 104),
-        ("ds000246", 54), # with meg data
+        ("ds000246", 19), # with meg data (excludes all files in .ds folders)
         ("genetics_ukbb", 96), # with dwi data
         ("ieeg_visual_multimodal", 148), # also with fmap data; ignore stimmuli folder
         ("pet001", 12),

bids/layout/tests/test_path_building.py

@@ -135,23 +135,7 @@ def test_path_building_in_raw_scope(dataset, bids_examples):
         assert path == bf.path
 
 @pytest.mark.parametrize("scope", ["raw"])
-@pytest.mark.parametrize(
-    "dataset",
-    [
-        pytest.param(
-            "ds000247",
-            marks=pytest.mark.xfail(strict=True,
-                reason="meg ds folder"
-            ),
-        ),
-        pytest.param(
-            "ds000246",
-            marks=pytest.mark.xfail(strict=True,
-                reason="meg ds folder"
-            ),
-        ),
-    ],
-)
+@pytest.mark.parametrize("dataset", ["ds000247", "ds000246"])
 def test_path_building_on_examples_with_derivatives_meg_ds_folder(dataset, scope, bids_examples):
     layout = BIDSLayout(bids_examples / dataset, derivatives=True)
     files = layout.get(subject=".*", datatype=".*", regex_search = True, scope=scope)

bids/layout/tests/test_validation.py

@@ -14,6 +14,7 @@
 def testvalidator():
     return BIDSValidator()
 
+
 def test_layout_with_validation():
     data_dir = join(get_test_data_path(), '7t_trt')
     layout1 = BIDSLayout(data_dir, validate=True)