Merge pull request #155 from jpgill86/pyqtgraph-0.12-compatibility

Fix failing tests

Author: jpgill86

.github/workflows/tests.yml

@@ -34,7 +34,7 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.7', '3.8', '3.9']
-        qt-version: [PyQt5]
+        qt-version: [PyQt5, PySide2]
     env:
       DISPLAY: ':99.0'
       XDG_RUNTIME_DIR: /tmp/runtime-runner
@@ -83,7 +83,7 @@ jobs:
           # run, but by downloading them ahead of time in a separate step we
           # can monitor the progress in GitHub Actions. if the files already
           # exist (because they were restored from the cache), no work is done.
-          
+
           # python -c "from ephyviewer.tests.testing_tools import get_tdt_test_files; get_tdt_test_files();"
           run: |
             python -c "from ephyviewer.tests.testing_tools import get_blackrock_files; get_blackrock_files();"

ephyviewer/tests/test_datasource.py

@@ -107,7 +107,7 @@ def test_neo_rawio_sources():
     neorawio = BlackrockRawIO(filename=filename)
     neorawio.parse_header()
     print(neorawio)
-    
+
 
     sources = ephyviewer.get_sources_from_neo_rawio(neorawio)
     #~ print(sources)
@@ -156,18 +156,18 @@ def test_neo_object_sources():
 
 def test_spikeinterface_sources():
     import spikeinterface as si
-    from spikeinterface.core.tests.testing_tools import generate_recording, generate_sorting
-    
+    from spikeinterface.core.testing_tools import generate_recording, generate_sorting
+
     recording = generate_recording()
     source = ephyviewer.FromSpikeinterfaceRecordingSource(recording=recording)
     print(source)
-    
+
     print(source.t_start, source.nb_channel, source.sample_rate)
-        
+
     sorting = generate_sorting()
     source = ephyviewer.FromSpikeinterfaceSorintgSource(sorting=sorting)
     print(source)
-    
+
     print(source.t_start, source.nb_channel, source.get_channel_name())
 
 

ephyviewer/tests/test_spikeinterfaceviewer.py

@@ -6,8 +6,8 @@
 
 def test_spikeinterface_viewer(interactive=False):
     import spikeinterface as si
-    from spikeinterface.core.tests.testing_tools import generate_recording, generate_sorting
-    
+    from spikeinterface.core.testing_tools import generate_recording, generate_sorting
+
     recording = generate_recording()
     sig_source = ephyviewer.FromSpikeinterfaceRecordingSource(recording=recording)
 

ephyviewer/tests/testing_tools.py

@@ -83,7 +83,7 @@ def make_video_file(filename, codec='mpeg4', rate=25.): # mpeg4 mjpeg libx264
         #~ ax.set_title()
         #~ line.set_markersize(i)
         fig.canvas.draw()
-        one_img = np.frombuffer(fig.canvas.tostring_rgb(), dtype='u1').reshape(h,w,3)
+        one_img = np.asarray(fig.canvas.buffer_rgba())[:,:,:3]
         one_img = one_img[:,:,::-1].copy()
         #~ one_img = one_img .swapaxes(0,1).copy()
 
@@ -158,10 +158,10 @@ def get_tdt_test_files():
     # from neo.utils import download_dataset
     # local_folder = download_dataset(remote_path='tdt/aep_05')
     # return str(local_folder)
-    
+
     # we use old implementation with http
     url_for_tests = "https://web.gin.g-node.org/NeuralEnsemble/ephy_testing_data/raw/master/"
-    
+
     files_to_download = [
         'tdt/aep_05/Block-1/aep_05_Block-1.Tbk',
         'tdt/aep_05/Block-1/aep_05_Block-1.Tdx',
@@ -170,7 +170,7 @@ def get_tdt_test_files():
     ]
 
     local_folder = Path.home() / 'ephy_testing_data_http'
-    
+
     for file in files_to_download:
         localfile = local_folder / file
         distantfile = url_for_tests + file
@@ -179,7 +179,7 @@ def get_tdt_test_files():
             dist = urlopen(distantfile)
             with open(localfile, 'wb') as f:
                 f.write(dist.read())
-    
+
     tdt_folder = str(local_folder / 'tdt' / 'aep_05')
     return tdt_folder
 
@@ -192,7 +192,7 @@ def get_blackrock_files():
     ]
 
     local_folder = Path.home() / 'ephy_testing_data_http'
-    
+
     for file in files_to_download:
         localfile = local_folder / file
         distantfile = url_for_tests + file
@@ -201,13 +201,6 @@ def get_blackrock_files():
             dist = urlopen(distantfile)
             with open(localfile, 'wb') as f:
                 f.write(dist.read())
-    
+
     filename = str(local_folder / 'blackrock' / 'FileSpec2.3001')
     return filename
-
-
-
-    
-    
-    
-    

requirements-tests.txt

@@ -1,7 +1,7 @@
 av
 coveralls
 neo>=0.10.0
-spikeinterface>=0.90.0
+spikeinterface>=0.90.1
 pandas
 pytest
 pytest-cov