Changeset 1268:70fea4390d3d

Timestamp:

05/02/08 13:05:40 (8 months ago)

Author:

Nate Coraor <nate@bx.psu.edu>

branch:

default

convert_revision:

svn:9bcadc22-80f8-0310-8a53-c8f022958886/galaxy/trunk@2629

Message:

dist-scramble, scrambles eggs for distribution.

Files:

• dist-eggs.ini (added)
• lib/galaxy/eggs/__init__.py (modified) (5 diffs)
• scripts/dist-scramble.py (added)

lib/galaxy/eggs/__init__.py

@@ -23 +23 @@
-class PlatformNotSupported( Exception ):
-    pass
+
+# TODO: we should really be using exceptions instead of returns for everything
-
-# need the options to remain case sensitive
@@ -49 +51 @@
-        self.doppelgangers = []
-        self.buildpath = None
+        self.dir = None
+        self.build_host = None
+        self.python = sys.executable
+    def set_dir( self ):
+        if self.build_host is not None:
+            self.dir = os.path.join( galaxy_dir, "dist-eggs", self.platform['galaxy'] )
+        else:
+            self.dir = os.path.join( galaxy_dir, "eggs", self.platform['galaxy'] )
+        print "set dir to %s" % self.dir
-    def get_namever( self ):
-        return( "%s-%s" %( self.name, self.version ) )
@@ -68 +79 @@
-    def find( self ):
-        # TODO: should be able to set a search path in eggs.ini
-
-
+
+
+
+
-        if os.access( self.path, os.F_OK ):
-            self.have = True
@@ -115 +128 @@
-        log.warning( "scramble(): Beginning build" )
-        # subprocessed to sterilize the env
-
+
+
+
+
-        p = subprocess.Popen( args = cmd, shell = True, cwd = self.buildpath )
-        r = p.wait()
@@ -337 +353 @@
-                return self.eggs[key]
-
+class DistCrate( Crate ):
+    """
+    A subclass of Crate that holds eggs with info on how to build them for distribution.
+    """
+    dist_config_file = os.path.join( galaxy_dir, "dist-eggs.ini" )
+    def __init__( self, build_on="all" ):
+        self.eggs = {}
+        self.config = CSConfigParser()
+        self.repo = None
+        self.build_on = build_on
+        self.platform = 'platform'
+        self.noplatform = 'noplatform'
+    def parse( self ):
+        if self.config.read( DistCrate.dist_config_file ) == []:
+            raise Exception( "unable to read dist egg config from %s" % DistCrate.dist_config_file )
+        try:
+            self.hosts = self.dictize_list_of_tuples( self.config.items( "hosts" ) )
+            self.groups = self.dictize_list_of_tuples( self.config.items( "groups" ) )
+        except ConfigParser.NoSectionError, e:
+            raise Exception( "eggs.ini is missing required section: %s" % e )
+        self.platforms = self.get_platforms( self.build_on )
+        self.noplatforms = self.get_platforms( 'noplatform' )
+        Crate.parse( self )
+    def dictize_list_of_tuples( self, lot ):
+        """
+        Makes a list of 2-value tuples into a dict.
+        """
+        d = {}
+        for k, v in lot:
+            d[k] = v
+        return d
+    def get_platforms( self, wanted ):
+        # find all the members of a group and process them
+        if self.groups.has_key( wanted ):
+            platforms = []
+            for name in self.groups[wanted].split():
+                for platform in self.get_platforms( name ):
+                    if platform not in platforms:
+                        platforms.append( platform )
+            return platforms
+        elif self.hosts.has_key( wanted ):
+            return [ wanted ]
+        else:
+            raise Exception( "unknown platform: %s" % wanted )
+    def parse_egg_section( self, eggs, type ):
+        """
+        Overrides the base class's method.  Here we use the third arg
+        to find out what type of egg we'll be building.
+        """
+        if type == "platform":
+            platforms = self.platforms
+        elif type == "noplatform":
+            platforms = self.noplatforms
+        for name, version in eggs:
+            for platform in platforms:
+                # can't use the regular methods here because we're not
+                # actually ON the target platform
+                if type == "platform":
+                    gplat = platform
+                    pplat = platform.rsplit('-', 1)[0]
+                elif type == "noplatform":
+                    gplat = "%s-noplatform" % platform.split('-', 1)[0]
+                    pplat = platform.split('-', 1)[0]
+                egg = Egg()
+                try:
+                    egg.tag = self.config.get( "tags", name )
+                except:
+                    egg.tag = None
+                try:
+                    egg.sources = self.config.get( "source", name ).split()
+                except:
+                    egg.sources = None
+                egg.name = name
+                egg.version = version
+                egg.platform['galaxy'] = gplat
+                egg.platform['peak'] = pplat
+                egg.url = "%s/%s/%s" %( self.repo, gplat, egg.get_filename() )
+                egg.build_host, egg.python = self.hosts[platform].split()
+                if not self.eggs.has_key( name ):
+                    self.eggs[name] = [ egg ]
+                else:
+                    self.eggs[name].append( egg )
+
-class GalaxyConfig:
-    config_file = os.path.join( galaxy_dir, "universe_wsgi.ini" )