1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/e359c370aeac/
Changeset: e359c370aeac
User: jmchilton
Date: 2014-07-25 17:40:53
Summary: Small style fix in run_tests.sh.
Affected #: 1 file
diff -r 92546e4b743fd876067a6bf68daffde9c6eca231 -r e359c370aeac38cafa61c01112c09c1560153523 run_tests.sh
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -88,7 +88,7 @@
shift 1
fi
;;
- -with_framework_test_tools|--with_framework_test_tools)
+ -with_framework_test_tools|--with_framework_test_tools)
with_framework_test_tools_arg="-with_framework_test_tools"
shift
;;
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/31aeeefd6020/
Changeset: 31aeeefd6020
User: jmchilton
Date: 2014-07-25 16:17:38
Summary: Don't allow tool form to submit with missing collection inputs if param non-optional.
Affected #: 2 files
diff -r 8b98752f4fbc11fb50f23b219f9037e7afa9a234 -r 31aeeefd6020bfd61fa6587cce9e03cf670f62d6 lib/galaxy/tools/parameters/__init__.py
--- a/lib/galaxy/tools/parameters/__init__.py
+++ b/lib/galaxy/tools/parameters/__init__.py
@@ -53,7 +53,7 @@
value = incoming_value
error = None
try:
- if value is not None or isinstance( param, DataToolParameter ):
+ if value is not None or isinstance( param, DataToolParameter ) or isinstance( param, DataCollectionToolParameter ):
# Convert value from HTML representation
if source == 'html':
value = param.from_html( value, trans, param_values )
diff -r 8b98752f4fbc11fb50f23b219f9037e7afa9a234 -r 31aeeefd6020bfd61fa6587cce9e03cf670f62d6 lib/galaxy/tools/parameters/basic.py
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -2078,7 +2078,7 @@
def from_html( self, value, trans, other_values={} ):
if not value and not self.optional:
- raise ValueError( "History does not include a dataset of the required format / build" )
+ raise ValueError( "History does not include a dataset collection of the correct type or containing the correct types of datasets" )
if value in [None, "None"]:
return None
if isinstance( value, str ) and value.find( "," ) > 0:
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/15ca9a679522/
Changeset: 15ca9a679522
User: jmchilton
Date: 2014-07-25 15:42:36
Summary: Fix API test interactor to use unique usernames.
Should fixes API tests broken when validation of these changed recently.
Affected #: 1 file
diff -r 646c414e90515d78d99461e090815f1a01f18c72 -r 15ca9a6795225c9777b5f12f858e9a87754d8301 test/base/interactor.py
--- a/test/base/interactor.py
+++ b/test/base/interactor.py
@@ -1,4 +1,5 @@
import os
+import re
from StringIO import StringIO
from galaxy.tools.parameters import grouping
from galaxy.tools import test
@@ -330,10 +331,11 @@
try:
test_user = [ user for user in all_users if user["email"] == email ][0]
except IndexError:
+ username = re.sub('[^a-z-]', '--', email.lower())
data = dict(
email=email,
password='testuser',
- username='admin-user',
+ username=username,
)
test_user = self._post( 'users', data, key=admin_key ).json()
return test_user
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/646c414e9051/
Changeset: 646c414e9051
User: jmchilton
Date: 2014-07-25 03:01:14
Summary: Remove invalid attribute name from DatasetCollection's to_dict.
This wasn't breaking anything per se, but was always adding a null 'name' attribute to collections dictified representation.
This is a remnant from an earlier version of this code that had the name attribute on the DatasetCollection instead of DatasetCollectionInstance.
Affected #: 1 file
diff -r 56a7b27577dec0dac17ef94d4c131e7f1f61cb15 -r 646c414e90515d78d99461e090815f1a01f18c72 lib/galaxy/model/__init__.py
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -2590,8 +2590,8 @@
class DatasetCollection( object, Dictifiable, UsesAnnotations ):
"""
"""
- dict_collection_visible_keys = ( 'id', 'name', 'collection_type' )
- dict_element_visible_keys = ( 'id', 'name', 'collection_type' )
+ dict_collection_visible_keys = ( 'id', 'collection_type' )
+ dict_element_visible_keys = ( 'id', 'collection_type' )
def __init__(
self,
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.