Specify custom get_parents

[jelmer/dulwich.git] / setup.py

diff --git a/setup.py b/setup.py
index 50beb13f28009a763fecf390bb5e044c9ba09abb..c34e981ec605df83f6571017598c7714f381ef65 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ except ImportError:
     has_setuptools = False
 from distutils.core import Distribution
 
-dulwich_version_string = '0.8.1'
+dulwich_version_string = '0.9.5'
 
 include_dirs = []
 # Windows MSVC support
@@ -30,65 +30,57 @@ class DulwichDistribution(Distribution):
         return not self.pure and not '__pypy__' in sys.modules
 
     global_options = Distribution.global_options + [
-        ('pure', None, 
-            "use pure Python code instead of C extensions (slower on CPython)")]
+        ('pure', None, "use pure Python code instead of C "
+                       "extensions (slower on CPython)")]
 
     pure = False
 
-def runcmd(cmd, env):
-    import subprocess
-    p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                         stderr=subprocess.PIPE, env=env)
-    out, err = p.communicate()
-    err = [e for e in err.splitlines()
-           if not e.startswith('Not trusting file') \
-              and not e.startswith('warning: Not importing')]
-    if err:
-        return ''
-    return out
-
-
 if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'):
     # XCode 4.0 dropped support for ppc architecture, which is hardcoded in
     # distutils.sysconfig
-    version = runcmd(['/usr/bin/xcodebuild', '-version'], {}).splitlines()[0]
-    # Also parse only first digit, because 3.2.1 can't be parsed nicely
-    if (version.startswith('Xcode') and
-        int(version.split()[1].split('.')[0]) >= 4):
-        os.environ['ARCHFLAGS'] = ''
+    import subprocess
+    p = subprocess.Popen(
+        ['/usr/bin/xcodebuild', '-version'], stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE, env={})
+    out, err = p.communicate()
+    for l in out.splitlines():
+        # Also parse only first digit, because 3.2.1 can't be parsed nicely
+        if l.startswith('Xcode') and int(l.split()[1].split('.')[0]) >= 4:
+            os.environ['ARCHFLAGS'] = ''
 
 setup_kwargs = {}
 
 if has_setuptools:
-    setup_kwargs['test_suite'] = 'dulwich.tests'
+    setup_kwargs['test_suite'] = 'dulwich.tests.test_suite'
 
 setup(name='dulwich',
       description='Python Git Library',
       keywords='git',
       version=dulwich_version_string,
-      url='http://samba.org/~jelmer/dulwich',
-      download_url='http://samba.org/~jelmer/dulwich/dulwich-%s.tar.gz' % dulwich_version_string,
+      url='https://samba.org/~jelmer/dulwich',
       license='GPLv2 or later',
       author='Jelmer Vernooij',
       author_email='jelmer@samba.org',
       long_description="""
-      Simple Python implementation of the Git file formats and
-      protocols. Dulwich is the place where Mr. and Mrs. Git live
-      in one of the Monty Python sketches.
+      Python implementation of the Git file formats and protocols,
+      without the need to have git installed.
+
+      All functionality is available in pure Python. Optional
+      C extensions can be built for improved performance.
 
-      All functionality is available in pure Python, but (optional)
-      C extensions are also available for better performance.
+      The project is named after the part of London that Mr. and Mrs. Git live in
+      in the particular Monty Python sketch.
       """,
-      packages=['dulwich', 'dulwich.tests'],
-      scripts=['bin/dulwich', 'bin/dul-daemon', 'bin/dul-web'],
-      ext_modules = [
+      packages=['dulwich', 'dulwich.tests', 'dulwich.tests.compat'],
+      scripts=['bin/dulwich', 'bin/dul-daemon', 'bin/dul-web', 'bin/dul-receive-pack', 'bin/dul-upload-pack'],
+      ext_modules=[
           Extension('dulwich._objects', ['dulwich/_objects.c'],
                     include_dirs=include_dirs),
           Extension('dulwich._pack', ['dulwich/_pack.c'],
               include_dirs=include_dirs),
           Extension('dulwich._diff_tree', ['dulwich/_diff_tree.c'],
               include_dirs=include_dirs),
-          ],
+      ],
       distclass=DulwichDistribution,
       **setup_kwargs
       )