[cig-commits] r15731 - in cs/pythia/trunk: . mpi pyre/applications pyre/inventory pyre/inventory/odb pyre/schedulers pyre/util
leif at geodynamics.org
leif at geodynamics.org
Wed Sep 30 19:40:52 PDT 2009
Author: leif
Date: 2009-09-30 19:40:51 -0700 (Wed, 30 Sep 2009)
New Revision: 15731
Added:
cs/pythia/trunk/MANIFEST.in
Modified:
cs/pythia/trunk/
cs/pythia/trunk/mpi/Application.py
cs/pythia/trunk/pyre/applications/AppRunner.py
cs/pythia/trunk/pyre/applications/Application.py
cs/pythia/trunk/pyre/applications/Executive.py
cs/pythia/trunk/pyre/inventory/Facility.py
cs/pythia/trunk/pyre/inventory/Inventory.py
cs/pythia/trunk/pyre/inventory/odb/Curator.py
cs/pythia/trunk/pyre/schedulers/BatchScript.py
cs/pythia/trunk/pyre/util/__init__.py
cs/pythia/trunk/setup.py
Log:
Turned Pythia back into a regular egg (instead of a "merlin" egg).
Property changes on: cs/pythia/trunk
___________________________________________________________________
Name: svn:externals
- archimedes http://geodynamics.org/svn/cig/cs/merlin/branches/v1/merlin/archimedes
+ ez_setup http://geodynamics.org/svn/cig/cs/ez_setup
Added: cs/pythia/trunk/MANIFEST.in
===================================================================
--- cs/pythia/trunk/MANIFEST.in (rev 0)
+++ cs/pythia/trunk/MANIFEST.in 2009-10-01 02:40:51 UTC (rev 15731)
@@ -0,0 +1,73 @@
+include MANIFEST.in
+include blade/toolkits/gnome-2.x/__vault__.odb
+include blade/toolkits/gnome-2.x/viewer.odb
+include blade/toolkits/gnome/__vault__.odb
+include blade/toolkits/gnome/viewer.odb
+include blade/toolkits/gtk-2.x/__vault__.odb
+include blade/toolkits/gtk-2.x/viewer.odb
+include blade/toolkits/gtk/__vault__.odb
+include blade/toolkits/gtk/viewer.odb
+include blade/toolkits/__vault__.odb
+include blade/__vault__.odb
+include elc/ice.odb
+include elc/mpi.odb
+include elc/serial.odb
+include elc/__vault__.odb
+include journal/colors/dark-bg.odb
+include journal/colors/light-bg.odb
+include journal/colors/none.odb
+include journal/colors/__vault__.odb
+include journal/devices/color-console.odb
+include journal/devices/console.odb
+include journal/devices/db.odb
+include journal/devices/file.odb
+include journal/devices/remote.odb
+include journal/devices/__vault__.odb
+include journal/devices/xterm-color.odb
+include journal/devices/xterm.odb
+include journal/__vault__.odb
+include mpi/launchers/mpich.odb
+include mpi/launchers/__vault__.odb
+include mpi/__vault__.odb
+include pulse/bath.odb
+include pulse/heaviside.odb
+include pulse/__vault__.odb
+include pyre/hooks/built-in.odb
+include pyre/hooks/current.odb
+include pyre/hooks/ultraTB.odb
+include pyre/hooks/__vault__.odb
+include pyre/idd/idd-pickler.odb
+include pyre/idd/__vault__.odb
+include pyre/ipa/ipa-pickler.odb
+include pyre/ipa/__vault__.odb
+include pyre/launchers/__vault__.odb
+include pyre/schedulers/lsf.odb
+include pyre/schedulers/none.odb
+include pyre/schedulers/pbs.odb
+include pyre/schedulers/scripts/lsf/batch.sh.odb
+include pyre/schedulers/scripts/lsf/__vault__.odb
+include pyre/schedulers/scripts/pbs/batch.sh.odb
+include pyre/schedulers/scripts/pbs/__vault__.odb
+include pyre/schedulers/scripts/sge/batch.sh.odb
+include pyre/schedulers/scripts/sge/__vault__.odb
+include pyre/schedulers/scripts/tacc-ranger/batch.sh.odb
+include pyre/schedulers/scripts/tacc-ranger/__vault__.odb
+include pyre/schedulers/scripts/__vault__.odb
+include pyre/schedulers/sge.odb
+include pyre/schedulers/tacc-ranger.odb
+include pyre/schedulers/__vault__.odb
+include pyre/__vault__.odb
+include pyre/weaver/mills/c.odb
+include pyre/weaver/mills/csh.odb
+include pyre/weaver/mills/cxx.odb
+include pyre/weaver/mills/f77.odb
+include pyre/weaver/mills/f90.odb
+include pyre/weaver/mills/html.odb
+include pyre/weaver/mills/make.odb
+include pyre/weaver/mills/perl.odb
+include pyre/weaver/mills/python.odb
+include pyre/weaver/mills/sh.odb
+include pyre/weaver/mills/tex.odb
+include pyre/weaver/mills/__vault__.odb
+include pyre/weaver/mills/xml.odb
+include pyre/weaver/__vault__.odb
Modified: cs/pythia/trunk/mpi/Application.py
===================================================================
--- cs/pythia/trunk/mpi/Application.py 2009-10-01 02:35:19 UTC (rev 15730)
+++ cs/pythia/trunk/mpi/Application.py 2009-10-01 02:40:51 UTC (rev 15731)
@@ -43,7 +43,7 @@
import sys
path = self.pathString()
- requires = self.requires()
+ requires = "pythia" # ignored -- was "self.requires()"
entry = self.entryName()
argv = self.getArgv(*args, **kwds)
state = self.getStateArgs('launch')
@@ -71,7 +71,7 @@
import sys
path = self.pathString()
- requires = self.requires()
+ requires = "pythia" # ignored -- was "self.requires()"
entry = self.entryName()
state = self.getStateArgs('compute')
Modified: cs/pythia/trunk/pyre/applications/AppRunner.py
===================================================================
--- cs/pythia/trunk/pyre/applications/AppRunner.py 2009-10-01 02:35:19 UTC (rev 15730)
+++ cs/pythia/trunk/pyre/applications/AppRunner.py 2009-10-01 02:40:51 UTC (rev 15731)
@@ -21,7 +21,7 @@
def createSubscript(self, name):
- from merlin import loadObject
+ from pyre.util import loadObject
cls = loadObject(name)
return cls()
Modified: cs/pythia/trunk/pyre/applications/Application.py
===================================================================
--- cs/pythia/trunk/pyre/applications/Application.py 2009-10-01 02:35:19 UTC (rev 15730)
+++ cs/pythia/trunk/pyre/applications/Application.py 2009-10-01 02:40:51 UTC (rev 15731)
@@ -100,16 +100,10 @@
return self.__class__.__module__ + ':' + self.__class__.__name__
- def workingSet(self):
- """Return the minimal working set for this application."""
- from merlin import WorkingSet
- return WorkingSet.minimal(self.requires())
-
-
def path(self):
"""Return the minimal Python search path for this application."""
- workingSet = self.workingSet()
- return workingSet.entries
+ import sys
+ return sys.path
def pathString(self):
Modified: cs/pythia/trunk/pyre/applications/Executive.py
===================================================================
--- cs/pythia/trunk/pyre/applications/Executive.py 2009-10-01 02:35:19 UTC (rev 15730)
+++ cs/pythia/trunk/pyre/applications/Executive.py 2009-10-01 02:40:51 UTC (rev 15731)
@@ -60,6 +60,9 @@
def requires(self):
+ # This was once used by Application.path() to construct a
+ # "minimal" search path for the application. Now it is only
+ # used by version().
if self._requires is None:
from __main__ import __requires__
self._requires = __requires__
@@ -169,7 +172,7 @@
def version(self):
- from merlin import get_provider, Requirement
+ from pkg_resources import get_provider, Requirement
try:
req = self.requires()
except ImportError:
Modified: cs/pythia/trunk/pyre/inventory/Facility.py
===================================================================
--- cs/pythia/trunk/pyre/inventory/Facility.py 2009-10-01 02:35:19 UTC (rev 15730)
+++ cs/pythia/trunk/pyre/inventory/Facility.py 2009-10-01 02:40:51 UTC (rev 15731)
@@ -191,9 +191,9 @@
module = path[0]
factoryName = '.'.join(factoryPath)
objName = module + ':' + factoryName
-
+
try:
- from merlin import loadObject
+ from pyre.util import loadObject
factory = loadObject(objName)
except (ImportError, ValueError):
raise Facility.ComponentNotFound(
Modified: cs/pythia/trunk/pyre/inventory/Inventory.py
===================================================================
--- cs/pythia/trunk/pyre/inventory/Inventory.py 2009-10-01 02:35:19 UTC (rev 15730)
+++ cs/pythia/trunk/pyre/inventory/Inventory.py 2009-10-01 02:40:51 UTC (rev 15731)
@@ -246,9 +246,9 @@
def retrieveBuiltInComponent(self, name, factory, args=(), vault=[]):
- import merlin
+ import pkg_resources
group = "pyre.odb." + (".".join([self._priv_name] + vault))
- for ep in merlin.iter_entry_points(group, name):
+ for ep in pkg_resources.iter_entry_points(group, name):
factory = ep.load()
component = factory(*args)
return component
Modified: cs/pythia/trunk/pyre/inventory/odb/Curator.py
===================================================================
--- cs/pythia/trunk/pyre/inventory/odb/Curator.py 2009-10-01 02:35:19 UTC (rev 15730)
+++ cs/pythia/trunk/pyre/inventory/odb/Curator.py 2009-10-01 02:40:51 UTC (rev 15731)
@@ -197,7 +197,7 @@
systemDepository = self.setSystemDepository(system)
# create the built-in depositories
- from merlin import resource_listdir, resource_isdir, resource_exists, resource_filename, Requirement
+ from pkg_resources import resource_listdir, resource_isdir, resource_exists, resource_filename, Requirement
pythia = Requirement.parse("pythia")
entries = resource_listdir(pythia, "")
for entry in entries:
Modified: cs/pythia/trunk/pyre/schedulers/BatchScript.py
===================================================================
--- cs/pythia/trunk/pyre/schedulers/BatchScript.py 2009-10-01 02:35:19 UTC (rev 15730)
+++ cs/pythia/trunk/pyre/schedulers/BatchScript.py 2009-10-01 02:40:51 UTC (rev 15731)
@@ -12,7 +12,7 @@
from pyre.applications import AppRunner
-from merlin import loadObject
+from pyre.util import loadObject
class BatchScript(AppRunner):
Modified: cs/pythia/trunk/pyre/util/__init__.py
===================================================================
--- cs/pythia/trunk/pyre/util/__init__.py 2009-10-01 02:35:19 UTC (rev 15730)
+++ cs/pythia/trunk/pyre/util/__init__.py 2009-10-01 02:40:51 UTC (rev 15731)
@@ -44,6 +44,19 @@
return expandMacros(raw, substitutions)
+def loadObject(name):
+ """Load and return the object referenced by <name> ==
+ some.module[:some.attr].
+ """
+
+ module, attrs = name.split(':')
+ attrs = attrs.split('.')
+ obj = __import__(module, globals(), globals(), ['__name__'])
+ for attr in attrs:
+ obj = getattr(obj, attr)
+ return obj
+
+
# version
__id__ = "$Id: __init__.py,v 1.1.1.1 2005/03/08 16:13:41 aivazis Exp $"
Modified: cs/pythia/trunk/setup.py
===================================================================
--- cs/pythia/trunk/setup.py 2009-10-01 02:35:19 UTC (rev 15730)
+++ cs/pythia/trunk/setup.py 2009-10-01 02:40:51 UTC (rev 15731)
@@ -1,13 +1,17 @@
-from archimedes import use_merlin
-use_merlin()
+from ez_setup import use_setuptools
+use_setuptools()
-from merlin import setup, find_packages
+try:
+ from setuptools import setup, find_packages
+except AssertionError:
+ from merlin import setup, find_packages
+
setup(
name = 'pythia',
- version = '0.8.1.9',
+ version = '0.8.1.10',
zip_safe = False,
packages = find_packages(),
More information about the CIG-COMMITS
mailing list