From 0704f7ec60c1b6c954f81f392587ce524aec3e66 Mon Sep 17 00:00:00 2001 From: Steven Tilley Date: Tue, 8 Oct 2019 10:22:16 -0400 Subject: [PATCH 1/3] Allow nipype configuration directory to be specified with NIPYPECONFDIR --- nipype/utils/config.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nipype/utils/config.py b/nipype/utils/config.py index 219215e0c8..228e9933e0 100644 --- a/nipype/utils/config.py +++ b/nipype/utils/config.py @@ -97,7 +97,9 @@ def __init__(self, *args, **kwargs): self._config = configparser.ConfigParser() self._cwd = None - config_dir = os.path.expanduser('~/.nipype') + config_dir = os.path.expanduser( + os.getenv('NIPYPECONFDIR', + default='~/.nipype')) self.data_file = os.path.join(config_dir, 'nipype.json') self.set_default_config() From 78fa360f5b785224349b8b85b07e510d2233bb63 Mon Sep 17 00:00:00 2001 From: Steven Tilley Date: Fri, 15 Nov 2019 14:38:10 -0500 Subject: [PATCH 2/3] run black --- nipype/utils/config.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nipype/utils/config.py b/nipype/utils/config.py index 02cd0c910a..d55c30a3a0 100644 --- a/nipype/utils/config.py +++ b/nipype/utils/config.py @@ -91,9 +91,7 @@ def __init__(self, *args, **kwargs): self._config = configparser.ConfigParser() self._cwd = None - config_dir = os.path.expanduser( - os.getenv("NIPYPECONFDIR", - default="~/.nipype")) + config_dir = os.path.expanduser(os.getenv("NIPYPECONFDIR", default="~/.nipype")) self.data_file = os.path.join(config_dir, "nipype.json") self.set_default_config() From 20267870f8feb012cd14d196e985c22689c01fc1 Mon Sep 17 00:00:00 2001 From: Steven Tilley Date: Mon, 16 Dec 2019 15:56:39 -0500 Subject: [PATCH 3/3] Update nipype/utils/config.py Co-Authored-By: Chris Markiewicz --- nipype/utils/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nipype/utils/config.py b/nipype/utils/config.py index d55c30a3a0..5ba52bfb04 100644 --- a/nipype/utils/config.py +++ b/nipype/utils/config.py @@ -91,7 +91,7 @@ def __init__(self, *args, **kwargs): self._config = configparser.ConfigParser() self._cwd = None - config_dir = os.path.expanduser(os.getenv("NIPYPECONFDIR", default="~/.nipype")) + config_dir = os.path.expanduser(os.getenv("NIPYPE_CONFIG_DIR", default="~/.nipype")) self.data_file = os.path.join(config_dir, "nipype.json") self.set_default_config()