Update AUTHORS.

[jelmer/dulwich.git] / setup.py

diff --git a/setup.py b/setup.py
index 479d09e29900339856a912578a20d34f027f8e12..2d5cc5c358caa2f1d6f06a1f1a69c0fd7a072b39 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -7,17 +7,22 @@ try:
     from setuptools import setup, Extension
 except ImportError:
     from distutils.core import setup, Extension
+    has_setuptools = False
+else:
+    has_setuptools = True
 from distutils.core import Distribution
+import os
+import sys
 
-dulwich_version_string = '0.16.2'
+dulwich_version_string = '0.19.6'
 
 include_dirs = []
 # Windows MSVC support
-import os
-import sys
-if sys.platform == 'win32':
+if sys.platform == 'win32' and sys.version_info[:2] < (3, 6):
+    # Include dulwich/ for fallback stdint.h
     include_dirs.append('dulwich')
 
+
 class DulwichDistribution(Distribution):
 
     def is_pure(self):
@@ -33,6 +38,7 @@ class DulwichDistribution(Distribution):
 
     pure = False
 
+
 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
@@ -41,66 +47,51 @@ if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'):
         ['/usr/bin/xcodebuild', '-version'], stdout=subprocess.PIPE,
         stderr=subprocess.PIPE, env={})
     out, err = p.communicate()
-    for l in out.splitlines():
-        l = l.decode("utf8")
+    for line in out.splitlines():
+        line = line.decode("utf8")
         # 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:
+        if (line.startswith('Xcode') and
+                int(line.split()[1].split('.')[0]) >= 4):
             os.environ['ARCHFLAGS'] = ''
 
 tests_require = ['fastimport']
-if not '__pypy__' in sys.modules and not sys.platform == 'win32':
+
+
+if '__pypy__' not in sys.modules and not sys.platform == 'win32':
     tests_require.extend([
         'gevent', 'geventhttpclient', 'mock', 'setuptools>=17.1'])
 
-if sys.version_info[0] > 2 and sys.platform == 'win32':
-    # C Modules don't build for python3 windows, and prevent tests from running
-    ext_modules = []
-else:
-    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),
-    ]
+
+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),
+]
+
+setup_kwargs = {}
+
+if has_setuptools:
+    setup_kwargs['extras_require'] = {
+        'fastimport': ['fastimport'],
+        'https': ['urllib3[secure]>=1.21'],
+        }
+    setup_kwargs['install_requires'] = ['urllib3>=1.21', 'certifi']
+    setup_kwargs['include_package_data'] = True
+    setup_kwargs['test_suite'] = 'dulwich.tests.test_suite'
+    setup_kwargs['tests_require'] = tests_require
 
 
 setup(name='dulwich',
-      description='Python Git Library',
-      keywords='git',
       version=dulwich_version_string,
-      url='https://www.dulwich.io/',
       license='Apachev2 or later or GPLv2',
-      author='Jelmer Vernooij',
-      author_email='jelmer@jelmer.uk',
-      long_description="""
-      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.
-
-      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', 'dulwich.tests.compat', 'dulwich.contrib'],
+      packages=['dulwich', 'dulwich.tests', 'dulwich.tests.compat',
+                'dulwich.contrib'],
       package_data={'': ['../docs/tutorial/*.txt']},
       scripts=['bin/dulwich', 'bin/dul-receive-pack', 'bin/dul-upload-pack'],
-      classifiers=[
-          'Development Status :: 4 - Beta',
-          'License :: OSI Approved :: Apache Software License',
-          'Programming Language :: Python :: 2.7',
-          'Programming Language :: Python :: 3.4',
-          'Programming Language :: Python :: 3.5',
-          'Programming Language :: Python :: Implementation :: CPython',
-          'Programming Language :: Python :: Implementation :: PyPy',
-          'Operating System :: POSIX',
-          'Topic :: Software Development :: Version Control',
-      ],
       ext_modules=ext_modules,
-      test_suite='dulwich.tests.test_suite',
-      tests_require=tests_require,
       distclass=DulwichDistribution,
-      include_package_data=True,
+      **setup_kwargs
       )