Changeset 1349:10de3889b106

Timestamp:

05/30/08 16:37:39 (7 months ago)

Author:

Nate Coraor <nate@bx.psu.edu>

branch:

default

convert_revision:

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

Message:

Add a no_download parameter to eggs.ini so scramble-only eggs can be
ignored when using 'fetch_eggs.py all'.

Files:

• eggs.ini (modified) (1 diff)
• lib/galaxy/eggs/__init__.py (modified) (4 diffs)

eggs.ini

@@ -9 +9 @@
-[general]
-repository = http://eggs.g2.bx.psu.edu
+; these eggs must be scrambled for your local environment
+no_download = pbs_python DRMAA_python
-
-[eggs:platform]

lib/galaxy/eggs/__init__.py

@@ -257 +257 @@
-        self.config = CSConfigParser()
-        self.repo = None
+        self.no_download = []
-        self.platform = { 'peak' : get_platform( platform=True, peak=True ), 'galaxy' : get_platform( platform=True, peak=False ) }
-        self.noplatform = { 'peak' : get_platform( platform=False, peak=True ), 'galaxy' : get_platform( platform=False, peak=False ) }
@@ -264 +265 @@
-        try:
-            self.repo = self.config.get( "general", "repository" )
+            self.no_download = self.config.get( "general", "no_download" ).split()
-        except ConfigParser.NoSectionError:
-            raise Exception( "eggs.ini is missing required section [general]" )
-
-
+#
+#
-        try:
-            platform_eggs = self.config.items( "eggs:platform" )
@@ -304 +306 @@
-            return False
-        return True
-None
+[]
-        """
-        Fetch all eggs in the crate (ignoring any that you want to
@@ -311 +313 @@
-        """
-        skip_platform = False
+        ignore.extend( self.no_download )
-        try:
-            f = urllib2.urlopen( "%s/%s" % ( self.repo, self.platform['galaxy'] ) )