[cig-commits] r4740 - cs/framework/tags/v1.0b1

[leif at geodynamics.org]

Author: leif
Date: 2006-10-06 18:36:28 -0700 (Fri, 06 Oct 2006)
New Revision: 4740

Removed:
   cs/framework/tags/v1.0b1/setup.cfg
Modified:
   cs/framework/tags/v1.0b1/setup.py
Log:
Preparing for cig framework v1.0b1 release.

Deleted: cs/framework/tags/v1.0b1/setup.cfg
===================================================================
--- cs/framework/tags/v1.0b1/setup.cfg	2006-10-07 01:29:58 UTC (rev 4739)
+++ cs/framework/tags/v1.0b1/setup.cfg	2006-10-07 01:36:28 UTC (rev 4740)
@@ -1,4 +0,0 @@
-
-[egg_info]
-tag_build = dev
-tag_svn_revision = 1

Modified: cs/framework/tags/v1.0b1/setup.py
===================================================================
--- cs/framework/tags/v1.0b1/setup.py	2006-10-07 01:29:58 UTC (rev 4739)
+++ cs/framework/tags/v1.0b1/setup.py	2006-10-07 01:36:28 UTC (rev 4740)
@@ -1,13 +1,18 @@
 
-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
 
 setup(
     
     name = 'cig', 
-    version = "1.0",
+    version = "1.0b1",
 
     zip_safe = False,
     packages = find_packages(),
@@ -17,7 +22,7 @@
     },
     
     install_requires = [
-    'pythia >= 0.8-1.0dev-r4034, < 0.9, == dev',
+    'pythia >= 0.8-1.0b1, < 0.8-2.0a',
     'Cheetah',
     ],