Skip to content

Commit 8867f03

Browse files
committed
Merge branch 'spikeglx-tcat' of github.com:alejoe91/python-neo into spikeglx-tcat
2 parents 676eceb + 22414b3 commit 8867f03

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

neo/io/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ def list_candidate_ios(file_or_folder, ignore_patterns=["*.ini", "README.txt", "
453453

454454
elif file_or_folder.is_dir():
455455
# scan files in folder to determine io type
456-
filenames = [f for f in file_or_folder.glob("*") if f.is_file()]
456+
filenames = [f for f in file_or_folder.glob("**/*") if f.is_file()]
457457
# keep only relevant filenames
458458
filenames = [f for f in filenames if f.suffix and not any([f.match(p) for p in ignore_patterns])]
459459

neo/test/rawiotest/test_spikeglxrawio.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ class TestSpikeGLXRawIO(BaseTestRawIO, unittest.TestCase):
3333
# NP-ultra
3434
"spikeglx/np_ultra_stub",
3535
# CatGT
36-
"spikeglx/multi_trigger_multi_gate/CatGT/CatGT-A/catgt_5-19-2022-CI0_g0",
37-
"spikeglx/multi_trigger_multi_gate/CatGT/CatGT-B/catgt_5-19-2022-CI0_g0",
38-
"spikeglx/multi_trigger_multi_gate/CatGT/CatGT-C/catgt_5-19-2022-CI0_g0",
39-
"spikeglx/multi_trigger_multi_gate/CatGT/CatGT-D/catgt_5-19-2022-CI0_g0",
40-
"spikeglx/multi_trigger_multi_gate/CatGT/CatGT-E/catgt_5-19-2022-CI0_g0",
41-
"spikeglx/multi_trigger_multi_gate/CatGT/SupercatA/supercat_5-19-2022-CI0_g0",
36+
"spikeglx/multi_trigger_multi_gate/CatGT/CatGT-A",
37+
"spikeglx/multi_trigger_multi_gate/CatGT/CatGT-B",
38+
"spikeglx/multi_trigger_multi_gate/CatGT/CatGT-C",
39+
"spikeglx/multi_trigger_multi_gate/CatGT/CatGT-D",
40+
"spikeglx/multi_trigger_multi_gate/CatGT/CatGT-E",
41+
"spikeglx/multi_trigger_multi_gate/CatGT/Supercat-A",
4242
]
4343

4444
def test_with_location(self):

0 commit comments

Comments
 (0)