Add all test requirements to setup.py. Use setup.py test on travis.

diff --git a/.travis.yml b/.travis.yml
index ad9a0c2a176acc7775154942e7672847ad150de2..766995dbf42ae44e14dc90b82294455da1594823 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: python
 python:
   - "2.7"
-script: make check
+script: PYTHONHASHSEED=random python setup.py test
 install:
-  - pip install unittest2 fastimport
   - sudo apt-get update
-  - sudo apt-get install -qq git
+  - sudo apt-get install -qq git python-setuptools
+

diff --git a/setup.py b/setup.py
index 25a211a540e7641a947e838b5d57cdaab4ef9450..4f9aad0634491d1971946d94513f7c5183dd8494 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -4,10 +4,8 @@
 
 try:
     from setuptools import setup, Extension
-    has_setuptools = True
 except ImportError:
     from distutils.core import setup, Extension
-    has_setuptools = False
 from distutils.core import Distribution
 
 dulwich_version_string = '0.9.8'
@@ -49,10 +47,6 @@ if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'):
         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.test_suite'
 
 setup(name='dulwich',
       description='Python Git Library',
@@ -82,9 +76,10 @@ setup(name='dulwich',
           Extension('dulwich._diff_tree', ['dulwich/_diff_tree.c'],
               include_dirs=include_dirs),
       ],
+      test_suite='dulwich.tests.test_suite',
+      tests_require=['fastimport', 'mock', 'gevent', 'geventhttpclient'],
       distclass=DulwichDistribution,
       include_package_data=True,
       use_2to3=True,
       convert_2to3_doctests=['../docs/*', '../docs/tutorial/*', ],
-      **setup_kwargs
       )