1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/5ad8db7ff748/
Changeset: 5ad8db7ff748
User: Dave Bouvier
Date: 2013-07-29 19:50:55
Summary: When checking tool shed repositories for functional tests and test data, explicitly filter out metadata records that have been specified not to be tested by the repository owner.
Affected #: 1 file
diff -r fe04978dadac9974ab1954ab2091539e58caf3e4 -r 5ad8db7ff74881f13420f9e0b6f171d4f2acfd99 lib/tool_shed/scripts/check_repositories_for_functional_tests.py
--- a/lib/tool_shed/scripts/check_repositories_for_functional_tests.py
+++ b/lib/tool_shed/scripts/check_repositories_for_functional_tests.py
@@ -24,7 +24,7 @@
import galaxy.webapps.tool_shed.config as tool_shed_config
import galaxy.webapps.tool_shed.model.mapping
import sqlalchemy as sa
-from galaxy.model.orm import and_, not_
+from galaxy.model.orm import and_, not_, select
from galaxy.util.json import from_json_string, to_json_string
from galaxy.web import url_for
from galaxy.tools import parameters
@@ -200,6 +200,7 @@
}
'''
start = time.time()
+ skip_metadata_ids = []
checked_repository_ids = []
tool_count = 0
has_tests = 0
@@ -208,13 +209,16 @@
valid_revisions = 0
invalid_revisions = 0
records_checked = 0
+ # Do not check metadata records that have an entry in the skip_tool_tests table, since they won't be tested anyway.
+ skip_metadata_ids = select( [ app.model.SkipToolTest.table.c.repository_metadata_id ] )
# Get the list of metadata records to check for functional tests and test data. Limit this to records that have not been flagged do_not_test,
# since there's no need to check them again if they won't be tested anyway. Also filter out changeset revisions that are not downloadable,
# because it's redundant to test a revision that a user can't install.
for metadata_record in app.sa_session.query( app.model.RepositoryMetadata ) \
.filter( and_( app.model.RepositoryMetadata.table.c.downloadable == True,
app.model.RepositoryMetadata.table.c.includes_tools == True,
- app.model.RepositoryMetadata.table.c.do_not_test == False ) ):
+ app.model.RepositoryMetadata.table.c.do_not_test == False,
+ not_( app.model.RepositoryMetadata.table.c.id.in_( skip_metadata_ids ) ) ) ):
records_checked += 1
# Initialize the repository_status dict with the test environment, but leave the test_errors empty.
repository_status = {}
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/commits/fe04978dadac/
Changeset: fe04978dadac
User: Dave Bouvier
Date: 2013-07-29 18:01:24
Summary: Do not truncate tool test input dataset names, as Galaxy no longer displays them truncated.
Affected #: 1 file
diff -r e19301cc51b90667ae829c6f9a61571f50906494 -r fe04978dadac9974ab1954ab2091539e58caf3e4 test/base/twilltestcase.py
--- a/test/base/twilltestcase.py
+++ b/test/base/twilltestcase.py
@@ -1191,13 +1191,7 @@
# This loop gets the filename/label for the selected values.
item_labels = [ item.attrs[ 'label' ] for item in control.get_items() if item.selected ]
for value in kwd[ control.name ]:
- # Galaxy truncates long file names in the dataset_collector in galaxy/tools/parameters/basic.py.
- # This (and other places where this is done) should be refactored to use the HDA id.
- if len( value ) > 30 and control.is_of_kind( 'singlelist' ):
- field_value = '%s..%s' % ( value[:17], value[-11:] )
- else:
- field_value = value
- if field_value not in control.value and True not in [ field_value in item_label for item_label in item_labels ]:
+ if value not in control.value and True not in [ value in item_label for item_label in item_labels ]:
changed = True
break
if changed:
@@ -1205,11 +1199,7 @@
control.clear()
# kwd[control.name] should be a singlelist
for elem in kwd[ control.name ]:
- if len( elem ) > 30 and control.is_of_kind( 'singlelist' ):
- elem_name = '%s..%s' % ( elem[:17], elem[-11:] )
- else:
- elem_name = elem
- tc.fv( f.name, control.name, str( elem_name ) )
+ tc.fv( f.name, control.name, str( elem ) )
# Create a new submit control, allows form to refresh, instead of going to next page
control = ClientForm.SubmitControl( 'SubmitControl', '___refresh_grouping___', {'name':'refresh_grouping'} )
control.add_to_form( f )
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/commits/e19301cc51b9/
Changeset: e19301cc51b9
User: greg
Date: 2013-07-26 15:10:23
Summary: Fix import in the tool shed's commit_util.
Affected #: 1 file
diff -r c55f7d1dc3a1e18b8f1b6e20157cc209caa647dd -r e19301cc51b90667ae829c6f9a61571f50906494 lib/tool_shed/util/commit_util.py
--- a/lib/tool_shed/util/commit_util.py
+++ b/lib/tool_shed/util/commit_util.py
@@ -1,4 +1,5 @@
import cStringIO
+import gzip
import logging
import os
import pkg_resources
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/commits/c55f7d1dc3a1/
Changeset: c55f7d1dc3a1
User: jgoecks
Date: 2013-07-25 18:56:30
Summary: Change ToolInput to ToolParameter in JavaScript tools implementation to match language used in model.
Affected #: 1 file
diff -r a5a6c75e9af7098b4a4b35b917d49b8cc5abad43 -r c55f7d1dc3a1e18b8f1b6e20157cc209caa647dd static/scripts/mvc/tools.js
--- a/static/scripts/mvc/tools.js
+++ b/static/scripts/mvc/tools.js
@@ -33,9 +33,9 @@
});
/**
- * A tool input.
+ * A tool parameter.
*/
-var ToolInput = Backbone.RelationalModel.extend({
+var ToolParameter = Backbone.RelationalModel.extend({
defaults: {
name: null,
label: null,
@@ -49,7 +49,7 @@
},
copy: function() {
- return new ToolInput(this.toJSON());
+ return new ToolParameter(this.toJSON());
},
/**
@@ -88,7 +88,7 @@
{
type: Backbone.HasMany,
key: 'inputs',
- relatedModel: ToolInput,
+ relatedModel: ToolParameter,
reverseRelation: {
key: 'tool',
includeInJSON: false
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/commits/a5a6c75e9af7/
Changeset: a5a6c75e9af7
User: Dave Bouvier
Date: 2013-07-25 17:37:13
Summary: Fix for installing a repository with a complex tool dependency where the dependent repository's tool dependency definition does not define any set_environment actions.
Affected #: 1 file
diff -r 8059779d2a6ca853d43c5831fc7cfb70b65d6e55 -r a5a6c75e9af7098b4a4b35b917d49b8cc5abad43 lib/tool_shed/galaxy_install/tool_dependencies/install_util.py
--- a/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py
+++ b/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py
@@ -193,9 +193,9 @@
else:
action_dict[ 'environment_variable' ] = env_var_dicts
actions.append( ( 'set_environment', action_dict ) )
- return tool_dependency, actions
else:
raise NotImplementedError( 'Only install version 1.0 is currently supported (i.e., change your tag to be <install version="1.0">).' )
+ return tool_dependency, actions
return None, actions
def install_and_build_package_via_fabric( app, tool_dependency, actions_dict ):
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.