Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fooof/tests/bands/test_bands.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Test functions for fooof.data.bands."""

from py.test import raises
from pytest import raises

from fooof.bands.bands import *

Expand Down
2 changes: 1 addition & 1 deletion fooof/tests/core/test_funcs.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion fooof/tests/core/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from numpy import array_equal

from py.test import raises
from pytest import raises

from fooof.core.utils import *

Expand Down
2 changes: 1 addition & 1 deletion fooof/tests/objs/test_fit.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion fooof/tests/objs/test_utils.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Test functions for fooof.objs.utils."""

from py.test import raises
from pytest import raises

import numpy as np

Expand Down
2 changes: 1 addition & 1 deletion fooof/tests/plts/test_fg.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion fooof/tests/sim/test_params.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Test functions for fooof.sim.params."""

from py.test import raises
from pytest import raises

from numpy import array_equal

Expand Down