1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/2e8f52ffe75d/
changeset: 2e8f52ffe75d
user: natefoo
date: 2012-01-23 18:29:00
summary: Add tool_dependency_dir to the sample config.
affected #: 1 file
diff -r 542cc69a44865797deb688a6b29c7aac603f6da2 -r 2e8f52ffe75ddf6e1009789745aabffa90edaac9 universe_wsgi.ini.sample
--- a/universe_wsgi.ini.sample
+++ b/universe_wsgi.ini.sample
@@ -131,6 +131,11 @@
# Other tool config files must include the tool_path as an attribute in the <toolbox> tag.
#tool_path = tools
+# Path to the directory in which managed tool dependencies are placed. To use
+# the dependency system, see the documentation at:
+# http://wiki.g2.bx.psu.edu/Admin/Config/Tool%20Dependencies
+#tool_dependency_dir = None
+
# Enable automatic installation of tools that used to be in the Galaxy
# distribution but are now in the main Galaxy tool shed. The tools
# that will be installed are configured in the config file named
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/84ee6eeedb41/
changeset: 84ee6eeedb41
user: natefoo
date: 2012-01-23 17:04:04
summary: Ignore DrmCommunicationException when checking job state. Thanks Ed Kirton.
affected #: 1 file
diff -r d56513828dc6f7c23b0e5b85f5ac33ce212587b7 -r 84ee6eeedb41b507c5e79d6f3e0d2a50a694adb6 lib/galaxy/jobs/runners/drmaa.py
--- a/lib/galaxy/jobs/runners/drmaa.py
+++ b/lib/galaxy/jobs/runners/drmaa.py
@@ -278,6 +278,9 @@
log.debug("(%s/%s) job left DRM queue with following message: %s" % ( galaxy_job_id, job_id, e ) )
self.work_queue.put( ( 'finish', drm_job_state ) )
continue
+ except drmaa.DrmCommunicationException, e:
+ log.warning("(%s/%s) unable to communicate with DRM: %s" % ( galaxy_job_id, job_id, e ))
+ continue
except Exception, e:
# so we don't kill the monitor thread
log.exception("(%s/%s) Unable to check job status" % ( galaxy_job_id, job_id ) )
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/73bae197e5fe/
changeset: 73bae197e5fe
user: jgoecks
date: 2012-01-23 01:48:05
summary: Do not find valid chroms because this is computationally expensive and not currently used.
affected #: 1 file
diff -r 9b7a615b39648a2911c483f8d3b693931ca5c1b4 -r 73bae197e5fe3a420cd90326d80c7a2173e619a8 lib/galaxy/web/controllers/tracks.py
--- a/lib/galaxy/web/controllers/tracks.py
+++ b/lib/galaxy/web/controllers/tracks.py
@@ -535,6 +535,8 @@
if msg:
return msg
+ # NOTE: finding valid chroms is prohibitive for large summary trees and is not currently used by
+ # the client.
valid_chroms = None
# Check for data in the genome window.
if data_sources.get( 'index' ):
@@ -543,15 +545,14 @@
indexer = get_data_provider( tracks_dataset_type )( converted_dataset, dataset )
if not indexer.has_data( chrom ):
return messages.NO_DATA
- valid_chroms = indexer.valid_chroms()
+ #valid_chroms = indexer.valid_chroms()
else:
# Standalone data provider
standalone_provider = get_data_provider( data_sources['data_standalone']['name'] )( dataset )
kwargs = {"stats": True}
if not standalone_provider.has_data( chrom ):
return messages.NO_DATA
- valid_chroms = standalone_provider.valid_chroms()
-
+ #valid_chroms = standalone_provider.valid_chroms()
# Have data if we get here
return { "status": messages.DATA, "valid_chroms": valid_chroms }
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/ef0a2b1c879b/
changeset: ef0a2b1c879b
user: dan
date: 2012-01-20 22:40:34
summary: Fix for setting up column assignments for dynamic options wrt tool data tables when the index file is missing.
affected #: 1 file
diff -r 8a597b83448f66523531c782b027dd000e277644 -r ef0a2b1c879b51c215afd445c248eb604645b29f lib/galaxy/tools/parameters/dynamic_options.py
--- a/lib/galaxy/tools/parameters/dynamic_options.py
+++ b/lib/galaxy/tools/parameters/dynamic_options.py
@@ -411,16 +411,15 @@
app = tool_param.tool.app
if tool_data_table_name in app.tool_data_tables:
self.tool_data_table = app.tool_data_tables[ tool_data_table_name ]
+ # Column definitions are optional, but if provided override those from the table
+ if elem.find( "column" ) is not None:
+ self.parse_column_definitions( elem )
+ else:
+ self.columns = self.tool_data_table.columns
# Set self.missing_index_file if the index file to
# which the tool_data_table refers does not exist.
if self.tool_data_table.missing_index_file:
self.missing_index_file = self.tool_data_table.missing_index_file
- else:
- # Column definitions are optional, but if provided override those from the table
- if elem.find( "column" ) is not None:
- self.parse_column_definitions( elem )
- else:
- self.columns = self.tool_data_table.columns
else:
self.missing_tool_data_table_name = tool_data_table_name
log.warn( "Data table named '%s' is required by tool but not configured" % tool_data_table_name )
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.