1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/c04fb09d5d42/
changeset: c04fb09d5d42
user: greg
date: 2012-02-29 22:27:46
summary: Potential fix for the buildbot.
affected #: 1 file
diff -r a412cb08e5ab07488984305628b2eb2d4a97a781 -r c04fb09d5d42a8ba25c81e812845f85692a820d7 buildbot_setup.sh
--- a/buildbot_setup.sh
+++ b/buildbot_setup.sh
@@ -69,6 +69,7 @@
universe_wsgi.ini.sample
tool_data_table_conf.xml.sample
tool-data/shared/ucsc/builds.txt.sample
+migrated_tools_conf.xml.sample
"
DIRS="
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/a86a94f46c6c/
changeset: a86a94f46c6c
user: greg
date: 2012-02-29 17:34:10
summary: Fixes for installing tool shed repositories that contain tools when done by the InstallManager, and loading the tool panel with tools in an installed repository.
affected #: 3 files
diff -r 9f623fc8e798e32bdc80bc5166448ed1273c373e -r a86a94f46c6cad83eabf76aa20fb3537ddda4ee1 lib/galaxy/tool_shed/install_manager.py
--- a/lib/galaxy/tool_shed/install_manager.py
+++ b/lib/galaxy/tool_shed/install_manager.py
@@ -116,19 +116,25 @@
changeset_revision, tmp_name ):
# Generate the metadata for the installed tool shed repository, among other things. It is critical that the installed repository is
# updated to the desired changeset_revision before metadata is set because the process for setting metadata uses the repository files on disk.
- tool_panel_dict = {}
+ tool_panel_dict_for_display = {}
+ tool_panel_dict_for_metadata = {}
for tool_elem in repository_elem:
# The tool_elem looks something like this: <tool id="EMBOSS: antigenic1" version="5.0.0" file="emboss_antigenic.xml" />
tool_config = tool_elem.get( 'file' )
+ guid = self.get_guid( repository_clone_url, relative_install_dir, tool_config )
# See if tool_config is defined somewhere in self.proprietary_tool_panel_elems.
is_loaded, tool_section = self.get_containing_tool_section( tool_config )
+ tool_panel_dict_for_tool_config = generate_tool_panel_dict_for_tool_config( guid, tool_config, tool_section=tool_section )
+ # The tool_panel_dict_for_tool_config dictionary contains a single entry that looks something like this.
+ # {<Tool guid> : { tool_config : <tool_config_file>, id: <ToolSection id>, version : <ToolSection version>, name : <TooSection name>}}
+ # Add the new entry to the dictionary we're defining to set metadata.
+ for k, v in tool_panel_dict_for_tool_config.items():
+ tool_panel_dict_for_metadata[ k ] = v
if is_loaded:
- guid = self.get_guid( repository_clone_url, relative_install_dir, tool_config )
- tool_panel_dict_for_tool_config = generate_tool_panel_dict_for_tool_config( guid, tool_config, tool_section=tool_section )
- # {<Tool guid> : { tool_config : <tool_config_file>, id: <ToolSection id>, version : <ToolSection version>, name : <TooSection name>}}
+ # Add the new entry to the dictionary we're defining to set the tool panel display.
for k, v in tool_panel_dict_for_tool_config.items():
- tool_panel_dict[ k ] = v
- metadata_dict = generate_metadata( self.toolbox, relative_install_dir, repository_clone_url, tool_panel_dict=tool_panel_dict )
+ tool_panel_dict_for_display[ k ] = v
+ metadata_dict = generate_metadata( self.toolbox, relative_install_dir, repository_clone_url, tool_panel_dict=tool_panel_dict_for_metadata )
# Add a new record to the tool_shed_repository table if one doesn't already exist. If one exists but is marked
# deleted, undelete it. It is critical that this happens before the call to add_to_tool_panel() below because
# tools will not be properly loaded if the repository is marked deleted.
@@ -157,7 +163,7 @@
repository_tools_tups,
self.repository_owner,
self.migrated_tools_config,
- tool_panel_dict,
+ tool_panel_dict=tool_panel_dict_for_display,
new_install=True )
# Remove the temporary file
try:
diff -r 9f623fc8e798e32bdc80bc5166448ed1273c373e -r a86a94f46c6cad83eabf76aa20fb3537ddda4ee1 lib/galaxy/tools/__init__.py
--- a/lib/galaxy/tools/__init__.py
+++ b/lib/galaxy/tools/__init__.py
@@ -189,14 +189,14 @@
tool_panel_dict = generate_tool_panel_dict_for_repository_tools( metadata, tool_section=tool_section )
if section:
# This means all tools are loaded into the same tool panel section or are all outside of any sections.
- for guid, tool_section_dict in tool_panel_dict.items():
+ for tool_panel_dict_guid, tool_section_dict in tool_panel_dict.items():
if tool_section_dict [ 'id' ] != section.id or \
tool_section_dict [ 'version' ] != section.version or \
tool_section_dict [ 'name' ] != section.name:
tool_section_dict [ 'id' ] = section.id
tool_section_dict [ 'version' ] = section.version
tool_section_dict [ 'name' ] = section.name
- tool_panel_dict[ guid ] = tool_section_dict
+ tool_panel_dict[ tool_panel_dict_guid ] = tool_section_dict
update_needed = True
else:
# The tool_panel_section was introduced late, so set it's value if its missing in the metadata.
@@ -1986,7 +1986,6 @@
Find extra files in the job working directory and move them into
the appropriate dataset's files directory
"""
- # print "Working in collect_associated_files"
for name, hda in output.items():
temp_file_path = os.path.join( job_working_directory, "dataset_%s_files" % ( hda.dataset.id ) )
try:
diff -r 9f623fc8e798e32bdc80bc5166448ed1273c373e -r a86a94f46c6cad83eabf76aa20fb3537ddda4ee1 lib/galaxy/util/shed_util.py
--- a/lib/galaxy/util/shed_util.py
+++ b/lib/galaxy/util/shed_util.py
@@ -18,14 +18,14 @@
index, shed_tool_conf_dict = get_shed_tool_conf_dict( app, shed_tool_conf )
tool_path = shed_tool_conf_dict[ 'tool_path' ]
config_elems = shed_tool_conf_dict[ 'config_elems' ]
- # Generate the list of ElementTree Element objects for each section or list of tools.
+ # Generate the list of ElementTree Element objects for each section or tool.
elem_list = generate_tool_panel_elem_list( repository_name,
repository_clone_url,
changeset_revision,
tool_panel_dict,
repository_tools_tups,
owner=owner )
- # Load the tools into the tool panel outside of any sections.
+ # Load the tools into the tool panel.
for config_elem in elem_list:
if config_elem.tag == 'section':
app.toolbox.load_section_tag_set( config_elem, app.toolbox.tool_panel, tool_path )
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/fced200b6f15/
changeset: fced200b6f15
user: jgoecks
date: 2012-02-29 15:53:56
summary: Enable Pages and Trackster by default in universe.
affected #: 1 file
diff -r 41b1080c48b9bf7e8cf70aea97987f7f026e911a -r fced200b6f153aca87f8e54979daea7fe6370045 universe_wsgi.ini.sample
--- a/universe_wsgi.ini.sample
+++ b/universe_wsgi.ini.sample
@@ -460,13 +460,13 @@
#enable_sequencer_communication = False
# Enable Galaxy's built-in visualization module, Trackster.
-#enable_tracks = False
+#enable_tracks = True
# Enable Galaxy Pages. Pages are custom webpages that include embedded Galaxy items,
# such as datasets, histories, workflows, and visualizations; pages are useful for
# documenting and sharing multiple analyses or workflows. Pages are created using a
# WYSIWYG editor that is very similar to a word processor.
-#enable_pages = False
+#enable_pages = True
# Enable authentication via OpenID. Allows users to log in to their Galaxy
# account by authenticating with an OpenID provider.
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.