Merge pull request #476 from satra/fix/github

Fix/github

Author: satra

nipype/pkg_info.py

@@ -48,7 +48,7 @@ def pkg_commit_hash(pkg_path):
     if install_subst != '':
         return 'installation', install_subst
     # maybe we are in a repository
-    proc = subprocess.Popen('git rev-parse --short HEAD',
+    proc = subprocess.Popen('git rev-parse HEAD',
                             stdout=subprocess.PIPE,
                             stderr=subprocess.PIPE,
                             cwd=pkg_path, shell=True)

tools/github.py

@@ -81,17 +81,17 @@ def get_repo_url(force_github=False):
     return uri
 
 
-def get_file_url(object, hashmap):
+def get_file_url(object):
     """Returns local or remote url for an object
     """
     filename = inspect.getsourcefile(object)
     lines = inspect.getsourcelines(object)
     uri = 'file://%s#L%d' % (filename, lines[1])
     if is_git_repo():
-        o, _ = Popen('git hash-object %s' % filename, shell=True, stdout=PIPE,
-                     cwd=os.path.dirname(nipype.__file__)).communicate()
-        key = o.strip()
-        if key in hashmap:
-            uri = 'http://github.com/nipy/nipype/blob/master/' + \
-                  hashmap[key] + '#L%d' % lines[1]
+        info = nipype.get_info()
+        shortfile = os.path.join('nipype', filename.split('nipype/')[-1])
+        print shortfile
+        uri = 'http://github.com/nipy/nipype/tree/%s/%s#L%d' % \
+                                                           (info['commit_hash'],
+                                                            shortfile, lines[1])
     return uri

tools/interfacedocgen.py

@@ -31,7 +31,7 @@
 from nipype.pipeline.engine import Workflow
 from nipype.utils.misc import trim
 
-from github import create_hash_map, get_file_url
+from github import get_file_url
 
 # Functions and classes
 class InterfaceHelpWriter(object):
@@ -284,7 +284,6 @@ def generate_api_doc(self, uri):
 
         #ad += '\n' + 'Classes' + '\n' + \
         #    self.rst_section_levels[2] * 7 + '\n'
-        hashmap = create_hash_map()
         for c in classes:
             __import__(uri)
             print c
@@ -303,7 +302,7 @@ def generate_api_doc(self, uri):
             ad += '\n.. _%s\n\n' % label
             ad += '\n.. index:: %s\n\n' % c
             ad += c + '\n' + self.rst_section_levels[2] * len(c) + '\n\n'
-            ad += "Code: %s\n\n" % get_file_url(classinst, hashmap)
+            ad += "Code: %s\n\n" % get_file_url(classinst)
             ad += trim(classinst.help(returnhelp=True),
                        self.rst_section_levels[3]) + '\n'
 
@@ -314,7 +313,7 @@ def generate_api_doc(self, uri):
             label = ':func:`' + name + '`'
             ad += '\n.. _%s:\n\n' % (uri + '.' + name)
             ad += '\n'.join((label, self.rst_section_levels[2] * len(label)))
-            ad += "\n\nCode: %s\n\n" % get_file_url(finst, hashmap)
+            ad += "\n\nCode: %s\n\n" % get_file_url(finst)
             helpstr = trim(finst.__doc__, self.rst_section_levels[3])
             ad += '\n\n' + helpstr + '\n\n'
 
@@ -333,7 +332,7 @@ def generate_api_doc(self, uri):
             label = ':func:`' + name + '`'
             ad += '\n.. _%s:\n\n' % (uri + '.' + name)
             ad += '\n'.join((label, self.rst_section_levels[2] * len(label)))
-            ad += "\n\nCode: %s\n\n" % get_file_url(finst, hashmap)
+            ad += "\n\nCode: %s\n\n" % get_file_url(finst)
             helpstr = trim(finst.__doc__, self.rst_section_levels[3])
             ad += '\n\n' + helpstr + '\n\n'