From aad5d9a2e557e935bd88f725deb10d0ed82468d8 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Thu, 21 Jan 2016 12:04:23 -0500 Subject: [PATCH 1/2] Bump 15.10 version to 15.10.1 (and apparently it has been incorrectly set to 15.10.dev all this time). --- lib/galaxy/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/version.py b/lib/galaxy/version.py index 2eafd597726c..5e8fab5fb3ee 100644 --- a/lib/galaxy/version.py +++ b/lib/galaxy/version.py @@ -1,3 +1,3 @@ VERSION_MAJOR = "15.10" -VERSION_MINOR = "dev" +VERSION_MINOR = "1" VERSION = VERSION_MAJOR + ('.' + VERSION_MINOR if VERSION_MINOR else '') From 587d450402f8b618e4922a04aa87fc5625edce82 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Thu, 18 Feb 2016 17:39:23 +0000 Subject: [PATCH 2/2] Fix installation of Tool Shed repositories containing non-ASCII characters in the description. Fix #1702. --- lib/tool_shed/util/encoding_util.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/tool_shed/util/encoding_util.py b/lib/tool_shed/util/encoding_util.py index 0b501f783c5b..2f92a44d1faf 100644 --- a/lib/tool_shed/util/encoding_util.py +++ b/lib/tool_shed/util/encoding_util.py @@ -3,7 +3,6 @@ import logging from galaxy.util.hash_util import hmac_new -from galaxy.util.json import json_fix log = logging.getLogger( __name__ ) @@ -21,13 +20,8 @@ def tool_shed_decode( value ): values = None try: values = json.loads( value ) - except Exception, e: + except Exception: pass - if values is not None: - try: - return json_fix( values ) - except Exception, e: - log.debug( "Fixing decoded json values '%s' from tool shed threw exception: %s" % ( str( values ), str( e ) ) ) if values is None: values = value return values