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

[leif at geodynamics.org]

Author: leif
Date: 2006-10-08 19:13:15 -0700 (Sun, 08 Oct 2006)
New Revision: 4746

Modified:
   cs/pythia/trunk/pythia.egg-info/config.cfg
   cs/pythia/trunk/setup.cfg
   cs/pythia/trunk/setup.py
Log:
Fix-ups relating to new 'pythia' namespace:  iterate subpackages
as "extras"; new include path.


Modified: cs/pythia/trunk/pythia.egg-info/config.cfg
===================================================================
--- cs/pythia/trunk/pythia.egg-info/config.cfg	2006-10-09 01:29:27 UTC (rev 4745)
+++ cs/pythia/trunk/pythia.egg-info/config.cfg	2006-10-09 02:13:15 UTC (rev 4746)
@@ -1,4 +1,4 @@
 
 [flags]
-CPPFLAGS = -I%(location)s
+CPPFLAGS = -I%(location)s/pythia
 

Modified: cs/pythia/trunk/setup.cfg
===================================================================
--- cs/pythia/trunk/setup.cfg	2006-10-09 01:29:27 UTC (rev 4745)
+++ cs/pythia/trunk/setup.cfg	2006-10-09 02:13:15 UTC (rev 4746)
@@ -1,4 +1,4 @@
 
 [egg_info]
-tag_build = dev
+tag_build = b2.dev
 tag_svn_revision = 1

Modified: cs/pythia/trunk/setup.py
===================================================================
--- cs/pythia/trunk/setup.py	2006-10-09 01:29:27 UTC (rev 4745)
+++ cs/pythia/trunk/setup.py	2006-10-09 02:13:15 UTC (rev 4746)
@@ -8,17 +8,16 @@
     use_setuptools()
 
 from setuptools import setup, find_packages
-from pyre import __version__
 
 setup(
     
     name = 'pythia', 
-    version = __version__ + "-1.0",
+    version = '0.8.1.0',
 
     zip_safe = False,
     packages = find_packages(),
     package_data = {
-    'mpi': ['_mpi.c', '_mpi.pyx', 'cmpi.pxd'],
+    'pythia.mpi': ['_mpi.c', '_mpi.pyx', 'cmpi.pxd'],
     # If any package contains *.pml, *.odb, or *.h files, include them:
     '': ['*.pml', '*.odb', '*.h'],
     },
@@ -26,6 +25,18 @@
     install_requires = [
     'Cheetah',
     ],
+    extras_require = {
+    'acis':     [],
+    'blade':    [],
+    'elc':      [],
+    'journal':  [],
+    'merlin':   [],
+    'mpi':      [],
+    'opal':     [],
+    'pulse':    [],
+    'pyre':     [],
+    'rigid':    [],
+    },
     
     author = 'Michael A.G. Aivazis',
     author_email = 'aivazis at caltech.edu',