[Checkins] SVN: zope.testrunner/trunk/setup.py Avoid python-subunit dependency (for now) on Python3.

Tres Seaver tseaver at palladion.com
Fri Mar 11 15:21:32 EST 2011


Log message for revision 120879:
  Avoid python-subunit dependency (for now) on Python3.

Changed:
  U   zope.testrunner/trunk/setup.py

-=-
Modified: zope.testrunner/trunk/setup.py
===================================================================
--- zope.testrunner/trunk/setup.py	2011-03-11 20:18:39 UTC (rev 120878)
+++ zope.testrunner/trunk/setup.py	2011-03-11 20:21:32 UTC (rev 120879)
@@ -22,11 +22,14 @@
 import os
 import sys
 from setuptools import setup
+from setuptools.command.test import test
 
 if sys.version_info < (2,4) or sys.version_info[:2] == (3,0):
     raise ValueError("zope.testrunner requires Python 2.4 or higher, "
                      "but not Python 3.0.")
 
+
+
 if sys.version_info >= (3,):
     extra = dict(use_2to3 = True,
                  setup_requires = ['zope.fixers'],
@@ -62,13 +65,24 @@
                      'src/zope/testrunner/testrunner-ex/sampletestsl.txt',
                      'src/zope/testrunner/testrunner-ex/unicode.txt',
                      ],
-                 # Needed until Python 3 versions of all dependencies are released on PyPI:
+                 # Needed until Python 3 versions of all dependencies are
+                 # released on PyPI:
                  dependency_links = ['.'],
+
+                 # XXX:  python-subunit is not yet ported to Python3.
+                 tests_require = ['zope.testing'],
+                 extras_require = {'test': ['zope.testing']},
                  )
 else:
-    extra = {}
+    extra = dict(tests_require = ['zope.testing',
+                                  'python-subunit',
+                                 ],
+                 extras_require = {'test': ['zope.testing',
+                                            'python-subunit',
+                                           ]},
+                )
+ 
 
-from setuptools.command.test import test
 
 class custom_test(test):
     # The zope.testrunner tests MUST be run using it's own testrunner. This is
@@ -170,9 +184,8 @@
     namespace_packages=['zope',],
     install_requires = ['setuptools',
                         'zope.exceptions',
-                        'zope.interface',],
-    tests_require = ['zope.testing', 'python-subunit'],
-    extras_require = {'test': ['zope.testing', 'python-subunit']},
+                        'zope.interface',
+                       ],
     entry_points = {
         'console_scripts':
             ['zope-testrunner = zope.testrunner:run',]},



More information about the checkins mailing list