Skip to content

Commit

Permalink
MAINT: special: make tests pass without nose
Browse files Browse the repository at this point in the history
  • Loading branch information
ev-br committed Aug 21, 2017
1 parent d0dfa03 commit bca145b
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 5 deletions.
3 changes: 2 additions & 1 deletion scipy/special/tests/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@
log, zeros, sqrt, asarray, inf, nan_to_num, real, arctan, float_)

import pytest
from pytest import raises as assert_raises
from numpy.testing import (assert_equal, assert_almost_equal,
assert_array_equal, assert_array_almost_equal, assert_approx_equal,
assert_, assert_allclose,
assert_raises, assert_array_almost_equal_nulp)
assert_array_almost_equal_nulp)

from scipy import special
import scipy.special._ufuncs as cephes
Expand Down
2 changes: 2 additions & 0 deletions scipy/special/tests/test_loggamma.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import division, print_function, absolute_import

import numpy as np
from numpy.testing import assert_allclose

Expand Down
3 changes: 2 additions & 1 deletion scipy/special/tests/test_orthogonal.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import numpy as np
from numpy import array, sqrt
from numpy.testing import (assert_array_almost_equal, assert_equal,
assert_almost_equal, assert_allclose, assert_raises)
assert_almost_equal, assert_allclose)
from pytest import raises as assert_raises

from scipy._lib.six import xrange
from scipy import integrate
Expand Down
3 changes: 2 additions & 1 deletion scipy/special/tests/test_sf_error.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

import warnings

from numpy.testing import assert_, assert_equal, assert_raises
from numpy.testing import assert_, assert_equal
from scipy._lib._numpy_compat import suppress_warnings
import pytest
from pytest import raises as assert_raises

import scipy.special as sc
from scipy.special._ufuncs import _sf_error_test_function
Expand Down
2 changes: 2 additions & 0 deletions scipy/special/tests/test_sici.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import division, print_function, absolute_import

import numpy as np

import scipy.special as sc
Expand Down
2 changes: 2 additions & 0 deletions scipy/special/tests/test_spence.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import division, print_function, absolute_import

import numpy as np
from numpy import sqrt, log, pi
from scipy.special._testutils import FuncData
Expand Down
5 changes: 3 additions & 2 deletions scipy/special/tests/test_spfun_stats.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from __future__ import division, print_function, absolute_import

import numpy as np
from numpy.testing import assert_array_equal, \
assert_array_almost_equal_nulp, assert_raises, assert_almost_equal
from numpy.testing import (assert_array_equal,
assert_array_almost_equal_nulp, assert_almost_equal)
from pytest import raises as assert_raises

from scipy.special import gammaln, multigammaln

Expand Down
2 changes: 2 additions & 0 deletions scipy/special/tests/test_trig.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import division, print_function, absolute_import

import numpy as np
from numpy.testing import assert_equal, assert_allclose

Expand Down
2 changes: 2 additions & 0 deletions scipy/special/tests/test_wrightomega.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import division, print_function, absolute_import

import numpy as np
from numpy.testing import assert_, assert_equal

Expand Down

0 comments on commit bca145b

Please sign in to comment.