Merge pull request #1103 from matthew-brett/windows-fixes

MRG: fixes to get Windows tests to run

Author: satra

nipype/pipeline/plugins/base.py

@@ -6,8 +6,7 @@
 from copy import deepcopy
 from glob import glob
 import os
-import pickle
-import pwd
+import getpass
 import shutil
 from socket import gethostname
 import sys
@@ -23,8 +22,6 @@
 from ..engine import (MapNode, str2bool)
 
 from nipype.utils.filemanip import savepkl, loadpkl
-from nipype.interfaces.utility import Function
-
 
 from ... import logging
 logger = logging.getLogger('workflow')
@@ -55,7 +52,7 @@ def report_crash(node, traceback=None, hostname=None):
                                      exc_value,
                                      exc_traceback)
     timeofcrash = strftime('%Y%m%d-%H%M%S')
-    login_name = pwd.getpwuid(os.geteuid())[0]
+    login_name = getpass.getuser()
     crashfile = 'crash-%s-%s-%s.pklz' % (timeofcrash,
                                         login_name,
                                         name)

nipype/pipeline/utils.py

@@ -7,28 +7,24 @@
 from glob import glob
 from collections import defaultdict
 import os
-import pwd
 import re
-from uuid import uuid1
 
 import numpy as np
 from nipype.utils.misc import package_check
 from nipype.external import six
 
 package_check('networkx', '1.3')
-from socket import gethostname
 
 import networkx as nx
 
 from ..utils.filemanip import (fname_presuffix, FileNotFoundError,
                                filename_to_list, get_related_files)
 from ..utils.misc import create_function_from_source, str2bool
-from ..interfaces.base import (CommandLine, isdefined, Undefined, Bunch,
+from ..interfaces.base import (CommandLine, isdefined, Undefined,
                                InterfaceResult)
 from ..interfaces.utility import IdentityInterface
 from ..utils.provenance import ProvStore, pm, nipype_ns, get_id
 
-from .. import get_info
 from .. import logging, config
 logger = logging.getLogger('workflow')
 

nipype/utils/config.py

@@ -18,7 +18,8 @@
 
 from ..external import portalocker
 
-homedir = os.environ['HOME']
+# Get home directory in platform-agnostic way
+homedir = os.path.expanduser('~')
 default_cfg = """
 [logging]
 workflow_level = INFO

nipype/utils/provenance.py

@@ -1,7 +1,7 @@
 from cPickle import dumps
 import json
 import os
-import pwd
+import getpass
 from socket import getfqdn
 from uuid import uuid1
 from nipype.external import six
@@ -363,9 +363,8 @@ def add_results(self, results):
 
         # create agents
         user_attr = {pm.PROV["type"]: pm.PROV["Person"],
-                     pm.PROV["label"]: pwd.getpwuid(os.geteuid()).pw_name,
-                     foaf["name"]:
-                         safe_encode(pwd.getpwuid(os.geteuid()).pw_name)}
+                     pm.PROV["label"]: getpass.getuser(),
+                     foaf["name"]: safe_encode(getpass.getuser())}
         user_agent = self.g.agent(get_attr_id(user_attr), user_attr)
         agent_attr = {pm.PROV["type"]: pm.PROV["SoftwareAgent"],
                       pm.PROV["label"]: "Nipype",