[galaxy-commits] commit/galaxy-central: 2 new changesets

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/b7e148067d62/ Changeset: b7e148067d62 User: dannon Date: 2013-09-26 15:13:32 Summary: Correctly shutdown HierarchicalObjectStore and DistributedObjectStore Affected #: 1 file diff -r ff806b8e5f18791641fa49a20d9bea9e65215310 -r b7e148067d62e0153a15d4c46f70eece3c938a7e lib/galaxy/objectstore/__init__.py --- a/lib/galaxy/objectstore/__init__.py +++ b/lib/galaxy/objectstore/__init__.py @@ -381,9 +381,8 @@ self.backends = {} def shutdown(self): - [b.shutdown() for b in self.backends.values()] - if self.sleeper is not None: - self.sleeper.wake() + for store in self.backends.values(): + store.shutdown() super(NestedObjectStore, self).shutdown() def exists(self, obj, **kwargs): @@ -452,11 +451,8 @@ self.original_weighted_backend_ids = [] self.max_percent_full = {} self.global_max_percent_full = 0.0 - random.seed() - self.__parse_distributed_config(config, config_xml) - self.sleeper = None if fsmon and ( self.global_max_percent_full or filter( lambda x: x != 0.0, self.max_percent_full.values() ) ): self.sleeper = Sleeper() @@ -501,6 +497,12 @@ self.weighted_backend_ids.append(id) self.original_weighted_backend_ids = self.weighted_backend_ids + + def shutdown(self): + super(NestedObjectStore, self).shutdown() + if self.sleeper is not None: + self.sleeper.wake() + def __filesystem_monitor(self): while self.running: new_weighted_backend_ids = self.original_weighted_backend_ids @@ -570,10 +572,6 @@ for b in config_xml.find('backends'): self.backends[int(b.get('order'))] = build_object_store_from_config(config, fsmon=fsmon, config_xml=b) - def shutdown(self): - for store in self.backends.values(): - store.shutdown() - super(HierarchicalObjectStore, self).shutdown() def exists(self, obj, **kwargs): """ https://bitbucket.org/galaxy/galaxy-central/commits/e890cd2464ac/ Changeset: e890cd2464ac User: dannon Date: 2013-09-26 15:13:50 Summary: merge Affected #: 11 files diff -r b7e148067d62e0153a15d4c46f70eece3c938a7e -r e890cd2464ac2d14a7a4ccd9e4a4ef728e6f0cfc lib/galaxy/app.py --- a/lib/galaxy/app.py +++ b/lib/galaxy/app.py @@ -172,6 +172,7 @@ self.job_stop_queue = self.job_manager.job_stop_queue # Initialize the external service types self.external_service_types = external_service_types.ExternalServiceTypesCollection( self.config.external_service_type_config_file, self.config.external_service_type_path, self ) + self.model.engine.dispose() def shutdown( self ): self.job_manager.shutdown() diff -r b7e148067d62e0153a15d4c46f70eece3c938a7e -r e890cd2464ac2d14a7a4ccd9e4a4ef728e6f0cfc lib/galaxy/datatypes/converters/bed_gff_or_vcf_to_bigwig_converter.xml --- a/lib/galaxy/datatypes/converters/bed_gff_or_vcf_to_bigwig_converter.xml +++ b/lib/galaxy/datatypes/converters/bed_gff_or_vcf_to_bigwig_converter.xml @@ -9,7 +9,12 @@ grep -v '^#' $input | sort -k1,1 | ## Generate coverage bedgraph. - bedtools genomecov -bg -split -i stdin -g $chromInfo + bedtools genomecov -bg -i stdin -g $chromInfo + + ## Only use split option for bed and gff/gff3/gtf. + #if $input.ext in [ 'bed', 'gff', 'gff3', 'gtf' ]: + -split + #end if ## Streaming the bedgraph file to wigToBigWig is fast but very memory intensive; hence, this ## should only be used on systems with large RAM. diff -r b7e148067d62e0153a15d4c46f70eece3c938a7e -r e890cd2464ac2d14a7a4ccd9e4a4ef728e6f0cfc lib/galaxy/jobs/runners/drmaa.py --- a/lib/galaxy/jobs/runners/drmaa.py +++ b/lib/galaxy/jobs/runners/drmaa.py @@ -226,7 +226,13 @@ if state == drmaa.JobState.RUNNING and not ajs.running: ajs.running = True ajs.job_wrapper.change_state( model.Job.states.RUNNING ) - if state in ( drmaa.JobState.DONE, drmaa.JobState.FAILED ): + if state == drmaa.JobState.FAILED: + if ajs.job_wrapper.get_state() != model.Job.states.DELETED: + ajs.stop_job = False + ajs.fail_message = "The cluster DRM system terminated this job" + self.work_queue.put( ( self.fail_job, ajs ) ) + continue + if state == drmaa.JobState.DONE: if ajs.job_wrapper.get_state() != model.Job.states.DELETED: self.work_queue.put( ( self.finish_job, ajs ) ) continue diff -r b7e148067d62e0153a15d4c46f70eece3c938a7e -r e890cd2464ac2d14a7a4ccd9e4a4ef728e6f0cfc lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py --- a/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py +++ b/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py @@ -121,12 +121,12 @@ for exported_workflow_dict in exported_workflows: workflow_name = exported_workflow_dict[ 'workflow_name' ] workflow, status, message = workflow_util.import_workflow( trans, repository, workflow_name ) - if status == 'error': - log.error( message, exc_info=True ) - trans.response.status = 500 - return message - else: - imported_workflow_dicts.append( workflow.to_dict( view='element' ) ) + if status == 'error': + log.error( message, exc_info=True ) + trans.response.status = 500 + return message + else: + imported_workflow_dicts.append( workflow.to_dict( view='element' ) ) return imported_workflow_dicts @web.expose_api diff -r b7e148067d62e0153a15d4c46f70eece3c938a7e -r e890cd2464ac2d14a7a4ccd9e4a4ef728e6f0cfc lib/galaxy/webapps/galaxy/controllers/dataset.py --- a/lib/galaxy/webapps/galaxy/controllers/dataset.py +++ b/lib/galaxy/webapps/galaxy/controllers/dataset.py @@ -705,9 +705,10 @@ if 'display_url' not in kwd or 'redirect_url' not in kwd: return trans.show_error_message( 'Invalid parameters specified for "display at" link, please contact a Galaxy administrator' ) try: - redirect_url = kwd['redirect_url'] % urllib.quote_plus( kwd['display_url'] ) + redirect_url = kwd['redirect_url'] % urllib.quote_plus( kwd['display_url'] ) except: - redirect_url = kwd['redirect_url'] # not all will need custom text + redirect_url = kwd['redirect_url'] # not all will need custom text + redirect_url = redirect_url.encode( 'utf-8' ) current_user_roles = trans.get_current_user_roles() if trans.app.security_agent.dataset_is_public( data.dataset ): return trans.response.send_redirect( redirect_url ) # anon access already permitted by rbac diff -r b7e148067d62e0153a15d4c46f70eece3c938a7e -r e890cd2464ac2d14a7a4ccd9e4a4ef728e6f0cfc lib/galaxy/webapps/tool_shed/api/repositories.py --- a/lib/galaxy/webapps/tool_shed/api/repositories.py +++ b/lib/galaxy/webapps/tool_shed/api/repositories.py @@ -1,16 +1,17 @@ import logging from galaxy.web.framework.helpers import time_ago +from galaxy import eggs from galaxy import web from galaxy import util from galaxy.web.base.controller import BaseAPIController import tool_shed.util.shed_util_common as suc from tool_shed.galaxy_install import repository_util -from galaxy import eggs -import pkg_resources +eggs.require( 'mercurial' ) -pkg_resources.require( 'mercurial' ) -from mercurial import hg, ui, commands +from mercurial import commands +from mercurial import hg +from mercurial import ui log = logging.getLogger( __name__ ) diff -r b7e148067d62e0153a15d4c46f70eece3c938a7e -r e890cd2464ac2d14a7a4ccd9e4a4ef728e6f0cfc lib/tool_shed/grids/admin_grids.py --- a/lib/tool_shed/grids/admin_grids.py +++ b/lib/tool_shed/grids/admin_grids.py @@ -1,15 +1,19 @@ -import os, logging -from galaxy.web.framework.helpers import time_ago, grids +import logging +import os +from galaxy.web.framework.helpers import grids +from galaxy.web.framework.helpers import time_ago from galaxy.webapps.tool_shed import model from galaxy.model.orm import and_ import tool_shed.util.shed_util_common as suc -from tool_shed.grids.repository_grids import RepositoryGrid, CategoryGrid +from tool_shed.grids.repository_grids import CategoryGrid +from tool_shed.grids.repository_grids import RepositoryGrid from galaxy import eggs -import pkg_resources +eggs.require( 'mercurial' ) -pkg_resources.require( 'mercurial' ) -from mercurial import hg, ui, commands +from mercurial import commands +from mercurial import hg +from mercurial import ui log = logging.getLogger( __name__ ) diff -r b7e148067d62e0153a15d4c46f70eece3c938a7e -r e890cd2464ac2d14a7a4ccd9e4a4ef728e6f0cfc lib/tool_shed/util/container_util.py --- a/lib/tool_shed/util/container_util.py +++ b/lib/tool_shed/util/container_util.py @@ -573,27 +573,23 @@ def build_readme_files_folder( trans, folder_id, readme_files_dict, label='Readme files' ): """Return a folder hierarchy containing readme text files.""" if readme_files_dict: - multiple_readme_files = len( readme_files_dict ) > 1 readme_id = 0 folder_id += 1 readme_files_root_folder = Folder( id=folder_id, key='root', label='root', parent=None ) - if multiple_readme_files: - folder_id += 1 - readme_files_folder = Folder( id=folder_id, key='readme_files', label=label, parent=readme_files_root_folder ) - readme_files_root_folder.folders.append( readme_files_folder ) + folder_id += 1 + readme_files_folder = Folder( id=folder_id, key='readme_files', label=label, parent=readme_files_root_folder ) + multiple_readme_files = len( readme_files_dict ) > 1 + readme_files_root_folder.folders.append( readme_files_folder ) for readme_file_name, readme_file_text in readme_files_dict.items(): readme_id += 1 readme = ReadMe( id=readme_id, name=readme_file_name, text=readme_file_text ) if multiple_readme_files: folder_id += 1 - folder = Folder( id=folder_id, key=readme.name, label=readme.name, parent=readme_files_folder ) + folder = Folder( id=folder_id, key=readme_file_name, label=readme_file_name, parent=readme_files_folder ) folder.readme_files.append( readme ) readme_files_folder.folders.append( folder ) else: - folder_id += 1 - readme_files_folder = Folder( id=folder_id, key='readme_files', label=readme.name, parent=readme_files_root_folder ) readme_files_folder.readme_files.append( readme ) - readme_files_root_folder.folders.append( readme_files_folder ) else: readme_files_root_folder = None return folder_id, readme_files_root_folder diff -r b7e148067d62e0153a15d4c46f70eece3c938a7e -r e890cd2464ac2d14a7a4ccd9e4a4ef728e6f0cfc lib/tool_shed/util/metadata_util.py --- a/lib/tool_shed/util/metadata_util.py +++ b/lib/tool_shed/util/metadata_util.py @@ -589,7 +589,7 @@ original_repository_metadata = repository.metadata else: original_repository_metadata = None - readme_file_names = get_readme_file_names( repository.name ) + readme_file_names = readme_util.get_readme_file_names( str( repository.name ) ) if app.name == 'galaxy': # Shed related tool panel configs are only relevant to Galaxy. metadata_dict = { 'shed_config_filename' : shed_config_dict.get( 'config_filename' ) } @@ -1046,16 +1046,6 @@ # The tool did not change through all of the changeset revisions. return old_id -def get_readme_file_names( repository_name ): - """Creates a list of valid filenames.""" - readme_files = [ 'readme', 'read_me', 'install' ] - valid_filenames = map( lambda f: '%s.txt' % f, readme_files ) - valid_filenames.extend( map( lambda f: '%s.rst' % f, readme_files ) ) - valid_filenames.extend( readme_files ) - valid_filenames.append( '%s.txt' % repository_name ) - valid_filenames.append( '%s.rst' % repository_name ) - return valid_filenames - def get_relative_path_to_repository_file( root, name, relative_install_dir, work_dir, shed_config_dict, resetting_all_metadata_on_repository ): if resetting_all_metadata_on_repository: full_path_to_file = os.path.join( root, name ) diff -r b7e148067d62e0153a15d4c46f70eece3c938a7e -r e890cd2464ac2d14a7a4ccd9e4a4ef728e6f0cfc lib/tool_shed/util/readme_util.py --- a/lib/tool_shed/util/readme_util.py +++ b/lib/tool_shed/util/readme_util.py @@ -70,3 +70,13 @@ raw_text = common_util.tool_shed_get( trans.app, tool_shed_url, url ) readme_files_dict = json.from_json_string( raw_text ) return readme_files_dict + +def get_readme_file_names( repository_name ): + """Return a list of file names that will be categorized as README files for the received repository_name.""" + readme_files = [ 'readme', 'read_me', 'install' ] + valid_filenames = map( lambda f: '%s.txt' % f, readme_files ) + valid_filenames.extend( map( lambda f: '%s.rst' % f, readme_files ) ) + valid_filenames.extend( readme_files ) + valid_filenames.append( '%s.txt' % repository_name ) + valid_filenames.append( '%s.rst' % repository_name ) + return valid_filenames diff -r b7e148067d62e0153a15d4c46f70eece3c938a7e -r e890cd2464ac2d14a7a4ccd9e4a4ef728e6f0cfc templates/webapps/tool_shed/repository/common.mako --- a/templates/webapps/tool_shed/repository/common.mako +++ b/templates/webapps/tool_shed/repository/common.mako @@ -425,7 +425,7 @@ %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rd-${encoded_id}"><${cell_type} style="padding-left: ${pad+20}px;">${datatype.extension | h}</${cell_type}><${cell_type}>${datatype.type | h}</${cell_type}><${cell_type}>${datatype.mimetype | h}</${cell_type}> @@ -440,15 +440,15 @@ <%def name="render_failed_test( failed_test, pad, parent, row_counter, row_is_header=False )"><% from tool_shed.util.shed_util_common import to_html_string - encoded_id = trans.security.encode_id( failed_test.id ) + encoded_id = trans.security.encode_id( failed_test.id ) %><tr class="datasetRow" %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rft-${encoded_id}"><td style="padding-left: ${pad+20}px;"> - <table id="failed_test_table" class="tool_test_results"> + <table id="test_environment"><tr><td bgcolor="#FFFFCC"><b>Tool id:</b> ${failed_test.tool_id | h}</td></tr><tr><td><b>Tool version:</b> ${failed_test.tool_id | h}</td></tr><tr><td><b>Test:</b> ${failed_test.test_id | h}</td></tr> @@ -475,7 +475,7 @@ %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-ridm-${encoded_id}"><${cell_type} style="padding-left: ${pad+20}px;">${data_manager.index | h}</${cell_type}><${cell_type}>${data_manager.error | h}</${cell_type}></tr> @@ -493,7 +493,7 @@ %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rird-${encoded_id}"><td style="padding-left: ${pad+20}px;"> ${ invalid_repository_dependency.error | h } </td> @@ -510,7 +510,7 @@ %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rit-${encoded_id}"><td style="padding-left: ${pad+20}px;"> %if trans.webapp.name == 'tool_shed' and invalid_tool.repository_id and invalid_tool.tool_config and invalid_tool.changeset_revision: <a class="view-info" href="${h.url_for( controller='repository', action='load_invalid_tool', repository_id=trans.security.encode_id( invalid_tool.repository_id ), tool_config=invalid_tool.tool_config, changeset_revision=invalid_tool.changeset_revision, render_repository_actions_for=render_repository_actions_for )}"> @@ -545,7 +545,7 @@ %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-ritd-${encoded_id}"><td style="padding-left: ${pad+20}px;"><table id="invalid_td_table"><tr><td>${ invalid_tool_dependency.error | h }</td></tr> @@ -559,14 +559,16 @@ </%def><%def name="render_missing_test_component( missing_test_component, pad, parent, row_counter, row_is_header=False )"> - <% encoded_id = trans.security.encode_id( missing_test_component.id ) %> + <% + encoded_id = trans.security.encode_id( missing_test_component.id ) + %><tr class="datasetRow" %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rmtc-${encoded_id}"><td style="padding-left: ${pad+20}px;"> - <table id="missing_table" class="tool_test_results"> + <table id="test_environment"><tr><td bgcolor="#FFFFCC"><b>Tool id:</b> ${missing_test_component.tool_id | h}</td></tr><tr><td><b>Tool version:</b> ${missing_test_component.tool_version | h}</td></tr><tr><td><b>Tool guid:</b> ${missing_test_component.tool_guid | h}</td></tr> @@ -587,27 +589,17 @@ encoded_id = trans.security.encode_id( readme.id ) render_rst = readme.name.endswith( '.rst' ) %> - <style type="text/css"> - #readme_table{ table-layout:fixed; - width:100%; - overflow-wrap:normal; - overflow:hidden; - border:0px; - word-break:keep-all; - word-wrap:break-word; - line-break:strict; } - </style><tr class="datasetRow" %if parent is not None: - parent="${parent}" + parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rr-${encoded_id}"><td style="padding-left: ${pad+20}px;"> - <table id="readme_table"> + <table id="readme_files"> %if render_rst: <tr><td>${ rst_to_html( readme.text ) }</td></tr> %else: - <tr><td>${readme.name}<br/>${ to_html_string( readme.text ) }</td></tr> + <tr><td>${ to_html_string( readme.text ) }</td></tr> %endif </table></td> @@ -652,7 +644,7 @@ %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rrd-${encoded_id}"> %if trans.webapp.name == 'galaxy': <${cell_type} style="padding-left: ${pad+20}px;"> %if row_is_header: @@ -684,28 +676,31 @@ %></%def> -<%def name="render_tool_test_results_css()"> +<%def name="render_table_wrap_style( table_id )"><style type="text/css"> - table.tool_test_results{ table-layout:fixed; - width:100%; - overflow-wrap:normal; - overflow:hidden; - border:0px; - word-break:keep-all; - word-wrap:break-word; - line-break:strict; } + table.${table_id}{ table-layout:fixed; + width:100%; + overflow-wrap:normal; + overflow:hidden; + border:0px; + word-break:keep-all; + word-wrap:break-word; + line-break:strict; } </style></%def><%def name="render_tool_dependency_installation_error( installation_error, pad, parent, row_counter, row_is_header=False )"> - <% encoded_id = trans.security.encode_id( installation_error.id ) %> + <% + encoded_id = trans.security.encode_id( installation_error.id ) + %> + ${render_table_wrap_style( "td_install_error_table" )} <tr class="datasetRow" %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rtdie-${encoded_id}"><td style="padding-left: ${pad+20}px;"> - <table id="td_install_error_table" class="tool_test_results"> + <table id="td_install_error_table"><tr bgcolor="#FFFFCC"><th>Type</th><th>Name</th><th>Version</th></tr> @@ -726,14 +721,17 @@ </%def><%def name="render_repository_installation_error( installation_error, pad, parent, row_counter, row_is_header=False, is_current_repository=False )"> - <% encoded_id = trans.security.encode_id( installation_error.id ) %> + <% + encoded_id = trans.security.encode_id( installation_error.id ) + %> + ${render_table_wrap_style( "rd_install_error_table" )} <tr class="datasetRow" %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rrie-${encoded_id}"><td style="padding-left: ${pad+20}px;"> - <table id="rd_install_error_table" class="tool_test_results"> + <table id="rd_install_error_table"> %if not is_current_repository: <tr bgcolor="#FFFFCC"><th>Tool shed</th><th>Name</th><th>Owner</th><th>Changeset revision</th> @@ -757,14 +755,16 @@ </%def><%def name="render_not_tested( not_tested, pad, parent, row_counter, row_is_header=False )"> - <% encoded_id = trans.security.encode_id( not_tested.id ) %> + <% + encoded_id = trans.security.encode_id( not_tested.id ) + %><tr class="datasetRow" %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rnt-${encoded_id}"><td style="padding-left: ${pad+20}px;"> - <table id="not_tested_table" class="tool_test_results"> + <table id="test_environment"><tr><td>${not_tested.reason | h}</td></tr></table></td> @@ -776,14 +776,16 @@ </%def><%def name="render_passed_test( passed_test, pad, parent, row_counter, row_is_header=False )"> - <% encoded_id = trans.security.encode_id( passed_test.id ) %> + <% + encoded_id = trans.security.encode_id( passed_test.id ) + %><tr class="datasetRow" %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rpt-${encoded_id}"><td style="padding-left: ${pad+20}px;"> - <table id="passed_tests_table" class="tool_test_results"> + <table id="test_environment"><tr><td bgcolor="#FFFFCC"><b>Tool id:</b> ${passed_test.tool_id | h}</td></tr><tr><td><b>Tool version:</b> ${passed_test.tool_id | h}</td></tr><tr><td><b>Test:</b> ${passed_test.test_id | h}</td></tr> @@ -808,7 +810,7 @@ %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rt-${encoded_id}"> %if row_is_header: <th style="padding-left: ${pad+20}px;">${tool.name | h}</th> %else: @@ -857,7 +859,7 @@ %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rtd-${encoded_id}"><${cell_type} style="padding-left: ${pad+20}px;"> %if row_is_header: ${tool_dependency.name | h} @@ -917,9 +919,9 @@ %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rte-${encoded_id}"><td style="padding-left: ${pad+20}px;"> - <table class="grid" id="readme_table"> + <table class="grid" id="test_environment"><tr><td><b>Time tested:</b> ${test_environment.time_last_tested | h}</td></tr><tr><td><b>System:</b> ${test_environment.system | h}</td></tr><tr><td><b>Architecture:</b> ${test_environment.architecture | h}</td></tr> @@ -950,7 +952,7 @@ %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rvdm-${encoded_id}"><${cell_type} style="padding-left: ${pad+20}px;">${data_manager.name | h}</${cell_type}><${cell_type}>${data_manager.version | h}</${cell_type}><${cell_type}>${data_manager.data_tables | h}</${cell_type}> @@ -981,7 +983,7 @@ %if parent is not None: parent="${parent}" %endif - id="libraryItem-${encoded_id}"> + id="libraryItem-rw-${encoded_id}"><${cell_type} style="padding-left: ${pad+20}px;"> %if row_is_header: ${workflow.workflow_name | h} @@ -1045,6 +1047,8 @@ return str( self.count ) %> %if readme_files_root_folder: + ${render_table_wrap_style( "readme_files" )} + <p/><div class="toolForm"><div class="toolFormTitle">Repository README files - may contain important installation or license information</div><div class="toolFormBody"> @@ -1127,14 +1131,14 @@ %if valid_data_managers_root_folder: <p/><% row_counter = RowCounter() %> - <table cellspacing="2" cellpadding="2" border="0" width="100%" class="tables container-table" id="valid_tools"> + <table cellspacing="2" cellpadding="2" border="0" width="100%" class="tables container-table" id="valid_data_managers"> ${render_folder( valid_data_managers_root_folder, 0, parent=None, row_counter=row_counter, is_root_folder=True )} </table> %endif %if invalid_data_managers_root_folder: <p/><% row_counter = RowCounter() %> - <table cellspacing="2" cellpadding="2" border="0" width="100%" class="tables container-table" id="invalid_tools"> + <table cellspacing="2" cellpadding="2" border="0" width="100%" class="tables container-table" id="invalid_data_managers"> ${render_folder( invalid_data_managers_root_folder, 0, parent=None, row_counter=row_counter, is_root_folder=True )} </table> %endif @@ -1156,16 +1160,20 @@ </div> %endif %if tool_test_results_root_folder: - ${render_tool_test_results_css()} + ##${render_table_wrap_style( "failed_test_table" )} + ##${render_table_wrap_style( "missing_table" )} + ##${render_table_wrap_style( "not_tested_table" )} + ##${render_table_wrap_style( "passed_tests_table" )} + ${render_table_wrap_style( "test_environment" )} <p/><div class="toolForm"><div class="toolFormTitle">Automated tool test results</div><div class="toolFormBody"> - <p/> - <% row_counter = RowCounter() %> - <table cellspacing="2" cellpadding="2" border="0" width="100%" class="tables container-table" id="test_environment"> - ${render_folder( tool_test_results_root_folder, 0, parent=None, row_counter=row_counter, is_root_folder=True )} - </table> + <p/> + <% row_counter = RowCounter() %> + <table cellspacing="2" cellpadding="2" border="0" width="100%" class="tables container-table" id="test_environment"> + ${render_folder( tool_test_results_root_folder, 0, parent=None, row_counter=row_counter, is_root_folder=True )} + </table></div></div> %endif 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.