[cig-commits] r14724 - in cs/pythia/tags: . zip_safe zip_safe/blade zip_safe/elc zip_safe/journal zip_safe/journal/colors zip_safe/journal/devices zip_safe/journal/services zip_safe/mpi zip_safe/pulse zip_safe/pyre zip_safe/pyre/hooks zip_safe/pyre/idd zip_safe/pyre/inventory zip_safe/pyre/inventory/odb zip_safe/pyre/ipa zip_safe/pyre/launchers zip_safe/pyre/schedulers zip_safe/pyre/schedulers/scripts zip_safe/pyre/schedulers/scripts/lsf zip_safe/pyre/schedulers/scripts/pbs zip_safe/pyre/schedulers/scripts/sge zip_safe/pyre/schedulers/scripts/tacc-ranger zip_safe/pyre/weaver zip_safe/pyre/weaver/mills zip_safe/pythia.egg-info
leif at geodynamics.org
leif at geodynamics.org
Wed Apr 15 15:09:41 PDT 2009
Author: leif
Date: 2009-04-15 15:09:37 -0700 (Wed, 15 Apr 2009)
New Revision: 14724
Added:
cs/pythia/tags/zip_safe/
Removed:
cs/pythia/tags/zip_safe/blade/__vault__.odb
cs/pythia/tags/zip_safe/blade/toolkits/
cs/pythia/tags/zip_safe/elc/__vault__.odb
cs/pythia/tags/zip_safe/elc/ice.odb
cs/pythia/tags/zip_safe/elc/mpi.odb
cs/pythia/tags/zip_safe/elc/serial.odb
cs/pythia/tags/zip_safe/journal/__vault__.odb
cs/pythia/tags/zip_safe/journal/colors/__vault__.odb
cs/pythia/tags/zip_safe/journal/colors/dark-bg.cfg
cs/pythia/tags/zip_safe/journal/colors/dark-bg.odb
cs/pythia/tags/zip_safe/journal/colors/light-bg.cfg
cs/pythia/tags/zip_safe/journal/colors/light-bg.odb
cs/pythia/tags/zip_safe/journal/devices/__vault__.odb
cs/pythia/tags/zip_safe/journal/devices/color-console.odb
cs/pythia/tags/zip_safe/journal/devices/console.odb
cs/pythia/tags/zip_safe/journal/devices/file.odb
cs/pythia/tags/zip_safe/journal/devices/remote.odb
cs/pythia/tags/zip_safe/journal/devices/xterm-color.odb
cs/pythia/tags/zip_safe/journal/devices/xterm.odb
cs/pythia/tags/zip_safe/mpi/__vault__.odb
cs/pythia/tags/zip_safe/mpi/launchers/
cs/pythia/tags/zip_safe/pulse/__vault__.odb
cs/pythia/tags/zip_safe/pulse/bath.odb
cs/pythia/tags/zip_safe/pulse/heaviside.odb
cs/pythia/tags/zip_safe/pyre/__vault__.odb
cs/pythia/tags/zip_safe/pyre/hooks/__vault__.odb
cs/pythia/tags/zip_safe/pyre/hooks/built-in.odb
cs/pythia/tags/zip_safe/pyre/hooks/current.odb
cs/pythia/tags/zip_safe/pyre/hooks/ultraTB.odb
cs/pythia/tags/zip_safe/pyre/idd/__vault__.odb
cs/pythia/tags/zip_safe/pyre/idd/idd-pickler.odb
cs/pythia/tags/zip_safe/pyre/ipa/__vault__.odb
cs/pythia/tags/zip_safe/pyre/ipa/ipa-pickler.odb
cs/pythia/tags/zip_safe/pyre/launchers/__vault__.odb
cs/pythia/tags/zip_safe/pyre/schedulers/__vault__.odb
cs/pythia/tags/zip_safe/pyre/schedulers/lsf.odb
cs/pythia/tags/zip_safe/pyre/schedulers/none.odb
cs/pythia/tags/zip_safe/pyre/schedulers/pbs.odb
cs/pythia/tags/zip_safe/pyre/schedulers/scripts/__vault__.odb
cs/pythia/tags/zip_safe/pyre/schedulers/scripts/lsf/__vault__.odb
cs/pythia/tags/zip_safe/pyre/schedulers/scripts/pbs/__vault__.odb
cs/pythia/tags/zip_safe/pyre/schedulers/scripts/sge/__vault__.odb
cs/pythia/tags/zip_safe/pyre/schedulers/scripts/tacc-ranger/__vault__.odb
cs/pythia/tags/zip_safe/pyre/schedulers/sge.odb
cs/pythia/tags/zip_safe/pyre/schedulers/tacc-ranger.odb
cs/pythia/tags/zip_safe/pyre/weaver/__vault__.odb
cs/pythia/tags/zip_safe/pyre/weaver/mills/__vault__.odb
cs/pythia/tags/zip_safe/pyre/weaver/mills/c.odb
cs/pythia/tags/zip_safe/pyre/weaver/mills/csh.odb
cs/pythia/tags/zip_safe/pyre/weaver/mills/cxx.odb
cs/pythia/tags/zip_safe/pyre/weaver/mills/f77.odb
cs/pythia/tags/zip_safe/pyre/weaver/mills/f90.odb
cs/pythia/tags/zip_safe/pyre/weaver/mills/html.odb
cs/pythia/tags/zip_safe/pyre/weaver/mills/make.odb
cs/pythia/tags/zip_safe/pyre/weaver/mills/perl.odb
cs/pythia/tags/zip_safe/pyre/weaver/mills/python.odb
cs/pythia/tags/zip_safe/pyre/weaver/mills/sh.odb
cs/pythia/tags/zip_safe/pyre/weaver/mills/tex.odb
cs/pythia/tags/zip_safe/pyre/weaver/mills/xml.odb
Modified:
cs/pythia/tags/zip_safe/blade/__init__.py
cs/pythia/tags/zip_safe/journal/colors/__init__.py
cs/pythia/tags/zip_safe/journal/services/JournalService.py
cs/pythia/tags/zip_safe/pulse/PressurePulse.py
cs/pythia/tags/zip_safe/pyre/hooks/__init__.py
cs/pythia/tags/zip_safe/pyre/idd/IDDService.py
cs/pythia/tags/zip_safe/pyre/idd/IDDSession.py
cs/pythia/tags/zip_safe/pyre/inventory/Configurable.py
cs/pythia/tags/zip_safe/pyre/inventory/Facility.py
cs/pythia/tags/zip_safe/pyre/inventory/Inventory.py
cs/pythia/tags/zip_safe/pyre/inventory/odb/Curator.py
cs/pythia/tags/zip_safe/pyre/ipa/IPAService.py
cs/pythia/tags/zip_safe/pyre/ipa/IPASession.py
cs/pythia/tags/zip_safe/pyre/schedulers/__init__.py
cs/pythia/tags/zip_safe/pythia.egg-info/
cs/pythia/tags/zip_safe/setup.py
Log:
Attempted to make Pythia "zip safe" by replacing .odb files with egg
metadata. See Issue269. This is junk because it breaks C/C++ builds
(I forgot that Pythia contains .h files).
Copied: cs/pythia/tags/zip_safe (from rev 14723, cs/pythia/trunk)
Modified: cs/pythia/tags/zip_safe/blade/__init__.py
===================================================================
--- cs/pythia/trunk/blade/__init__.py 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/blade/__init__.py 2009-04-15 22:09:37 UTC (rev 14724)
@@ -19,6 +19,11 @@
return Blade()
+def inspector(blade):
+ from blade.components.Inspector import Inspector
+ return Inspector()
+
+
# misc
def copyright():
return "blade: Copyright (c) 1998-2005 Michael A.G. Aivazis"
Deleted: cs/pythia/tags/zip_safe/blade/__vault__.odb
===================================================================
--- cs/pythia/trunk/blade/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/blade/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# version
-__id__ = "$Id: __vault__.odb,v 1.1.1.1 2005/03/08 16:13:56 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/elc/__vault__.odb
===================================================================
--- cs/pythia/trunk/elc/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/elc/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# version
-__id__ = "$Id: __vault__.odb,v 1.1.1.1 2005/03/08 16:13:28 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/elc/ice.odb
===================================================================
--- cs/pythia/trunk/elc/ice.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/elc/ice.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def exchanger():
-
- import elc
- return elc.iceExchanger()
-
-
-# version
-__id__ = "$Id: ice.odb,v 1.1.1.1 2005/03/08 16:13:28 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/elc/mpi.odb
===================================================================
--- cs/pythia/trunk/elc/mpi.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/elc/mpi.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def exchanger():
-
- import elc
- return elc.mpiExchanger()
-
-
-# version
-__id__ = "$Id: mpi.odb,v 1.1.1.1 2005/03/08 16:13:28 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/elc/serial.odb
===================================================================
--- cs/pythia/trunk/elc/serial.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/elc/serial.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def exchanger():
-
- import elc
- return elc.serialExchanger()
-
-
-# version
-__id__ = "$Id: serial.odb,v 1.1.1.1 2005/03/08 16:13:28 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/journal/__vault__.odb
===================================================================
--- cs/pythia/trunk/journal/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/journal/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# version
-__id__ = "$Id: __vault__.odb,v 1.1.1.1 2005/03/08 16:13:52 aivazis Exp $"
-
-# End of file
Modified: cs/pythia/tags/zip_safe/journal/colors/__init__.py
===================================================================
--- cs/pythia/trunk/journal/colors/__init__.py 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/journal/colors/__init__.py 2009-04-15 22:09:37 UTC (rev 14724)
@@ -24,4 +24,39 @@
return Facility(name, **kwds)
+# odb factories
+
+def darkBg():
+ scheme = ColorScheme("dark-bg")
+
+ # XXX: Currently, .cfg files in a zipped egg don't work.
+ scheme.inventory.getTrait("filename").default = "LightGreen"
+ scheme.inventory.getTrait("line").default = "LightGreen"
+ scheme.inventory.getTrait("function").default = "LightPurple"
+ scheme.inventory.getTrait("src").default = "Yellow"
+ scheme.inventory.getTrait("facility").default = "LightBlue"
+ scheme.inventory.getTrait("severity-debug").default = "LightCyan"
+ scheme.inventory.getTrait("severity-info").default = "LightGreen"
+ scheme.inventory.getTrait("severity-error").default = "LightRed"
+ scheme.inventory.getTrait("severity-warning").default = "Yellow"
+
+ return scheme
+
+
+def lightBg():
+ scheme = ColorScheme("light-bg")
+
+ scheme.inventory.getTrait("filename").default = "Green"
+ scheme.inventory.getTrait("line").default = "Green"
+ scheme.inventory.getTrait("function").default = "Purple"
+ scheme.inventory.getTrait("src").default = "Red"
+ scheme.inventory.getTrait("facility").default = "Blue"
+ scheme.inventory.getTrait("severity-debug").default = "Cyan"
+ scheme.inventory.getTrait("severity-info").default = "Green"
+ scheme.inventory.getTrait("severity-error").default = "Red"
+ scheme.inventory.getTrait("severity-warning").default = "Brown"
+
+ return scheme
+
+
# end of file
Deleted: cs/pythia/tags/zip_safe/journal/colors/__vault__.odb
===================================================================
--- cs/pythia/trunk/journal/colors/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/journal/colors/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/journal/colors/dark-bg.cfg
===================================================================
--- cs/pythia/trunk/journal/colors/dark-bg.cfg 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/journal/colors/dark-bg.cfg 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,25 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-[dark-bg]
-
-filename = LightGreen
-line = LightGreen
-function = LightPurple
-src = Yellow
-
-facility = LightBlue
-severity-debug = LightCyan
-severity-info = LightGreen
-severity-error = LightRed
-severity-warning = Yellow
-
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/journal/colors/dark-bg.odb
===================================================================
--- cs/pythia/trunk/journal/colors/dark-bg.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/journal/colors/dark-bg.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def colorScheme():
- from journal.colors import ColorScheme
- return ColorScheme("dark-bg")
-
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/journal/colors/light-bg.cfg
===================================================================
--- cs/pythia/trunk/journal/colors/light-bg.cfg 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/journal/colors/light-bg.cfg 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,25 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-[light-bg]
-
-filename = Green
-line = Green
-function = Purple
-src = Red
-
-facility = Blue
-severity-debug = Cyan
-severity-info = Green
-severity-error = Red
-severity-warning = Brown
-
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/journal/colors/light-bg.odb
===================================================================
--- cs/pythia/trunk/journal/colors/light-bg.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/journal/colors/light-bg.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def colorScheme():
- from journal.colors import ColorScheme
- return ColorScheme("light-bg")
-
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/journal/devices/__vault__.odb
===================================================================
--- cs/pythia/trunk/journal/devices/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/journal/devices/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# version
-__id__ = "$Id: __vault__.odb,v 1.1.1.1 2005/03/08 16:13:52 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/journal/devices/color-console.odb
===================================================================
--- cs/pythia/trunk/journal/devices/color-console.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/journal/devices/color-console.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def device():
-
- from journal.components.ColorConsole import ColorConsole
- return ColorConsole()
-
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/journal/devices/console.odb
===================================================================
--- cs/pythia/trunk/journal/devices/console.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/journal/devices/console.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def device():
-
- from journal.components.Console import Console
- return Console()
-
-
-# version
-__id__ = "$Id: console.odb,v 1.1.1.1 2005/03/08 16:13:52 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/journal/devices/file.odb
===================================================================
--- cs/pythia/trunk/journal/devices/file.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/journal/devices/file.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def device():
-
- from journal.components.File import File
- return File()
-
-
-# version
-__id__ = "$Id: file.odb,v 1.1.1.1 2005/03/08 16:13:52 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/journal/devices/remote.odb
===================================================================
--- cs/pythia/trunk/journal/devices/remote.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/journal/devices/remote.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def device():
-
- from journal.components.Remote import Remote
- return Remote()
-
-
-# version
-__id__ = "$Id: remote.odb,v 1.1.1.1 2005/03/08 16:13:52 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/journal/devices/xterm-color.odb
===================================================================
--- cs/pythia/trunk/journal/devices/xterm-color.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/journal/devices/xterm-color.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def device():
-
- from journal.components.ColorConsole import ColorConsole
- return ColorConsole()
-
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/journal/devices/xterm.odb
===================================================================
--- cs/pythia/trunk/journal/devices/xterm.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/journal/devices/xterm.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def device():
-
- from journal.components.ColorConsole import ColorConsole
- return ColorConsole()
-
-
-# end of file
Modified: cs/pythia/tags/zip_safe/journal/services/JournalService.py
===================================================================
--- cs/pythia/trunk/journal/services/JournalService.py 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/journal/services/JournalService.py 2009-04-15 22:09:37 UTC (rev 14724)
@@ -22,7 +22,7 @@
import pyre.inventory
- marshaller = pyre.inventory.facility("marshaller", factory=journal.pickler)
+ marshaller = pyre.inventory.facility("marshaller", vault=["marshallers"], factory=journal.pickler)
def record(self, entry):
Deleted: cs/pythia/tags/zip_safe/mpi/__vault__.odb
===================================================================
--- cs/pythia/trunk/mpi/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/mpi/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# version
-__id__ = "$Id: __vault__.odb,v 1.1.1.1 2005/03/08 16:13:58 aivazis Exp $"
-
-# End of file
Modified: cs/pythia/tags/zip_safe/pulse/PressurePulse.py
===================================================================
--- cs/pythia/trunk/pulse/PressurePulse.py 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pulse/PressurePulse.py 2009-04-15 22:09:37 UTC (rev 14724)
@@ -25,7 +25,7 @@
from HeavisidePulse import HeavisidePulse
syncOnInit = pyre.inventory.bool("syncOnInit", default=True)
- generator = pyre.inventory.facility("generator", factory=HeavisidePulse)
+ generator = pyre.inventory.facility("generator", vault=["generators"], factory=HeavisidePulse)
timestep = pyre.inventory.dimensional("timestep", default=1.0e-6 * second)
Deleted: cs/pythia/tags/zip_safe/pulse/__vault__.odb
===================================================================
--- cs/pythia/trunk/pulse/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pulse/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# version
-__id__ = "$Id: __vault__.odb,v 1.1.1.1 2005/03/08 16:13:57 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pulse/bath.odb
===================================================================
--- cs/pythia/trunk/pulse/bath.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pulse/bath.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def generator():
-
- from pulse.Bath import Bath
- return Bath()
-
-
-# version
-__id__ = "$Id: bath.odb,v 1.1.1.1 2005/03/08 16:13:57 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pulse/heaviside.odb
===================================================================
--- cs/pythia/trunk/pulse/heaviside.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pulse/heaviside.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def generator():
-
- from pulse.HeavisidePulse import HeavisidePulse
- return HeavisidePulse()
-
-
-# version
-__id__ = "$Id: heaviside.odb,v 1.1.1.1 2005/03/08 16:13:57 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/__vault__.odb
===================================================================
--- cs/pythia/trunk/pyre/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# version
-__id__ = "$Id: __vault__.odb,v 1.1.1.1 2005/03/08 16:13:58 aivazis Exp $"
-
-# End of file
Modified: cs/pythia/tags/zip_safe/pyre/hooks/__init__.py
===================================================================
--- cs/pythia/trunk/pyre/hooks/__init__.py 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/hooks/__init__.py 2009-04-15 22:09:37 UTC (rev 14724)
@@ -23,4 +23,74 @@
return Facility(name, **kwds)
+# odb factories
+
+def builtInExceptHook():
+ import sys
+ return ExceptHook(sys.__excepthook__)
+
+
+def currentExceptHook():
+ import sys
+ return ExceptHook(sys.excepthook)
+
+
+def ultraTBExceptHook():
+
+ try:
+ import IPython.ultraTB
+ except ImportError:
+ return None
+
+
+ from pyre.components import Component
+
+
+ class ultraTB(Component):
+
+
+ name = "ultraTB"
+
+
+ import pyre.inventory as pyre
+
+ mode = pyre.str("mode", default="Verbose")
+ colorScheme = pyre.str("color-scheme", default="Linux")
+ callPdb = pyre.bool("call-pdb", default=False)
+
+ callPdb.meta['tip'] = 'call pdb when an exception occurs'
+
+
+ def __init__(self):
+ Component.__init__(self)
+ self.excepthook = None
+
+
+ def _init(self):
+ import sys
+
+ if sys.stderr.isatty():
+ colorScheme = self.colorScheme
+ else:
+ colorScheme = "NoColor"
+
+ if sys.stdin.isatty() and sys.stdout.isatty() and sys.stderr.isatty():
+ callPdb = self.callPdb
+ else:
+ callPdb = False
+
+ self.excepthook = IPython.ultraTB.FormattedTB(
+ mode = self.mode,
+ color_scheme = colorScheme,
+ call_pdb = callPdb
+ )
+
+ return
+
+
+ hook = ultraTB()
+
+ return hook
+
+
# end of file
Deleted: cs/pythia/tags/zip_safe/pyre/hooks/__vault__.odb
===================================================================
--- cs/pythia/trunk/pyre/hooks/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/hooks/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/pyre/hooks/built-in.odb
===================================================================
--- cs/pythia/trunk/pyre/hooks/built-in.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/hooks/built-in.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def excepthook():
- from pyre.hooks import ExceptHook
- import sys
-
- hook = ExceptHook(sys.__excepthook__)
-
- return hook
-
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/pyre/hooks/current.odb
===================================================================
--- cs/pythia/trunk/pyre/hooks/current.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/hooks/current.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def excepthook():
- from pyre.hooks import ExceptHook
- import sys
-
- hook = ExceptHook(sys.excepthook)
-
- return hook
-
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/pyre/hooks/ultraTB.odb
===================================================================
--- cs/pythia/trunk/pyre/hooks/ultraTB.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/hooks/ultraTB.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,73 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def excepthook():
-
- try:
- import IPython.ultraTB
- except ImportError:
- return None
-
-
- from pyre.components import Component
-
-
- class ultraTB(Component):
-
-
- name = "ultraTB"
-
-
- import pyre.inventory as pyre
-
- mode = pyre.str("mode", default="Verbose")
- colorScheme = pyre.str("color-scheme", default="Linux")
- callPdb = pyre.bool("call-pdb", default=False)
-
- callPdb.meta['tip'] = 'call pdb when an exception occurs'
-
-
- def __init__(self):
- Component.__init__(self)
- self.excepthook = None
-
-
- def _init(self):
- import sys
-
- if sys.stderr.isatty():
- colorScheme = self.colorScheme
- else:
- colorScheme = "NoColor"
-
- if sys.stdin.isatty() and sys.stdout.isatty() and sys.stderr.isatty():
- callPdb = self.callPdb
- else:
- callPdb = False
-
- self.excepthook = IPython.ultraTB.FormattedTB(
- mode = self.mode,
- color_scheme = colorScheme,
- call_pdb = callPdb
- )
-
- return
-
-
- hook = ultraTB()
-
- return hook
-
-
-
-# end of file
Modified: cs/pythia/tags/zip_safe/pyre/idd/IDDService.py
===================================================================
--- cs/pythia/trunk/pyre/idd/IDDService.py 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/idd/IDDService.py 2009-04-15 22:09:37 UTC (rev 14724)
@@ -28,7 +28,7 @@
configfile = pyre.inventory.str("config", default=None)
- marshaller = pyre.inventory.facility("marshaller", factory=pyre.idd.pickler)
+ marshaller = pyre.inventory.facility("marshaller", vault=["marshallers"], factory=pyre.idd.pickler)
locator = pyre.inventory.facility("recordLocator", factory=pyre.idd.recordLocator)
Modified: cs/pythia/tags/zip_safe/pyre/idd/IDDSession.py
===================================================================
--- cs/pythia/trunk/pyre/idd/IDDSession.py 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/idd/IDDSession.py 2009-04-15 22:09:37 UTC (rev 14724)
@@ -23,7 +23,7 @@
import pyre.inventory
- marshaller = pyre.inventory.facility("marshaller", factory=pyre.idd.pickler)
+ marshaller = pyre.inventory.facility("marshaller", vault=["marshallers"], factory=pyre.idd.pickler)
def token(self):
Deleted: cs/pythia/tags/zip_safe/pyre/idd/__vault__.odb
===================================================================
--- cs/pythia/trunk/pyre/idd/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/idd/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# version
-__id__ = "$Id: __vault__.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/idd/idd-pickler.odb
===================================================================
--- cs/pythia/trunk/pyre/idd/idd-pickler.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/idd/idd-pickler.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def marshaller(name=None):
- import pyre.idd
- return pyre.idd.pickler(name)
-
-
-# version
-__id__ = "$Id: idd-pickler.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Modified: cs/pythia/tags/zip_safe/pyre/inventory/Configurable.py
===================================================================
--- cs/pythia/trunk/pyre/inventory/Configurable.py 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/inventory/Configurable.py 2009-04-15 22:09:37 UTC (rev 14724)
@@ -153,7 +153,15 @@
def retrieveTemplate(self, name, vault=[], extras=[]):
- return self.retrieveObject(name, 'template', ['tmpl'], vault, extras)
+ tmpl = self.retrieveObject(name, 'template', ['tmpl'], vault, extras)
+ if tmpl:
+ return tmpl
+
+ # XXX: Special hack to support zipped Pythia egg.
+ from merlin import resource_stream
+ from Cheetah.Template import Template
+ tmpl = Template(file = resource_stream("pyre", '/'.join(vault + [name]) + ".tmpl"))
+ return tmpl
# vault accessors
Modified: cs/pythia/tags/zip_safe/pyre/inventory/Facility.py
===================================================================
--- cs/pythia/trunk/pyre/inventory/Facility.py 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/inventory/Facility.py 2009-04-15 22:09:37 UTC (rev 14724)
@@ -124,7 +124,7 @@
import pyre.parsing.locators
component = self._retrieveBuiltInComponent(instance, componentName)
if component is not None:
- locator = pyre.parsing.locators.builtIn()
+ locator = component.getLocator()
else:
component = self._import(instance, componentName)
if component:
Modified: cs/pythia/tags/zip_safe/pyre/inventory/Inventory.py
===================================================================
--- cs/pythia/trunk/pyre/inventory/Inventory.py 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/inventory/Inventory.py 2009-04-15 22:09:37 UTC (rev 14724)
@@ -243,11 +243,17 @@
def retrieveBuiltInComponent(self, name, factory, args=(), vault=[]):
import merlin
- group = "pyre.odb." + (".".join([self._priv_name] + vault))
+ if not vault:
+ return None
+ group = "pyre.odb." + ".".join(vault)
for ep in merlin.iter_entry_points(group, name):
factory = ep.load()
component = factory(*args)
- return component
+ if component:
+ import pyre.parsing.locators
+ component.setLocator(pyre.parsing.locators.builtIn())
+ component.setVault(vault)
+ return component
return None
Modified: cs/pythia/tags/zip_safe/pyre/inventory/odb/Curator.py
===================================================================
--- cs/pythia/trunk/pyre/inventory/odb/Curator.py 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/inventory/odb/Curator.py 2009-04-15 22:09:37 UTC (rev 14724)
@@ -196,17 +196,6 @@
userDepository = self.setUserDepository(user)
systemDepository = self.setSystemDepository(system)
- # create the built-in depositories
- from merlin import resource_listdir, resource_isdir, resource_exists, resource_filename, Requirement
- pythia = Requirement.parse("pythia")
- entries = resource_listdir(pythia, "")
- for entry in entries:
- if resource_isdir(pythia, entry):
- vault = entry + '/__vault__.odb'
- if resource_exists(pythia, vault):
- builtin = self.createDepository(resource_filename(pythia, entry))
- self.builtinDepositories.append(builtin)
-
return
Modified: cs/pythia/tags/zip_safe/pyre/ipa/IPAService.py
===================================================================
--- cs/pythia/trunk/pyre/ipa/IPAService.py 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/ipa/IPAService.py 2009-04-15 22:09:37 UTC (rev 14724)
@@ -27,7 +27,7 @@
ticketOnce = pyre.inventory.bool("ticketOnce", default=True)
ticketDuration = pyre.inventory.dimensional("ticketDuration", default=0.5*hour)
- marshaller = pyre.inventory.facility("marshaller", factory=pyre.ipa.pickler)
+ marshaller = pyre.inventory.facility("marshaller", vault=["marshallers"], factory=pyre.ipa.pickler)
userManager = pyre.inventory.facility("userManager", factory=pyre.ipa.userManager)
Modified: cs/pythia/tags/zip_safe/pyre/ipa/IPASession.py
===================================================================
--- cs/pythia/trunk/pyre/ipa/IPASession.py 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/ipa/IPASession.py 2009-04-15 22:09:37 UTC (rev 14724)
@@ -23,7 +23,7 @@
import pyre.inventory
- marshaller = pyre.inventory.facility("marshaller", factory=pyre.ipa.pickler)
+ marshaller = pyre.inventory.facility("marshaller", vault=["marshallers"], factory=pyre.ipa.pickler)
def login(self, username, password):
Deleted: cs/pythia/tags/zip_safe/pyre/ipa/__vault__.odb
===================================================================
--- cs/pythia/trunk/pyre/ipa/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/ipa/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# version
-__id__ = "$Id: __vault__.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/ipa/ipa-pickler.odb
===================================================================
--- cs/pythia/trunk/pyre/ipa/ipa-pickler.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/ipa/ipa-pickler.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def marshaller(name=None):
- import pyre.ipa
- return pyre.ipa.pickler(name)
-
-
-# version
-__id__ = "$Id: ipa-pickler.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/launchers/__vault__.odb
===================================================================
--- cs/pythia/trunk/pyre/launchers/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/launchers/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# end of file
Modified: cs/pythia/tags/zip_safe/pyre/schedulers/__init__.py
===================================================================
--- cs/pythia/trunk/pyre/schedulers/__init__.py 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/schedulers/__init__.py 2009-04-15 22:09:37 UTC (rev 14724)
@@ -31,7 +31,7 @@
def job(name, **kwds):
from pyre.inventory.Facility import Facility
kwds['factory'] = kwds.get('factory', Job)
- kwds['vault'] = kwds.get('vault', ['schedulers'])
+ kwds['vault'] = kwds.get('vault', ['jobs'])
kwds['family'] = kwds.get('family', 'job')
return Facility(name, **kwds)
Deleted: cs/pythia/tags/zip_safe/pyre/schedulers/__vault__.odb
===================================================================
--- cs/pythia/trunk/pyre/schedulers/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/schedulers/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/pyre/schedulers/lsf.odb
===================================================================
--- cs/pythia/trunk/pyre/schedulers/lsf.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/schedulers/lsf.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def scheduler():
- from pyre.schedulers.SchedulerLSF import SchedulerLSF
- return SchedulerLSF()
-
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/pyre/schedulers/none.odb
===================================================================
--- cs/pythia/trunk/pyre/schedulers/none.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/schedulers/none.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def scheduler():
- from pyre.schedulers.SchedulerNone import SchedulerNone
- return SchedulerNone()
-
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/pyre/schedulers/pbs.odb
===================================================================
--- cs/pythia/trunk/pyre/schedulers/pbs.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/schedulers/pbs.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def scheduler():
- from pyre.schedulers.SchedulerPBS import SchedulerPBS
- return SchedulerPBS()
-
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/pyre/schedulers/scripts/__vault__.odb
===================================================================
--- cs/pythia/trunk/pyre/schedulers/scripts/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/schedulers/scripts/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/pyre/schedulers/scripts/lsf/__vault__.odb
===================================================================
--- cs/pythia/trunk/pyre/schedulers/scripts/lsf/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/schedulers/scripts/lsf/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/pyre/schedulers/scripts/pbs/__vault__.odb
===================================================================
--- cs/pythia/trunk/pyre/schedulers/scripts/pbs/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/schedulers/scripts/pbs/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/pyre/schedulers/scripts/sge/__vault__.odb
===================================================================
--- cs/pythia/trunk/pyre/schedulers/scripts/sge/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/schedulers/scripts/sge/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/pyre/schedulers/scripts/tacc-ranger/__vault__.odb
===================================================================
--- cs/pythia/trunk/pyre/schedulers/scripts/tacc-ranger/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/schedulers/scripts/tacc-ranger/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/pyre/schedulers/sge.odb
===================================================================
--- cs/pythia/trunk/pyre/schedulers/sge.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/schedulers/sge.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def scheduler():
- from pyre.schedulers.SchedulerSGE import SchedulerSGE
- return SchedulerSGE()
-
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/pyre/schedulers/tacc-ranger.odb
===================================================================
--- cs/pythia/trunk/pyre/schedulers/tacc-ranger.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/schedulers/tacc-ranger.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# California Institute of Technology
-# (C) 2006 All Rights Reserved
-#
-# {LicenseText}
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def scheduler():
- from pyre.schedulers.SchedulerTACCRanger import SchedulerTACCRanger
- return SchedulerTACCRanger()
-
-
-# end of file
Deleted: cs/pythia/tags/zip_safe/pyre/weaver/__vault__.odb
===================================================================
--- cs/pythia/trunk/pyre/weaver/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/weaver/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# version
-__id__ = "$Id: __vault__.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/weaver/mills/__vault__.odb
===================================================================
--- cs/pythia/trunk/pyre/weaver/mills/__vault__.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/weaver/mills/__vault__.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# version
-__id__ = "$Id: __vault__.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/weaver/mills/c.odb
===================================================================
--- cs/pythia/trunk/pyre/weaver/mills/c.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/weaver/mills/c.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def weaver():
- from pyre.weaver.mills.CMill import CMill
- return CMill()
-
-
-# version
-__id__ = "$Id: c.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/weaver/mills/csh.odb
===================================================================
--- cs/pythia/trunk/pyre/weaver/mills/csh.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/weaver/mills/csh.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def weaver():
- from pyre.weaver.mills.CshMill import CshMill
- return CshMill()
-
-
-# version
-__id__ = "$Id: csh.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/weaver/mills/cxx.odb
===================================================================
--- cs/pythia/trunk/pyre/weaver/mills/cxx.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/weaver/mills/cxx.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def weaver():
- from pyre.weaver.mills.CxxMill import CxxMill
- return CxxMill()
-
-
-# version
-__id__ = "$Id: cxx.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/weaver/mills/f77.odb
===================================================================
--- cs/pythia/trunk/pyre/weaver/mills/f77.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/weaver/mills/f77.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def weaver():
- from pyre.weaver.mills.Fortran77Mill import Fortran77Mill
- return Fortran77Mill()
-
-
-# version
-__id__ = "$Id: f77.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/weaver/mills/f90.odb
===================================================================
--- cs/pythia/trunk/pyre/weaver/mills/f90.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/weaver/mills/f90.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def weaver():
- from pyre.weaver.mills.Fortran90Mill import Fortran90Mill
- return Fortran90Mill()
-
-
-# version
-__id__ = "$Id: f90.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/weaver/mills/html.odb
===================================================================
--- cs/pythia/trunk/pyre/weaver/mills/html.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/weaver/mills/html.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def weaver():
- from pyre.weaver.mills.HTMLMill import HTMLMill
- return HTMLMill()
-
-
-# version
-__id__ = "$Id: html.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/weaver/mills/make.odb
===================================================================
--- cs/pythia/trunk/pyre/weaver/mills/make.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/weaver/mills/make.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def weaver():
- from pyre.weaver.mills.MakeMill import MakeMill
- return MakeMill()
-
-
-# version
-__id__ = "$Id: make.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/weaver/mills/perl.odb
===================================================================
--- cs/pythia/trunk/pyre/weaver/mills/perl.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/weaver/mills/perl.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def weaver():
- from pyre.weaver.mills.PerlMill import PerlMill
- return PerlMill()
-
-
-# version
-__id__ = "$Id: perl.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/weaver/mills/python.odb
===================================================================
--- cs/pythia/trunk/pyre/weaver/mills/python.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/weaver/mills/python.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def weaver():
- from pyre.weaver.mills.PythonMill import PythonMill
- return PythonMill()
-
-
-# version
-__id__ = "$Id: python.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/weaver/mills/sh.odb
===================================================================
--- cs/pythia/trunk/pyre/weaver/mills/sh.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/weaver/mills/sh.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def weaver():
- from pyre.weaver.mills.ShMill import ShMill
- return ShMill()
-
-
-# version
-__id__ = "$Id: sh.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/weaver/mills/tex.odb
===================================================================
--- cs/pythia/trunk/pyre/weaver/mills/tex.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/weaver/mills/tex.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def weaver():
- from pyre.weaver.mills.TeXMill import TeXMill
- return TeXMill()
-
-
-# version
-__id__ = "$Id: tex.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Deleted: cs/pythia/tags/zip_safe/pyre/weaver/mills/xml.odb
===================================================================
--- cs/pythia/trunk/pyre/weaver/mills/xml.odb 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/pyre/weaver/mills/xml.odb 2009-04-15 22:09:37 UTC (rev 14724)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-
-def weaver():
- from pyre.weaver.mills.XMLMill import XMLMill
- return XMLMill()
-
-
-# version
-__id__ = "$Id: xml.odb,v 1.1.1.1 2005/03/08 16:13:39 aivazis Exp $"
-
-# End of file
Property changes on: cs/pythia/tags/zip_safe/pythia.egg-info
___________________________________________________________________
Name: svn:ignore
- SOURCES.txt
top_level.txt
PKG-INFO
not-zip-safe
dependency_links.txt
requires.txt
+ SOURCES.txt
top_level.txt
PKG-INFO
not-zip-safe
dependency_links.txt
requires.txt
entry_points.txt
Modified: cs/pythia/tags/zip_safe/setup.py
===================================================================
--- cs/pythia/trunk/setup.py 2009-04-15 21:04:42 UTC (rev 14723)
+++ cs/pythia/tags/zip_safe/setup.py 2009-04-15 22:09:37 UTC (rev 14724)
@@ -9,12 +9,86 @@
name = 'pythia',
version = '0.8.1.8',
- zip_safe = False,
+ zip_safe = True,
packages = find_packages(),
# include everything under version control
include_package_data = True,
entry_points = {
+ # blade
+ # XXX: These vault names don't look right. And what about blade.pml?
+ "pyre.odb.toolkits.gnome": [
+ "viewer = blade:inspector", # alias for gnome2
+ ],
+ "pyre.odb.toolkits.gnome2": [
+ "viewer = blade:inspector",
+ ],
+ "pyre.odb.toolkits.gtk": [
+ "viewer = blade:inspector", # alias for gtk2
+ ],
+ "pyre.odb.toolkits.gtk2": [
+ "viewer = blade:inspector",
+ ],
+ # elc
+ "pyre.odb.exchangers": [
+ "ice = elc:iceExchanger",
+ "mpi = elc:mpiExchanger",
+ "serial = elc:serialExchanger",
+ ],
+ # journal
+ "pyre.odb.colors": [
+ "dark-bg = journal.colors:darkBg",
+ "light-bg = journal.colors:lightBg",
+ ],
+ "pyre.odb.devices": [
+ "color-console = journal.components.ColorConsole:ColorConsole",
+ "console = journal.components.Console:Console",
+ "file = journal.components.File:File",
+ "remote = journal.components.Remote:Remote",
+ "xterm = journal.components.ColorConsole:ColorConsole",
+ "xterm-color = journal.components.ColorConsole:ColorConsole",
+ ],
+ # mpi
+ "pyre.odb.launchers": [
+ "mpich = mpi.LauncherMPICH:LauncherMPICH",
+ ],
+ # pulse
+ "pyre.odb.generators": [
+ "heaviside = pulse.HeavisidePulse:HeavisidePulse",
+ "bath = pulse.Bath:Bath",
+ ],
+ # pyre
+ "pyre.odb.hooks": [
+ "built-in = pyre.hooks:builtInExceptHook",
+ "current = pyre.hooks:currentExceptHook",
+ "ultraTB = pyre.hooks:ultraTBExceptHook",
+ ],
+ "pyre.odb.marshallers": [
+ "idd-pickler = pyre.idd:pickler",
+ "ipa-pickler = pyre.ipa:pickler",
+ "journal-pickler = journal:pickler", # ?
+ ],
+ "pyre.odb.mills": [
+ "c = pyre.weaver.mills.CMill:CMill",
+ "csh = pyre.weaver.mills.CshMill:CshMill",
+ "cxx = pyre.weaver.mills.CxxMill:CxxMill",
+ "f77 = pyre.weaver.mills.Fortran77Mill:Fortran77Mill",
+ "f90 = pyre.weaver.mills.Fortran90Mill:Fortran90Mill",
+ "html = pyre.weaver.mills.HTMLMill:HTMLMill",
+ "make = pyre.weaver.mills.MakeMill:MakeMill",
+ "perl = pyre.weaver.mills.PerlMill:PerlMill",
+ "python = pyre.weaver.mills.PythonMill:PythonMill",
+ "sh = pyre.weaver.mills.ShMill:ShMill",
+ "tex = pyre.weaver.mills.TeXMill:TeXMill",
+ "xml = pyre.weaver.mills.XMLMill:XMLMill",
+ ],
+ "pyre.odb.schedulers": [
+ "lsf = pyre.schedulers.SchedulerLSF:SchedulerLSF",
+ "none = pyre.schedulers.SchedulerNone:SchedulerNone",
+ "pbs = pyre.schedulers.SchedulerPBS:SchedulerPBS",
+ "sge = pyre.schedulers.SchedulerSGE:SchedulerSGE",
+ "tacc-ranger = pyre.schedulers.SchedulerTACCRanger:SchedulerTACCRanger",
+ ],
},
install_requires = [
More information about the CIG-COMMITS
mailing list