2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/4961f4e87947/ Changeset: 4961f4e87947 User: jgoecks Date: 2013-12-23 17:54:46 Summary: Workflows API, run workflow: enable multiple parameter values to be set for a single step. Affected #: 1 file diff -r 31f4f354b66105d5c2bedc36d7fd80b37327b75e -r 4961f4e8794729f899a2901caf613201c7bb9f7a lib/galaxy/webapps/galaxy/api/workflows.py --- a/lib/galaxy/webapps/galaxy/api/workflows.py +++ b/lib/galaxy/webapps/galaxy/api/workflows.py @@ -207,15 +207,18 @@ # Update step parameters as directed by payload's parameter mapping. if step.tool_id in param_map: - # Get parameter settings. - change_param = param_map[step.tool_id]['param']; - change_value = param_map[step.tool_id]['value']; - step_id = param_map[step.tool_id].get('step_id', '') + param_dict = param_map[ step.tool_id ] + step_id = param_dict.get( 'step_id', '' ) + + # Backward compatibility: convert param/value dict to new 'name': 'value' format. + if 'param' in param_dict and 'value' in param_dict: + param_dict[ param_dict['param'] ] = param_dict['value'] # Update step if there's no step id (i.e. all steps with tool are # updated) or update if step ids match. if not step_id or ( step_id and int( step_id ) == step.id ): - step.state.inputs[change_param] = change_value + for name, value in param_dict.items(): + step.state.inputs[ name ] = value if step.tool_errors: trans.response.status = 400 https://bitbucket.org/galaxy/galaxy-central/commits/2c64d7fe6a78/ Changeset: 2c64d7fe6a78 User: jgoecks Date: 2013-12-24 02:26:25 Summary: Automated merge. Affected #: 2 files diff -r 4961f4e8794729f899a2901caf613201c7bb9f7a -r 2c64d7fe6a7827b8d2b870c557ffc4d7acc24eca lib/tool_shed/util/container_util.py --- a/lib/tool_shed/util/container_util.py +++ b/lib/tool_shed/util/container_util.py @@ -1368,11 +1368,11 @@ # 'tool_dependencies': # [{'installation_directory': 'some path' 'type': 'package', 'name': 'MIRA', 'version': '4.0'}] # } - current_repository_successful_installation_dicts = successful_installation_dict.get( 'current_repository', [] ) + # We won't display the current repository in this container. I fit is not displaying installation errors, + # then it must be a successful installation. repository_dependency_successful_installation_dicts = successful_installation_dict.get( 'repository_dependencies', [] ) tool_dependency_successful_installation_dicts = successful_installation_dict.get( 'tool_dependencies', [] ) - if len( current_repository_successful_installation_dicts ) > 0 or \ - len( repository_dependency_successful_installation_dicts ) > 0 or \ + if len( repository_dependency_successful_installation_dicts ) > 0 or \ len( tool_dependency_successful_installation_dicts ) > 0: repository_installation_success_id = 0 folder_id += 1 diff -r 4961f4e8794729f899a2901caf613201c7bb9f7a -r 2c64d7fe6a7827b8d2b870c557ffc4d7acc24eca lib/tool_shed/util/tool_dependency_util.py --- a/lib/tool_shed/util/tool_dependency_util.py +++ b/lib/tool_shed/util/tool_dependency_util.py @@ -56,7 +56,7 @@ if str( tool_dependency.status ) != str( status ): debug_msg = 'Updating an existing record for version %s of tool dependency %s for revision %s of repository %s ' % \ ( str( version ), str( name ), str( tool_shed_repository.changeset_revision ), str( tool_shed_repository.name ) ) - debug_msg += 'by updating the status from %s to %s.' % str( tool_dependency.status ), str( status ) + debug_msg += 'by updating the status from %s to %s.' % ( str( tool_dependency.status ), str( status ) ) log.debug( debug_msg ) tool_dependency.status = status context.add( tool_dependency ) @@ -65,7 +65,7 @@ # Create a new tool_dependency record for the tool_shed_repository. debug_msg = 'Creating a new record for version %s of tool dependency %s for revision %s of repository %s. ' % \ ( str( version ), str( name ), str( tool_shed_repository.changeset_revision ), str( tool_shed_repository.name ) ) - debug_msg += 'The statis is being set to %s.' % str( status ) + debug_msg += 'The status is being set to %s.' % str( status ) log.debug( debug_msg ) tool_dependency = app.install_model.ToolDependency( tool_shed_repository.id, name, version, type, status ) context.add( tool_dependency ) 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.