support optional gitdb_speedups

1 files changed, 37 insertions, 117 deletions

diff --git a/setup.py b/setup.py
index c2f9f1e..eccb952 100755
--- a/setup.py
+++ b/setup.py
@@ -1,125 +1,45 @@
-#!/usr/bin/env python
-from distutils.core import setup, Extension
-from distutils.command.build_py import build_py
-from distutils.command.build_ext import build_ext
+from setuptools import setup
 
-import os
-import sys
+# NOTE: This is currently duplicated from the gitdb.__init__ module, because
+# that's just how you write a setup.py (nobody reads this stuff out of the
+# module)
 
-# wow, this is a mixed bag ... I am pretty upset about all of this ...
-setuptools_build_py_module = None
-try:
-    # don't pull it in if we don't have to
-    if 'setuptools' in sys.modules:
-        import setuptools.command.build_py as setuptools_build_py_module
-        from setuptools.command.build_ext import build_ext
-except ImportError:
-    pass
-
-
-class build_ext_nofail(build_ext):
-
-    """Doesn't fail when build our optional extensions"""
-
-    def run(self):
-        try:
-            build_ext.run(self)
-        except Exception:
-            print("Ignored failure when building extensions, pure python modules will be used instead")
-        # END ignore errors
-
-
-def get_data_files(self):
-    """Can you feel the pain ? So, in python2.5 and python2.4 coming with maya, 
-    the line dealing with the ``plen`` has a bug which causes it to truncate too much.
-    It is fixed in the system interpreters as they receive patches, and shows how
-    bad it is if something doesn't have proper unittests.
-    The code here is a plain copy of the python2.6 version which works for all.
-
-    Generate list of '(package,src_dir,build_dir,filenames)' tuples"""
-    data = []
-    if not self.packages:
-        return data
-
-    # this one is just for the setup tools ! They don't iniitlialize this variable
-    # when they should, but do it on demand using this method.Its crazy
-    if hasattr(self, 'analyze_manifest'):
-        self.analyze_manifest()
-    # END handle setuptools ...
-
-    for package in self.packages:
-        # Locate package source directory
-        src_dir = self.get_package_dir(package)
-
-        # Compute package build directory
-        build_dir = os.path.join(*([self.build_lib] + package.split('.')))
-
-        # Length of path to strip from found files
-        plen = 0
-        if src_dir:
-            plen = len(src_dir) + 1
-
-        # Strip directory from globbed filenames
-        filenames = [
-            file[plen:] for file in self.find_data_files(package, src_dir)
-        ]
-        data.append((package, src_dir, build_dir, filenames))
-    return data
-
-build_py.get_data_files = get_data_files
-if setuptools_build_py_module:
-    setuptools_build_py_module.build_py._get_data_files = get_data_files
-# END apply setuptools patch too
-
-# NOTE: This is currently duplicated from the gitdb.__init__ module, as we cannot
-# satisfy the dependencies at installation time, unfortunately, due to inherent limitations
-# of distutils, which cannot install the prerequesites of a package before the acutal package.
 __author__ = "Sebastian Thiel"
 __contact__ = "byronimo@gmail.com"
 __homepage__ = "https://github.com/gitpython-developers/gitdb"
 version_info = (0, 6, 4)
 __version__ = '.'.join(str(i) for i in version_info)
 
-setup(cmdclass={'build_ext': build_ext_nofail},
-      name="gitdb",
-      version=__version__,
-      description="Git Object Database",
-      author=__author__,
-      author_email=__contact__,
-      url=__homepage__,
-      packages=('gitdb', 'gitdb.db', 'gitdb.utils', 'gitdb.test'),
-      package_dir = {'gitdb': 'gitdb'},
-      ext_modules=[Extension('gitdb._perf', ['gitdb/_fun.c', 'gitdb/_delta_apply.c'], include_dirs=['gitdb'])],
-      license = "BSD License",
-      zip_safe=False,
-      requires=('smmap (>=0.8.5)', ),
-      install_requires=('smmap >= 0.8.5'),
-      long_description = """GitDB is a pure-Python git object database""",
-      # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
-      classifiers=[
-          # Picked from
-    #    http://pypi.python.org/pypi?:action=list_classifiers
-    #"Development Status :: 1 - Planning",
-    #"Development Status :: 2 - Pre-Alpha",
-    #"Development Status :: 3 - Alpha",
-    # "Development Status :: 4 - Beta",
-    "Development Status :: 5 - Production/Stable",
-    #"Development Status :: 6 - Mature",
-    #"Development Status :: 7 - Inactive",
-    "Environment :: Console",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: BSD License",
-    "Operating System :: OS Independent",
-    "Operating System :: POSIX",
-    "Operating System :: Microsoft :: Windows",
-    "Operating System :: MacOS :: MacOS X",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 2",
-    "Programming Language :: Python :: 2.6",
-    "Programming Language :: Python :: 2.7",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.2",
-    "Programming Language :: Python :: 3.3",
-    "Programming Language :: Python :: 3.4",
-    "Programming Language :: Python :: 3.5",
-],)
+setup(
+    name="gitdb",
+    version=__version__,
+    description="Git Object Database",
+    author=__author__,
+    author_email=__contact__,
+    url=__homepage__,
+    packages=('gitdb', 'gitdb.db', 'gitdb.utils', 'gitdb.test'),
+    license="BSD License",
+    zip_safe=False,
+    install_requires=['smmap >= 0.8.5'],
+    long_description="""GitDB is a pure-Python git object database""",
+    # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
+    classifiers=[
+        "Development Status :: 5 - Production/Stable",
+        "Environment :: Console",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: BSD License",
+        "Operating System :: OS Independent",
+        "Operating System :: POSIX",
+        "Operating System :: Microsoft :: Windows",
+        "Operating System :: MacOS :: MacOS X",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.2",
+        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+    ]
+)