fix: install to work with pip

thelxinoe · Mar 30, 2014 · f550c81 · f550c81
1 parent 07143af
commit f550c81
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 16 deletions.
diff --git a/nipype/info.py b/nipype/info.py
@@ -122,6 +122,7 @@ def get_nipype_gitversion():
 MICRO               = _version_micro
 ISRELEASE           = _version_extra == ''
 VERSION             = __version__
-REQUIRES            = ["nibabel (>=1.0)", "networkx (>=1.0)", "numpy (>=1.3)",
-                       "scipy (>=0.7)", "traits (>=4.0)"]
+REQUIRES            = ["nibabel>=1.0", "networkx>=1.0", "numpy>=1.3",
+                       "python-dateutil>1.0", "scipy>=0.7", "traits>=4.0",
+                       "nose>=1.0"]
 STATUS              = 'stable'
diff --git a/requirements.txt b/requirements.txt
@@ -2,6 +2,6 @@ numpy>=1.3
 scipy>=0.7
 networkx>=1.0
 traits>=4.0
-dateutil>=1.5
+python-dateutil>=1.5
 nibabel>=1.0
 nose>=1.0
diff --git a/setup.py b/setup.py
@@ -11,13 +11,69 @@
 
 import sys
 from glob import glob
+from os.path import join as pjoin
 
-# Import build helpers
 try:
-    from nisext.sexts import package_check, get_comrec_build
+    from ConfigParser import ConfigParser
 except ImportError:
-    raise RuntimeError('Need nisext package from nibabel installation'
-                       ' - please install nibabel first')
+    from configparser import ConfigParser
+
+from distutils.command.build_py import build_py
+
+def get_comrec_build(pkg_dir, build_cmd=build_py):
+    """ Return extended build command class for recording commit
+
+    The extended command tries to run git to find the current commit, getting
+    the empty string if it fails.  It then writes the commit hash into a file
+    in the `pkg_dir` path, named ``COMMIT_INFO.txt``.
+
+    In due course this information can be used by the package after it is
+    installed, to tell you what commit it was installed from if known.
+
+    To make use of this system, you need a package with a COMMIT_INFO.txt file -
+    e.g. ``myproject/COMMIT_INFO.txt`` - that might well look like this::
+
+        # This is an ini file that may contain information about the code state
+        [commit hash]
+        # The line below may contain a valid hash if it has been substituted
+        during 'git archive' archive_subst_hash=$Format:%h$
+        # This line may be modified by the install process
+        install_hash=
+
+    The COMMIT_INFO file above is also designed to be used with git substitution
+    - so you probably also want a ``.gitattributes`` file in the root directory
+    of your working tree that contains something like this::
+
+       myproject/COMMIT_INFO.txt export-subst
+
+    That will cause the ``COMMIT_INFO.txt`` file to get filled in by ``git
+    archive`` - useful in case someone makes such an archive - for example with
+    via the github 'download source' button.
+
+    Although all the above will work as is, you might consider having something
+    like a ``get_info()`` function in your package to display the commit
+    information at the terminal.  See the ``pkg_info.py`` module in the nipy
+    package for an example.
+    """
+    class MyBuildPy(build_cmd):
+        ''' Subclass to write commit data into installation tree '''
+        def run(self):
+            build_cmd.run(self)
+            import subprocess
+            proc = subprocess.Popen('git rev-parse HEAD',
+                                    stdout=subprocess.PIPE,
+                                    stderr=subprocess.PIPE,
+                                    shell=True)
+            repo_commit, _ = proc.communicate()
+            # Fix for python 3
+            repo_commit = str(repo_commit)
+            # We write the installation commit even if it's empty
+            cfg_parser = ConfigParser()
+            cfg_parser.read(pjoin(pkg_dir, 'COMMIT_INFO.txt'))
+            cfg_parser.set('commit hash', 'install_hash', repo_commit)
+            out_pth = pjoin(self.build_lib, pkg_dir, 'COMMIT_INFO.txt')
+            cfg_parser.write(open(out_pth, 'wt'))
+    return MyBuildPy
 
 from build_docs import cmdclass, INFO_VARS
 
@@ -55,12 +111,6 @@ def configuration(parent_package='',top_path=None):
 if not 'extra_setuptools_args' in globals():
     extra_setuptools_args = dict()
 
-# Hard and soft dependency checking
-package_check('networkx', INFO_VARS['NETWORKX_MIN_VERSION'])
-package_check('nibabel', INFO_VARS['NIBABEL_MIN_VERSION'])
-package_check('numpy', INFO_VARS['NUMPY_MIN_VERSION'])
-package_check('scipy', INFO_VARS['SCIPY_MIN_VERSION'])
-package_check('traits', INFO_VARS['TRAITS_MIN_VERSION'])
 
 ################################################################################
 # Import the documentation building classes.
@@ -91,13 +141,11 @@ def main(**extra_args):
           author_email=INFO_VARS['AUTHOR_EMAIL'],
           platforms=INFO_VARS['PLATFORMS'],
           version=INFO_VARS['VERSION'],
-          requires=INFO_VARS['REQUIRES'],
+          install_requires=INFO_VARS['REQUIRES'],
           configuration = configuration,
           cmdclass = cmdclass,
           scripts = glob('bin/*'),
           **extra_args)
 
-
-
 if __name__ == "__main__":
     main(**extra_setuptools_args)