[cig-commits] r4634 - mc/3D/CitcomS/trunk

[leif at geodynamics.org]

Author: leif
Date: 2006-09-27 13:37:35 -0700 (Wed, 27 Sep 2006)
New Revision: 4634

Modified:
   mc/3D/CitcomS/trunk/setup.py
Log:
Relaxed setuptools version requirement to 0.6b1.


Modified: mc/3D/CitcomS/trunk/setup.py
===================================================================
--- mc/3D/CitcomS/trunk/setup.py	2006-09-27 20:34:08 UTC (rev 4633)
+++ mc/3D/CitcomS/trunk/setup.py	2006-09-27 20:37:35 UTC (rev 4634)
@@ -3,8 +3,13 @@
 # convenience to install Python packages required by CitcomS.  For
 # instructions on installing CitcomS itself, see the file INSTALL.
 
-from ez_setup import use_setuptools
-use_setuptools()
+try:
+    # If setuptools 0.6b1 or later is installed, run with it.
+    from pkg_resources import require
+    require("setuptools>=0.6b1")
+except:
+    from ez_setup import use_setuptools
+    use_setuptools()
 
 import setuptools
 import sys