From 5d41f176e5a092d891d90e018ddd564ac71bf857 Mon Sep 17 00:00:00 2001
From: Martin Reinecke <martin@mpa-garching.mpg.de>
Date: Thu, 31 Aug 2017 21:01:58 +0200
Subject: [PATCH] cleanup
---
nifty/field.py | 2 --
.../diagonal_operator/diagonal_operator.py | 1 -
nifty/probing/prober/prober.py | 1 -
nifty/spaces/power_space/power_space.py | 1 -
nifty/sugar.py | 3 +--
test/test_field.py | 3 +--
test/test_operators/test_fft_operator.py | 1 -
test/test_spaces/test_gl_space.py | 14 +++-----------
test/test_spaces/test_power_space.py | 1 -
test/test_spaces/test_rg_space.py | 2 +-
10 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/nifty/field.py b/nifty/field.py
index 032d57bb9..c8e12f83c 100644
--- a/nifty/field.py
+++ b/nifty/field.py
@@ -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
diff --git a/nifty/operators/diagonal_operator/diagonal_operator.py b/nifty/operators/diagonal_operator/diagonal_operator.py
index 119a30bd0..b452632a9 100644
--- a/nifty/operators/diagonal_operator/diagonal_operator.py
+++ b/nifty/operators/diagonal_operator/diagonal_operator.py
@@ -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
diff --git a/nifty/probing/prober/prober.py b/nifty/probing/prober/prober.py
index 5c9afefa0..7d79dce6c 100644
--- a/nifty/probing/prober/prober.py
+++ b/nifty/probing/prober/prober.py
@@ -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):
diff --git a/nifty/spaces/power_space/power_space.py b/nifty/spaces/power_space/power_space.py
index 9a8a697e8..e8e0ea360 100644
--- a/nifty/spaces/power_space/power_space.py
+++ b/nifty/spaces/power_space/power_space.py
@@ -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):
diff --git a/nifty/sugar.py b/nifty/sugar.py
index 6f25f425e..72240d0ea 100644
--- a/nifty/sugar.py
+++ b/nifty/sugar.py
@@ -24,8 +24,7 @@ from . import Space,\
ComposedOperator,\
DiagonalOperator,\
FFTOperator,\
- sqrt,\
- nifty_configuration
+ sqrt
__all__ = ['create_power_operator',
'generate_posterior_sample',
diff --git a/test/test_field.py b/test/test_field.py
index 0b2fa51d5..dffb263e7 100644
--- a/test/test_field.py
+++ b/test/test_field.py
@@ -29,8 +29,7 @@ from itertools import product
from nifty import Field,\
RGSpace,\
LMSpace,\
- PowerSpace,\
- nifty_configuration
+ PowerSpace
from test.common import expand
diff --git a/test/test_operators/test_fft_operator.py b/test/test_operators/test_fft_operator.py
index af57f93aa..841108973 100644
--- a/test/test_operators/test_fft_operator.py
+++ b/test/test_operators/test_fft_operator.py
@@ -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):
diff --git a/test/test_spaces/test_gl_space.py b/test/test_spaces/test_gl_space.py
index fd6a2a64b..2dd461b04 100644
--- a/test/test_spaces/test_gl_space.py
+++ b/test/test_spaces/test_gl_space.py
@@ -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']):
diff --git a/test/test_spaces/test_power_space.py b/test/test_spaces/test_power_space.py
index ae3255460..114bead49 100644
--- a/test/test_spaces/test_power_space.py
+++ b/test/test_spaces/test_power_space.py
@@ -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),
diff --git a/test/test_spaces/test_rg_space.py b/test/test_spaces/test_rg_space.py
index 14813075d..f0321706f 100644
--- a/test/test_spaces/test_rg_space.py
+++ b/test/test_spaces/test_rg_space.py
@@ -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
--
GitLab