From c53029eff374523d53ed2b0d9bc946382c57e7b4 Mon Sep 17 00:00:00 2001
From: theos <theo.steininger@ultimanet.de>
Date: Tue, 4 Oct 2016 03:31:41 +0200
Subject: [PATCH] Adapted to new version of keepers.get_Configuration()

---
 nifty/config/d2o_config.py   |  7 +++++--
 nifty/config/nifty_config.py | 36 +++++++++++++++++++-----------------
 setup.py                     |  4 ++--
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/nifty/config/d2o_config.py b/nifty/config/d2o_config.py
index b38b9d6a..3a094d16 100644
--- a/nifty/config/d2o_config.py
+++ b/nifty/config/d2o_config.py
@@ -6,5 +6,8 @@ import keepers
 
 # pre-create the D2O configuration instance and set its path explicitly
 d2o_configuration = keepers.get_Configuration(
-                        'D2O',
-                        path=os.path.expanduser('~') + "/.nifty/d2o_config")
+                    name='D2O',
+                    file_name='D2O.conf',
+                    search_pathes=[os.path.expanduser('~') + "/.config/nifty/",
+                                   os.path.expanduser('~') + "/.config/",
+                                   './'])
diff --git a/nifty/config/nifty_config.py b/nifty/config/nifty_config.py
index c4c4c85a..590b6a40 100644
--- a/nifty/config/nifty_config.py
+++ b/nifty/config/nifty_config.py
@@ -52,13 +52,12 @@ variable_use_healpy = keepers.Variable(
                           genus='boolean')
 
 variable_use_libsharp = keepers.Variable(
-                                 'use_libsharp',
-                                 [True, False],
-                                 lambda z: (('libsharp_wrapper_gl' in
-                                             dependency_injector)
-                                            if z else True) and
-                                            isinstance(z, bool),
-                                 genus='boolean')
+                         'use_libsharp',
+                         [True, False],
+                         lambda z: (('libsharp_wrapper_gl' in
+                                     dependency_injector)
+                                    if z else True) and isinstance(z, bool),
+                         genus='boolean')
 
 variable_verbosity = keepers.Variable('verbosity',
                                       [1],
@@ -88,16 +87,19 @@ variable_default_distribution_strategy = keepers.Variable(
                               genus='str')
 
 nifty_configuration = keepers.get_Configuration(
-                     'NIFTy',
-                     [variable_fft_module,
-                      variable_lm2gl,
-                      variable_use_healpy,
-                      variable_use_libsharp,
-                      variable_verbosity,
-                      variable_default_field_dtype,
-                      variable_default_distribution_strategy,
-                      ],
-                     path=os.path.expanduser('~') + "/.nifty/nifty_config")
+                 name='NIFTy',
+                 variables=[variable_fft_module,
+                            variable_lm2gl,
+                            variable_use_healpy,
+                            variable_use_libsharp,
+                            variable_verbosity,
+                            variable_default_field_dtype,
+                            variable_default_distribution_strategy],
+                 file_name='NIFTy.conf',
+                 search_pathes=[os.path.expanduser('~') + "/.config/nifty/",
+                                os.path.expanduser('~') + "/.config/",
+                                './'])
+
 ########
 ### Compatibility variables
 ########
diff --git a/setup.py b/setup.py
index 6f458ba2..d1c1482e 100644
--- a/setup.py
+++ b/setup.py
@@ -44,9 +44,9 @@ setup(name="ift_nifty",
       ]),
       include_dirs=[numpy.get_include()],
       dependency_links=[
-        'git+https://gitlab.mpcdf.mpg.de/ift/keepers.git#egg=keepers',
+        'git+https://gitlab.mpcdf.mpg.de/ift/keepers.git#egg=keepers-0.1.1',
         'git+https://gitlab.mpcdf.mpg.de/ift/d2o.git#egg=d2o-1.0.4'],
-      install_requires=['keepers', 'd2o>=1.0.4'],
+      install_requires=['keepers>=0.1.1', 'd2o>=1.0.4'],
       package_data={'nifty.demos': ['demo_faraday_map.npy'],
                     },
       license="GPLv3",
-- 
GitLab