From 212c7dc8e70c63d0b2b9b793e997f149eff99e37 Mon Sep 17 00:00:00 2001
From: Martin Reinecke <martin@mpa-garching.mpg.de>
Date: Thu, 1 Jun 2017 11:28:10 +0200
Subject: [PATCH] fix wrong import statement; some consistency improvements
---
test/common.py | 6 +++---
test/test_init.py | 5 +++--
test/test_spaces/test_gl_space.py | 4 ++--
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/test/common.py b/test/common.py
index 4aeb1264a..c0e439264 100644
--- a/test/common.py
+++ b/test/common.py
@@ -16,9 +16,9 @@
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
# 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.config import dependency_injector as di
+from nifty.config import dependency_injector as gdi
def custom_name_func(testcase_func, param_num, param):
@@ -36,7 +36,7 @@ def expand(*args, **kwargs):
def generate_spaces():
spaces = [RGSpace(4), PowerSpace(RGSpace((4, 4), harmonic=True)),
LMSpace(5), HPSpace(4)]
- if 'pyHealpix' in di:
+ if 'pyHealpix' in gdi:
spaces.append(GLSpace(4))
return spaces
diff --git a/test/test_init.py b/test/test_init.py
index 7d23ef5c9..fcd9fcf98 100644
--- a/test/test_init.py
+++ b/test/test_init.py
@@ -1,4 +1,5 @@
from nifty import *
-#This tests if it is possible to import all of nifties methods. Experience shows this is not always possible.
-pass
\ No newline at end of file
+# This tests if it is possible to import all of Nifty's methods.
+# Experience shows this is not always possible.
+pass
diff --git a/test/test_spaces/test_gl_space.py b/test/test_spaces/test_gl_space.py
index 3d0a053ca..71184b207 100644
--- a/test/test_spaces/test_gl_space.py
+++ b/test/test_spaces/test_gl_space.py
@@ -24,7 +24,7 @@ from numpy.testing import assert_, assert_equal, assert_raises,\
assert_almost_equal
from nose.plugins.skip import SkipTest
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
# [nlat, nlon, expected]
@@ -99,7 +99,7 @@ class GLSpaceFunctionalityTests(unittest.TestCase):
except ImportError:
raise SkipTest
- if 'pyHealpix' not in di:
+ if 'pyHealpix' not in gdi:
raise SkipTest
else:
g = GLSpace(2)
--
GitLab