Commit c53029ef authored by theos's avatar theos

Adapted to new version of keepers.get_Configuration()

parent 4d18d0b9
...@@ -6,5 +6,8 @@ import keepers ...@@ -6,5 +6,8 @@ import keepers
# pre-create the D2O configuration instance and set its path explicitly # pre-create the D2O configuration instance and set its path explicitly
d2o_configuration = keepers.get_Configuration( d2o_configuration = keepers.get_Configuration(
'D2O', name='D2O',
path=os.path.expanduser('~') + "/.nifty/d2o_config") file_name='D2O.conf',
search_pathes=[os.path.expanduser('~') + "/.config/nifty/",
os.path.expanduser('~') + "/.config/",
'./'])
...@@ -52,13 +52,12 @@ variable_use_healpy = keepers.Variable( ...@@ -52,13 +52,12 @@ variable_use_healpy = keepers.Variable(
genus='boolean') genus='boolean')
variable_use_libsharp = keepers.Variable( variable_use_libsharp = keepers.Variable(
'use_libsharp', 'use_libsharp',
[True, False], [True, False],
lambda z: (('libsharp_wrapper_gl' in lambda z: (('libsharp_wrapper_gl' in
dependency_injector) dependency_injector)
if z else True) and if z else True) and isinstance(z, bool),
isinstance(z, bool), genus='boolean')
genus='boolean')
variable_verbosity = keepers.Variable('verbosity', variable_verbosity = keepers.Variable('verbosity',
[1], [1],
...@@ -88,16 +87,19 @@ variable_default_distribution_strategy = keepers.Variable( ...@@ -88,16 +87,19 @@ variable_default_distribution_strategy = keepers.Variable(
genus='str') genus='str')
nifty_configuration = keepers.get_Configuration( nifty_configuration = keepers.get_Configuration(
'NIFTy', name='NIFTy',
[variable_fft_module, variables=[variable_fft_module,
variable_lm2gl, variable_lm2gl,
variable_use_healpy, variable_use_healpy,
variable_use_libsharp, variable_use_libsharp,
variable_verbosity, variable_verbosity,
variable_default_field_dtype, variable_default_field_dtype,
variable_default_distribution_strategy, variable_default_distribution_strategy],
], file_name='NIFTy.conf',
path=os.path.expanduser('~') + "/.nifty/nifty_config") search_pathes=[os.path.expanduser('~') + "/.config/nifty/",
os.path.expanduser('~') + "/.config/",
'./'])
######## ########
### Compatibility variables ### Compatibility variables
######## ########
......
...@@ -44,9 +44,9 @@ setup(name="ift_nifty", ...@@ -44,9 +44,9 @@ setup(name="ift_nifty",
]), ]),
include_dirs=[numpy.get_include()], include_dirs=[numpy.get_include()],
dependency_links=[ 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'], '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'], package_data={'nifty.demos': ['demo_faraday_map.npy'],
}, },
license="GPLv3", license="GPLv3",
......
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