Fix pytest deprecation warnings

Author: rossant

phylib/io/tests/test_datasets.py

@@ -13,7 +13,7 @@
 import numpy as np
 from numpy.testing import assert_array_equal as ae
 import responses
-from pytest import raises, yield_fixture
+from pytest import raises, fixture
 
 from ..datasets import (download_file,
                         download_test_file,
@@ -44,15 +44,15 @@ def _add_mock_response(url, body, file_type='binary'):
                   )
 
 
-@yield_fixture
+@fixture
 def mock_url():
     _add_mock_response(_URL, _DATA.tobytes())
     _add_mock_response(_URL + '.md5', _CHECKSUM + '  ' + Path(_URL).name)
     yield _URL
     responses.reset()
 
 
-@yield_fixture(params=product((True, False), repeat=4))
+@fixture(params=product((True, False), repeat=4))
 def mock_urls(request):
     data = _DATA.tobytes()
     checksum = _CHECKSUM

phylib/stats/tests/test_clusters.py

@@ -9,7 +9,7 @@
 import numpy as np
 from numpy.testing import assert_array_equal as ae
 from numpy.testing import assert_allclose as ac
-from pytest import yield_fixture
+from pytest import fixture
 
 from ..clusters import (mean,
                         get_unmasked_channels,
@@ -26,42 +26,42 @@
 # Fixtures
 #------------------------------------------------------------------------------
 
-@yield_fixture
+@fixture
 def n_channels():
     yield 28
 
 
-@yield_fixture
+@fixture
 def n_spikes():
     yield 50
 
 
-@yield_fixture
+@fixture
 def n_samples():
     yield 40
 
 
-@yield_fixture
+@fixture
 def n_features_per_channel():
     yield 4
 
 
-@yield_fixture
+@fixture
 def features(n_spikes, n_channels, n_features_per_channel):
     yield artificial_features(n_spikes, n_channels, n_features_per_channel)
 
 
-@yield_fixture
+@fixture
 def masks(n_spikes, n_channels):
     yield artificial_masks(n_spikes, n_channels)
 
 
-@yield_fixture
+@fixture
 def waveforms(n_spikes, n_samples, n_channels):
     yield artificial_waveforms(n_spikes, n_samples, n_channels)
 
 
-@yield_fixture
+@fixture
 def site_positions(n_channels):
     yield staggered_positions(n_channels)