Commit 5d41f176 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

cleanup

parent 7fffbfc5
......@@ -26,8 +26,6 @@ import numpy as np
from keepers import Versionable,\
Loggable
from .config import nifty_configuration as gc
from .domain_object import DomainObject
from .spaces.power_space import PowerSpace
......
......@@ -20,7 +20,6 @@ from __future__ import division
from builtins import range
import numpy as np
from ...config import nifty_configuration as gc
from ...field import Field
from ..endomorphic_operator import EndomorphicOperator
......
......@@ -23,7 +23,6 @@ import numpy as np
from ...field import Field
from ... import nifty_utilities as utilities
from ... import nifty_configuration as nc
class Prober(object):
......
......@@ -22,7 +22,6 @@ import numpy as np
from ...spaces.space import Space
from functools import reduce
from ...config import nifty_configuration as gc
class PowerSpace(Space):
......
......@@ -24,8 +24,7 @@ from . import Space,\
ComposedOperator,\
DiagonalOperator,\
FFTOperator,\
sqrt,\
nifty_configuration
sqrt
__all__ = ['create_power_operator',
'generate_posterior_sample',
......
......@@ -29,8 +29,7 @@ from itertools import product
from nifty import Field,\
RGSpace,\
LMSpace,\
PowerSpace,\
nifty_configuration
PowerSpace
from test.common import expand
......
......@@ -29,7 +29,6 @@ from nifty import Field,\
FFTOperator
from itertools import product
from test.common import expand
from nose.plugins.skip import SkipTest
def _get_rtol(tp):
......
......@@ -22,7 +22,6 @@ import itertools
from numpy.testing import assert_, assert_equal, assert_raises,\
assert_almost_equal
from nose.plugins.skip import SkipTest
from nifty import GLSpace
from test.common import expand
......@@ -67,21 +66,14 @@ class GLSpaceInterfaceTests(unittest.TestCase):
@expand([['nlat', int],
['nlon', int]])
def test_property_ret_type(self, attribute, expected_type):
try:
g = GLSpace(2)
except ImportError:
raise SkipTest
else:
assert_(isinstance(getattr(g, attribute), expected_type))
g = GLSpace(2)
assert_(isinstance(getattr(g, attribute), expected_type))
class GLSpaceFunctionalityTests(unittest.TestCase):
@expand(CONSTRUCTOR_CONFIGS)
def test_constructor(self, nlat, nlon, expected):
try:
g = GLSpace(4)
except ImportError:
raise SkipTest
g = GLSpace(4)
if 'error' in expected:
with assert_raises(expected['error']):
......
......@@ -26,7 +26,6 @@ from numpy.testing import assert_, assert_equal, assert_almost_equal,\
from nifty import PowerSpace, RGSpace, Space, LMSpace
from test.common import expand
from itertools import product, chain
from nose.plugins.skip import SkipTest
HARMONIC_SPACES = [RGSpace((8,), harmonic=True),
RGSpace((8,), harmonic=True, zerocenter=True),
......
......@@ -23,7 +23,7 @@ import numpy as np
from numpy.testing import assert_, assert_equal, assert_almost_equal, \
assert_array_equal
from nifty import RGSpace, nifty_configuration
from nifty import RGSpace
from test.common import expand
from itertools import product
from nose.plugins.skip import SkipTest
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment