commit/galaxy-central: 9 new changesets

14 Jan 2015

9 new commits in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/9bce3f426863/
Changeset:   9bce3f426863
Branch:      stable
User:        dan
Date:        2015-01-14 22:07:37+00:00
Summary:     Make DatasetListWrapper and DatasetCollectionWrapper subclasses of ToolParameterValueWrapper.
Affected #:  1 file

diff -r 4145417a6e1c13f82a3de365aadef0fb3ed7ab14 -r 9bce3f426863f8ba88062f67c7efc1836e82ee7c lib/galaxy/tools/wrappers.py

--- a/lib/galaxy/tools/wrappers.py
+++ b/lib/galaxy/tools/wrappers.py
@@ -244,7 +244,7 @@
         return DatasetFilenameWrapper( dataset, **wrapper_kwds )
 
 
-class DatasetListWrapper( list, HasDatasets ):
+class DatasetListWrapper( list, ToolParameterValueWrapper, HasDatasets ):
     """
     """
     def __init__( self, datasets, dataset_paths=[], **kwargs ):
@@ -259,7 +259,7 @@
         return ','.join( map( str, self ) )
 
 
-class DatasetCollectionWrapper( object, HasDatasets ):
+class DatasetCollectionWrapper( ToolParameterValueWrapper, HasDatasets ):
 
     def __init__( self, has_collection, dataset_paths=[], **kwargs ):
         super(DatasetCollectionWrapper, self).__init__()


https://bitbucket.org/galaxy/galaxy-central/commits/54ad887410ec/
Changeset:   54ad887410ec
Branch:      stable
User:        natefoo
Date:        2015-01-14 22:07:41+00:00
Summary:     Update tag latest_2014.06.02 for changeset 9bce3f426863
Affected #:  1 file

diff -r 7fd6061e43d5122b2e99f0dc18370af3d190cb34 -r 54ad887410ec10c76ccc8dae3e85fdf74e847a77 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -8,7 +8,7 @@
 5e605ed6069fe4c5ca9875e95e91b2713499e8ca release_2014.02.10
 9e53251b0b7e93b9563008a2b112f2e815a04bbc release_2014.04.14
 7e257c7b10badb65772b1528cb61d58175a42e47 release_2014.06.02
-4145417a6e1c13f82a3de365aadef0fb3ed7ab14 latest_2014.06.02
+9bce3f426863f8ba88062f67c7efc1836e82ee7c latest_2014.06.02
 8f9dcac033694e4cabcf5daae5cca1cfefbe967f latest_2014.04.14
 9c323aad4ffdd65a3deb06a4a36f6b2c5115a60f latest_2013.01.13
 b986c184be88947b5d1d90be7f36cfd2627dd938 latest_2013.02.08


https://bitbucket.org/galaxy/galaxy-central/commits/318adf2ad195/
Changeset:   318adf2ad195
Branch:      stable
User:        natefoo
Date:        2015-01-14 22:07:42+00:00
Summary:     Merge head created for backport bug fix on latest_2014.06.02
Affected #:  1 file



https://bitbucket.org/galaxy/galaxy-central/commits/f3fc4602e22b/
Changeset:   f3fc4602e22b
Branch:      stable
User:        dan
Date:        2015-01-14 22:07:46+00:00
Summary:     Make DatasetListWrapper and DatasetCollectionWrapper subclasses of ToolParameterValueWrapper.
Affected #:  1 file

diff -r 8150024c0e6fc5aef3033cf8aaa574896f6b5d0d -r f3fc4602e22b39468d780b955a1a05caf867a7e9 lib/galaxy/tools/wrappers.py
--- a/lib/galaxy/tools/wrappers.py
+++ b/lib/galaxy/tools/wrappers.py
@@ -257,7 +257,7 @@
         return DatasetFilenameWrapper( dataset, **wrapper_kwds )
 
 
-class DatasetListWrapper( list, HasDatasets ):
+class DatasetListWrapper( list, ToolParameterValueWrapper, HasDatasets ):
     """
     """
     def __init__( self, datasets, dataset_paths=[], **kwargs ):
@@ -272,7 +272,7 @@
         return ','.join( map( str, self ) )
 
 
-class DatasetCollectionWrapper( object, HasDatasets ):
+class DatasetCollectionWrapper( ToolParameterValueWrapper, HasDatasets ):
 
     def __init__( self, has_collection, dataset_paths=[], **kwargs ):
         super(DatasetCollectionWrapper, self).__init__()


https://bitbucket.org/galaxy/galaxy-central/commits/3e56a76077b9/
Changeset:   3e56a76077b9
Branch:      stable
User:        natefoo
Date:        2015-01-14 22:07:50+00:00
Summary:     Update tag latest_2014.08.11 for changeset f3fc4602e22b
Affected #:  1 file

diff -r 318adf2ad1959f3a1ef45badb90867b77dfef053 -r 3e56a76077b95927c0f467394c904e5124637656 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -18,7 +18,7 @@
 7d5aa19a166cba9039e15f338a1e3fc924c43d3a latest_2013.11.04
 0c000cc2f9c05bf4c1c2bc3a10215014fd64e696 latest_2014.02.10
 ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
-8150024c0e6fc5aef3033cf8aaa574896f6b5d0d latest_2014.08.11
+f3fc4602e22b39468d780b955a1a05caf867a7e9 latest_2014.08.11
 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
 c437b28348a9345db8433e5b4f0e05ec8fb6c38a latest_2014.10.06
 2e8dd2949dd3eee0f56f9a3a5ebf1b2baca24aee release_2015.01.13


https://bitbucket.org/galaxy/galaxy-central/commits/6c542972be27/
Changeset:   6c542972be27
Branch:      stable
User:        natefoo
Date:        2015-01-14 22:07:51+00:00
Summary:     Merge head created for backport bug fix on latest_2014.08.11
Affected #:  1 file



https://bitbucket.org/galaxy/galaxy-central/commits/9bd6f8b5b815/
Changeset:   9bd6f8b5b815
Branch:      stable
User:        dan
Date:        2015-01-14 22:07:54+00:00
Summary:     Make DatasetListWrapper and DatasetCollectionWrapper subclasses of ToolParameterValueWrapper.
Affected #:  1 file

diff -r c437b28348a9345db8433e5b4f0e05ec8fb6c38a -r 9bd6f8b5b8153db752f4e61ed62f2b6c01ae4a11 lib/galaxy/tools/wrappers.py
--- a/lib/galaxy/tools/wrappers.py
+++ b/lib/galaxy/tools/wrappers.py
@@ -262,7 +262,7 @@
         return DatasetFilenameWrapper( dataset, **wrapper_kwds )
 
 
-class DatasetListWrapper( list, HasDatasets ):
+class DatasetListWrapper( list, ToolParameterValueWrapper, HasDatasets ):
     """
     """
     def __init__( self, datasets, dataset_paths=[], **kwargs ):
@@ -277,7 +277,7 @@
         return ','.join( map( str, self ) )
 
 
-class DatasetCollectionWrapper( object, HasDatasets ):
+class DatasetCollectionWrapper( ToolParameterValueWrapper, HasDatasets ):
 
     def __init__( self, has_collection, dataset_paths=[], **kwargs ):
         super(DatasetCollectionWrapper, self).__init__()


https://bitbucket.org/galaxy/galaxy-central/commits/7e54e9115c70/
Changeset:   7e54e9115c70
Branch:      stable
User:        natefoo
Date:        2015-01-14 22:07:56+00:00
Summary:     Update tag latest_2014.10.06 for changeset 9bd6f8b5b815
Affected #:  1 file

diff -r 6c542972be272a1daa63a8d9ad1da06092d0f872 -r 7e54e9115c705959eb69a6dcebaccac2237a70ef .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -20,6 +20,6 @@
 ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
 f3fc4602e22b39468d780b955a1a05caf867a7e9 latest_2014.08.11
 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
-c437b28348a9345db8433e5b4f0e05ec8fb6c38a latest_2014.10.06
+9bd6f8b5b8153db752f4e61ed62f2b6c01ae4a11 latest_2014.10.06
 2e8dd2949dd3eee0f56f9a3a5ebf1b2baca24aee release_2015.01.13
 2e8dd2949dd3eee0f56f9a3a5ebf1b2baca24aee latest_2015.01.13


https://bitbucket.org/galaxy/galaxy-central/commits/5e1b2c9da932/
Changeset:   5e1b2c9da932
Branch:      stable
User:        natefoo
Date:        2015-01-14 22:07:57+00:00
Summary:     Merge head created for backport bug fix on latest_2014.10.06
Affected #:  1 file

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.

    

commits-noreply＠bitbucket.org

tags

participants (1)