[cig-commits] r4633 - cs/pythia/trunk

[leif at geodynamics.org]

Author: leif
Date: 2006-09-27 13:34:08 -0700 (Wed, 27 Sep 2006)
New Revision: 4633

Modified:
   cs/pythia/trunk/setup.py
Log:
Relaxed setuptools version requirement to 0.6b1.


Modified: cs/pythia/trunk/setup.py
===================================================================
--- cs/pythia/trunk/setup.py	2006-09-27 20:08:30 UTC (rev 4632)
+++ cs/pythia/trunk/setup.py	2006-09-27 20:34:08 UTC (rev 4633)
@@ -1,6 +1,11 @@
 
-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()
 
 from setuptools import setup, find_packages
 from pyre import __version__