Merge pull request #248 from fooof-tools/pytest

[MNT] - Update pytest imports (py.test -> pytest)

Author: TomDonoghue

fooof/tests/bands/test_bands.py

@@ -1,6 +1,6 @@
 """Test functions for fooof.data.bands."""
 
-from py.test import raises
+from pytest import raises
 
 from fooof.bands.bands import *
 

fooof/tests/core/test_funcs.py

@@ -1,6 +1,6 @@
 """Tests for fooof.core.funcs."""
 
-from py.test import raises
+from pytest import raises
 
 import numpy as np
 from scipy.stats import norm, linregress

fooof/tests/core/test_utils.py

@@ -5,7 +5,7 @@
 
 from numpy import array_equal
 
-from py.test import raises
+from pytest import raises
 
 from fooof.core.utils import *
 

fooof/tests/objs/test_fit.py

@@ -7,7 +7,7 @@
 """
 
 import numpy as np
-from py.test import raises
+from pytest import raises
 
 from fooof.core.items import OBJ_DESC
 from fooof.core.errors import FitError

fooof/tests/objs/test_utils.py

@@ -1,6 +1,6 @@
 """Test functions for fooof.objs.utils."""
 
-from py.test import raises
+from pytest import raises
 
 import numpy as np
 

fooof/tests/plts/test_fg.py

@@ -1,6 +1,6 @@
 """Tests for fooof.plts.fg."""
 
-from py.test import raises
+from pytest import raises
 
 from fooof import FOOOFGroup
 from fooof.core.errors import NoModelError

fooof/tests/sim/test_params.py

@@ -1,6 +1,6 @@
 """Test functions for fooof.sim.params."""
 
-from py.test import raises
+from pytest import raises
 
 from numpy import array_equal