4 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/b63caa7dfa98/
Changeset: b63caa7dfa98
Branch: next-stable
User: dannon
Date: 2015-02-17 20:18:08+00:00
Summary: Fix xml.etree relative import error happening in test/asserts/xml.py
Affected #: 1 file
diff -r b6d15f14d0b392c4e9d9db56129bc67d6d4ba26b -r
b63caa7dfa9865430d87d6023efd45ccf02228ca test/base/asserts/xml.py
--- a/test/base/asserts/xml.py
+++ b/test/base/asserts/xml.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
import xml.etree
import re
https://bitbucket.org/galaxy/galaxy-central/commits/9f2731b49115/
Changeset: 9f2731b49115
User: dannon
Date: 2015-02-17 20:18:45+00:00
Summary: Merge bugfix from next-stable.
Affected #: 1 file
diff -r 798e912004b2b26b219d5ed2214f1e65e8c099fa -r
9f2731b49115c44da4dc9bc4d91e9514b4c0b8ba test/base/asserts/xml.py
--- a/test/base/asserts/xml.py
+++ b/test/base/asserts/xml.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
import xml.etree
import re
https://bitbucket.org/galaxy/galaxy-central/commits/6310fc863764/
Changeset: 6310fc863764
Branch: next-stable
User: dannon
Date: 2015-02-17 20:19:00+00:00
Summary: Merge.
Affected #: 1 file
diff -r b63caa7dfa9865430d87d6023efd45ccf02228ca -r
6310fc863764ef515861a64638bacebad8079514 lib/galaxy/tools/parameters/basic.py
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -886,14 +886,15 @@
legal_values = self.get_legal_values( trans, context )
if not legal_values and self.optional:
return None
- assert legal_values, "Parameter %s requires a value, but has no legal values
defined" % self.name
+ if not legal_values:
+ raise ValueError( "Parameter %s requires a value, but has no legal
values defined." % self.name )
if isinstance( value, list ):
- if not(self.repeat):
- assert self.multiple, "Multiple values provided but parameter %s is
not expecting multiple values" % self.name
+ if not self.repeat and not self.multiple:
+ raise ValueError( "Multiple values provided but parameter %s is not
expecting multiple values." % self.name )
rval = []
for v in value:
if v not in legal_values:
- raise ValueError( "An invalid option was selected for %s, %r,
please verify" % (self.name, v))
+ raise ValueError( "An invalid option was selected for %s, %r,
please verify." % ( self.name, v ) )
rval.append( v )
return rval
else:
@@ -903,9 +904,9 @@
if self.optional:
return []
else:
- raise ValueError( "No option was selected for %s but input
is not optional." % self.name)
+ raise ValueError( "No option was selected for %s but input
is not optional." % self.name )
if value not in legal_values:
- raise ValueError( "An invalid option was selected for %s, %r, please
verify" % (self.name, value))
+ raise ValueError( "An invalid option was selected for %s, %r, please
verify." % ( self.name, value ) )
return value
def to_html_value( self, value, app ):
@@ -918,8 +919,8 @@
if value is None:
return "None"
if isinstance( value, list ):
- if not( self.repeat ):
- assert self.multiple, "Multiple values provided but parameter %s is
not expecting multiple values" % self.name
+ if not self.repeat and not self.multiple:
+ raise ValueError( "Multiple values provided but parameter %s is not
expecting multiple values." % self.name )
value = map( str, value )
else:
value = str( value )
https://bitbucket.org/galaxy/galaxy-central/commits/cc01fa14d826/
Changeset: cc01fa14d826
User: dannon
Date: 2015-02-17 20:19:40+00:00
Summary: Merge.
Affected #: 1 file
diff -r a49498479b2e71f8d2abf955ce4c7c041de730b9 -r
cc01fa14d8269a5dc40b09fa3658ff3b58c2bc67 test/base/asserts/xml.py
--- a/test/base/asserts/xml.py
+++ b/test/base/asserts/xml.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
import xml.etree
import re
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.