[Supervisor-checkins] r867 - supervisor/trunk

[Chris McDonough]

Author: Chris McDonough <chrism at agendaless.com>
Date: Sun May 24 15:25:18 2009
New Revision: 867

Log:
Only require elementtree if we're using 2.4 and below.


Modified:
   supervisor/trunk/setup.py

Modified: supervisor/trunk/setup.py
==============================================================================
--- supervisor/trunk/setup.py	(original)
+++ supervisor/trunk/setup.py	Sun May 24 15:25:18 2009
@@ -26,15 +26,18 @@
 
 import os
 import sys
-import string
 
-version, extra = string.split(sys.version, ' ', 1)
-maj, minor = string.split(version, '.', 1)
+if sys.version < (2, 3):
 
-if not maj[0] >= '2' and minor[0] >= '3':
     msg = ("supervisor requires Python 2.3 or better, you are attempting to "
            "install it using version %s.  Please install with a "
-           "supported version" % version)
+           "supported version" % sys.version)
+
+requires = ['meld3 >= 0.6.5']
+
+if sys.version < (2, 5):
+    # for meld3 (its a distutils package)
+    requires.append('elementtree')
 
 from setuptools import setup, find_packages
 here = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
@@ -81,10 +84,9 @@
         'COPYRIGHT.txt'
         ]
     )],
-    install_requires = ['meld3 >= 0.6.4',
-                        'elementtree'],
+    install_requires = requires,
     extras_require = {'iterparse':['cElementTree >= 1.0.2']},
-    tests_require = ['meld3 >= 0.6.3'],
+    tests_require = requires,
     include_package_data = True,
     zip_safe = False,
     namespace_packages = ['supervisor'],