Skip to content

Commit 6ffe00d

Browse files
samuelgarciasamuelgarcia
committed
propagate datalad download to all rawiotest.
1 parent 16b3676 commit 6ffe00d

28 files changed

+207
-386
lines changed

‎.github/workflows/full-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ jobs:
5555
- name: Test with pytest
5656
run: |
5757
source ./test_env/bin/activate
58-
pytest --cov=neo neo/tests
58+
pytest --cov=neo neo/test

‎neo/test/rawiotest/test_axographrawio.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010

1111
class TestAxographRawIO(BaseTestRawIO, unittest.TestCase):
1212
rawioclass = AxographRawIO
13-
files_to_download = [
14-
'AxoGraph_Graph_File', # version 1 file, provided with AxoGraph
15-
'AxoGraph_Digitized_File', # version 2 file, provided with AxoGraph
16-
'AxoGraph_X_File.axgx', # version 5 file, provided with AxoGraph
17-
'File_axograph.axgd', # version 6 file
18-
'episodic.axgd',
19-
'events_and_epochs.axgx',
20-
'written-by-axographio-with-linearsequence.axgx',
21-
'written-by-axographio-without-linearsequence.axgx',
22-
'corrupt-comment.axgx',
13+
entities_to_test = [
14+
'axograph/AxoGraph_Graph_File', # version 1 file, provided with AxoGraph
15+
'axograph/AxoGraph_Digitized_File', # version 2 file, provided with AxoGraph
16+
'axograph/AxoGraph_X_File.axgx', # version 5 file, provided with AxoGraph
17+
'axograph/File_axograph.axgd', # version 6 file
18+
'axograph/episodic.axgd',
19+
'axograph/events_and_epochs.axgx',
20+
'axograph/written-by-axographio-with-linearsequence.axgx',
21+
'axograph/written-by-axographio-without-linearsequence.axgx',
22+
'axograph/corrupt-comment.axgx',
2323
]
24-
entities_to_test = files_to_download
24+
entities_to_download = ['axograph']
2525

2626

2727
if __name__ == "__main__":

‎neo/test/rawiotest/test_axonarawio.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
from neo.test.rawiotest.common_rawio_test import BaseTestRawIO
1313

1414

15-
class TestAxonaRawIO(BaseTestRawIO, unittest.TestCase, ):
15+
class TestAxonaRawIO(BaseTestRawIO, unittest.TestCase):
1616
rawioclass = AxonaRawIO
17-
files_to_download = [
18-
'axona_raw.bin',
19-
'axona_raw.set',
20-
]
2117
entities_to_test = [
22-
'axona_raw.bin'
18+
'axona/axona_raw.bin',
19+
'axona/axona_raw.set',
20+
]
21+
entities_to_download = [
22+
'axona'
2323
]
2424

2525

‎neo/test/rawiotest/test_axonrawio.py‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,21 @@
88
class TestAxonRawIO(BaseTestRawIO, unittest.TestCase, ):
99
rawioclass = AxonRawIO
1010
entities_to_test = [
11-
'File_axon_1.abf', # V2.0
12-
'File_axon_2.abf', # V1.8
13-
'File_axon_3.abf', # V1.8
14-
'File_axon_4.abf', # 2.0
15-
'File_axon_5.abf', # V.20
16-
'File_axon_6.abf', # V.20
17-
'File_axon_7.abf', # V2.6
18-
'test_file_edr3.abf', # EDR3
11+
'axon/File_axon_1.abf', # V2.0
12+
'axon/File_axon_2.abf', # V1.8
13+
'axon/File_axon_3.abf', # V1.8
14+
'axon/File_axon_4.abf', # 2.0
15+
'axon/File_axon_5.abf', # V.20
16+
'axon/File_axon_6.abf', # V.20
17+
'axon/File_axon_7.abf', # V2.6
18+
'axon/test_file_edr3.abf', # EDR3
19+
]
20+
entities_to_download = [
21+
'axon'
1922
]
20-
files_to_download = entities_to_test
2123

2224
def test_read_raw_protocol(self):
23-
reader = AxonRawIO(filename=self.get_filename_path('File_axon_7.abf'))
25+
reader = AxonRawIO(filename=self.get_local_path('axon/File_axon_7.abf'))
2426
reader.parse_header()
2527

2628
reader.read_raw_protocol()

‎neo/test/rawiotest/test_bci2000rawio.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,14 @@
1111
class TestBCI2000RawIO(BaseTestRawIO, unittest.TestCase, ):
1212
rawioclass = BCI2000RawIO
1313

14-
files_to_download = ['eeg1_1.dat', 'eeg1_2.dat', 'eeg1_3.dat']
15-
entities_to_test = files_to_download
14+
entities_to_download = [
15+
'bci2000/eeg1_1.dat',
16+
'bci2000/eeg1_2.dat',
17+
'bci2000/eeg1_3.dat']
18+
19+
entities_to_download = [
20+
'bci2000',
21+
]
1622

1723

1824
if __name__ == "__main__":

‎neo/test/rawiotest/test_blackrockrawio.py‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,14 @@
2020

2121
class TestBlackrockRawIO(BaseTestRawIO, unittest.TestCase, ):
2222
rawioclass = BlackrockRawIO
23+
entities_to_download = [
24+
'blackrock'
25+
]
2326
entities_to_test = [
2427
'blackrock/FileSpec2.3001',
2528
'blackrock/blackrock_2_1/l101210-001'
2629
]
2730

28-
entities_to_download = [
29-
'blackrock'
30-
]
31-
#~ 'FileSpec2.3001.nev',
32-
#~ 'FileSpec2.3001.ns5',
33-
#~ 'FileSpec2.3001.ccf',
34-
#~ 'FileSpec2.3001.mat',
35-
#~ 'blackrock_2_1/l101210-001.mat',
36-
#~ 'blackrock_2_1/l101210-001_nev-02_ns5.mat',
37-
#~ 'blackrock_2_1/l101210-001.ns2',
38-
#~ 'blackrock_2_1/l101210-001.ns5',
39-
#~ 'blackrock_2_1/l101210-001.nev',
40-
#~ 'blackrock_2_1/l101210-001-02.nev']
41-
4231
@unittest.skipUnless(HAVE_SCIPY, "requires scipy")
4332
def test_compare_blackrockio_with_matlabloader(self):
4433
"""

‎neo/test/rawiotest/test_brainvisionrawio.py‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,17 @@
1111

1212
class TestBrainVisionRawIO(BaseTestRawIO, unittest.TestCase, ):
1313
rawioclass = BrainVisionRawIO
14-
entities_to_test = ['File_brainvision_1.vhdr',
15-
'File_brainvision_2.vhdr',
16-
'File_brainvision_3_float32.vhdr',
17-
'File_brainvision_3_int16.vhdr',
18-
'File_brainvision_3_int32.vhdr',
19-
]
20-
files_to_download = ['File_brainvision_1.eeg',
21-
'File_brainvision_1.vhdr',
22-
'File_brainvision_1.vmrk',
23-
'File_brainvision_2.eeg',
24-
'File_brainvision_2.vhdr',
25-
'File_brainvision_2.vmrk',
26-
'File_brainvision_3_float32.eeg',
27-
'File_brainvision_3_float32.vhdr',
28-
'File_brainvision_3_float32.vmrk',
29-
'File_brainvision_3_int16.eeg',
30-
'File_brainvision_3_int16.vhdr',
31-
'File_brainvision_3_int16.vmrk',
32-
'File_brainvision_3_int32.eeg',
33-
'File_brainvision_3_int32.vhdr',
34-
'File_brainvision_3_int32.vmrk',
35-
]
14+
entities_to_test = [
15+
'brainvision/File_brainvision_1.vhdr',
16+
'brainvision/File_brainvision_2.vhdr',
17+
'brainvision/File_brainvision_3_float32.vhdr',
18+
'brainvision/File_brainvision_3_int16.vhdr',
19+
'brainvision/File_brainvision_3_int32.vhdr',
20+
]
21+
22+
entities_to_download = [
23+
'brainvision'
24+
]
3625

3726

3827
if __name__ == "__main__":

‎neo/test/rawiotest/test_elanrawio.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
class TestElanRawIO(BaseTestRawIO, unittest.TestCase, ):
99
rawioclass = ElanRawIO
10-
entities_to_test = ['File_elan_1.eeg']
11-
files_to_download = [
12-
'File_elan_1.eeg',
13-
'File_elan_1.eeg.ent',
14-
'File_elan_1.eeg.pos',
10+
entities_to_test = [
11+
'elan/File_elan_1.eeg'
12+
]
13+
entities_to_download = [
14+
'elan',
1515
]
1616

1717

‎neo/test/rawiotest/test_examplerawio.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class and a full test will be done to test if the new coded IO
3232
class TestExampleRawIO(BaseTestRawIO, unittest.TestCase, ):
3333
rawioclass = ExampleRawIO
3434
# here obsvisously there is nothing to download:
35-
files_to_download = []
35+
entities_to_download = []
3636
# here we will test 1 fake files
3737
# note that for IOs based on directory names you can put the directory
3838
# name here instead of the file name.

‎neo/test/rawiotest/test_intanrawio.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77

88
class TestIntanRawIO(BaseTestRawIO, unittest.TestCase, ):
99
rawioclass = IntanRawIO
10-
files_to_download = [
11-
'intan_rhs_test_1.rhs',
12-
'intan_rhd_test_1.rhd',
10+
entities_to_download = [
11+
'intan'
12+
]
13+
entities_to_test = [
14+
'intan/intan_rhs_test_1.rhs',
15+
'intan/intan_rhd_test_1.rhd',
1316
]
14-
entities_to_test = files_to_download
1517

1618

1719
if __name__ == "__main__":

0 commit comments

Comments
 (0)