Commit 212c7dc8 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

fix wrong import statement; some consistency improvements

parent 23c5f455
Pipeline #13208 passed with stage
in 4 minutes and 54 seconds
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
# and financially supported by the Studienstiftung des deutschen Volkes. # and financially supported by the Studienstiftung des deutschen Volkes.
from nose_parameterized import parameterized from parameterized import parameterized
from nifty import RGSpace, LMSpace, HPSpace, GLSpace, PowerSpace from nifty import RGSpace, LMSpace, HPSpace, GLSpace, PowerSpace
from nifty.config import dependency_injector as di from nifty.config import dependency_injector as gdi
def custom_name_func(testcase_func, param_num, param): def custom_name_func(testcase_func, param_num, param):
...@@ -36,7 +36,7 @@ def expand(*args, **kwargs): ...@@ -36,7 +36,7 @@ def expand(*args, **kwargs):
def generate_spaces(): def generate_spaces():
spaces = [RGSpace(4), PowerSpace(RGSpace((4, 4), harmonic=True)), spaces = [RGSpace(4), PowerSpace(RGSpace((4, 4), harmonic=True)),
LMSpace(5), HPSpace(4)] LMSpace(5), HPSpace(4)]
if 'pyHealpix' in di: if 'pyHealpix' in gdi:
spaces.append(GLSpace(4)) spaces.append(GLSpace(4))
return spaces return spaces
......
from nifty import * from nifty import *
#This tests if it is possible to import all of nifties methods. Experience shows this is not always possible. # This tests if it is possible to import all of Nifty's methods.
pass # Experience shows this is not always possible.
\ No newline at end of file pass
...@@ -24,7 +24,7 @@ from numpy.testing import assert_, assert_equal, assert_raises,\ ...@@ -24,7 +24,7 @@ from numpy.testing import assert_, assert_equal, assert_raises,\
assert_almost_equal assert_almost_equal
from nose.plugins.skip import SkipTest from nose.plugins.skip import SkipTest
from nifty import GLSpace from nifty import GLSpace
from nifty.config import dependency_injector as di from nifty.config import dependency_injector as gdi
from test.common import expand from test.common import expand
# [nlat, nlon, expected] # [nlat, nlon, expected]
...@@ -99,7 +99,7 @@ class GLSpaceFunctionalityTests(unittest.TestCase): ...@@ -99,7 +99,7 @@ class GLSpaceFunctionalityTests(unittest.TestCase):
except ImportError: except ImportError:
raise SkipTest raise SkipTest
if 'pyHealpix' not in di: if 'pyHealpix' not in gdi:
raise SkipTest raise SkipTest
else: else:
g = GLSpace(2) g = GLSpace(2)
......
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