[cig-commits] r4617 - in cs/pythia/trunk: . pythia.egg-info

[leif at geodynamics.org]

Author: leif
Date: 2006-09-25 16:46:27 -0700 (Mon, 25 Sep 2006)
New Revision: 4617

Added:
   cs/pythia/trunk/pythia.egg-info/
   cs/pythia/trunk/pythia.egg-info/config.cfg
Modified:
   cs/pythia/trunk/ez_setup.py
   cs/pythia/trunk/setup.py
Log:
Install header files.  Added 'config.cfg' egg-metadata so that projects
which use journal (for example) can automatically get the right includes
in their CPPFLAGS.  Upgraded to setuptools 0.6c3.


Modified: cs/pythia/trunk/ez_setup.py
===================================================================
--- cs/pythia/trunk/ez_setup.py	2006-09-25 23:41:07 UTC (rev 4616)
+++ cs/pythia/trunk/ez_setup.py	2006-09-25 23:46:27 UTC (rev 4617)
@@ -14,16 +14,25 @@
 This file can also be run as a script to install or upgrade setuptools.
 """
 import sys
-DEFAULT_VERSION = "0.6b1"
+DEFAULT_VERSION = "0.6c3"
 DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
 md5_data = {
-    'setuptools-0.6a10-py2.3.egg': '162d8357f1aff2b0349c6c247ee62987',
-    'setuptools-0.6a10-py2.4.egg': '803a2d8db501c1ac3b5b6fb4e907f788',
-    'setuptools-0.6a11-py2.3.egg': 'd12bf8e13aaeb25c91350c8d77f01a71',
-    'setuptools-0.6a11-py2.4.egg': 'a95d5bc7a070aa1028bc4dcb5270b133',
     'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
     'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
+    'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
+    'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
+    'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
+    'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
+    'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
+    'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
+    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
+    'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
+    'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
+    'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
+    'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
+    'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
+    'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
 }
 
 import sys, os
@@ -73,13 +82,13 @@
     try:
         pkg_resources.require("setuptools>="+version)
 
-    except pkg_resources.VersionConflict:
+    except pkg_resources.VersionConflict, e:
         # XXX could we install in a subprocess here?
         print >>sys.stderr, (
             "The required version of setuptools (>=%s) is not available, and\n"
             "can't be installed while this script is running. Please install\n"
-            " a more recent version first."
-        ) % version
+            " a more recent version first.\n\n(Currently using %r)"
+        ) % (version, e.args[0])
         sys.exit(2)
 
 def download_setuptools(
@@ -135,15 +144,15 @@
     try:
         import setuptools
     except ImportError:
-        import tempfile, shutil
-        tmpdir = tempfile.mkdtemp(prefix="easy_install-")
+        egg = None
         try:
-            egg = download_setuptools(version, to_dir=tmpdir, delay=0)
+            egg = download_setuptools(version, delay=0)
             sys.path.insert(0,egg)
             from setuptools.command.easy_install import main
-            main(list(argv)+[egg])
+            return main(list(argv)+[egg])   # we're done here
         finally:
-            shutil.rmtree(tmpdir)
+            if egg and os.path.exists(egg):
+                os.unlink(egg)
     else:
         if setuptools.__version__ == '0.0.1':
             # tell the user to uninstall obsolete version

Added: cs/pythia/trunk/pythia.egg-info/config.cfg
===================================================================
--- cs/pythia/trunk/pythia.egg-info/config.cfg	2006-09-25 23:41:07 UTC (rev 4616)
+++ cs/pythia/trunk/pythia.egg-info/config.cfg	2006-09-25 23:46:27 UTC (rev 4617)
@@ -0,0 +1,4 @@
+
+[flags]
+CPPFLAGS = -I%(location)s
+

Modified: cs/pythia/trunk/setup.py
===================================================================
--- cs/pythia/trunk/setup.py	2006-09-25 23:41:07 UTC (rev 4616)
+++ cs/pythia/trunk/setup.py	2006-09-25 23:46:27 UTC (rev 4617)
@@ -13,8 +13,8 @@
     zip_safe = False,
     packages = find_packages(),
     package_data = {
-    # If any package contains *.pml or *.odb files, include them:
-    '': ['*.pml', '*.odb'],
+    # If any package contains *.pml, *.odb, or *.h files, include them:
+    '': ['*.pml', '*.odb', '*.h'],
     },
     
     author = 'Michael A.G. Aivazis',