3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/c459517ff47e/ Changeset: c459517ff47e User: jmchilton Date: 2015-02-10 14:50:13+00:00 Summary: Add major version to Galaxy, expose via API. I suspect there are better ways to do this - but I thought I would put something out there we can argue about and hopefully get something in before the next release. Affected #: 4 files diff -r 40ab1d00a1b6ef6749998d70cdd5bf7d8e19befa -r c459517ff47e53666d490ff2be3cc679bcc8ea9f lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -19,7 +19,7 @@ from galaxy.util import string_as_bool from galaxy.util.dbkeys import GenomeBuilds from galaxy.web.formatting import expand_pretty_datetime_format - +from .version import VERSION_MAJOR log = logging.getLogger( __name__ ) @@ -63,6 +63,7 @@ # This is not a uwsgi process, or something went horribly wrong. pass + self.version_major = VERSION_MAJOR # Database related configuration self.database = resolve_path( kwargs.get( "database_file", "database/universe.sqlite" ), self.root ) self.database_connection = kwargs.get( "database_connection", False ) diff -r 40ab1d00a1b6ef6749998d70cdd5bf7d8e19befa -r c459517ff47e53666d490ff2be3cc679bcc8ea9f lib/galaxy/version.py --- /dev/null +++ b/lib/galaxy/version.py @@ -0,0 +1,1 @@ +VERSION_MAJOR = "2015.03" diff -r 40ab1d00a1b6ef6749998d70cdd5bf7d8e19befa -r c459517ff47e53666d490ff2be3cc679bcc8ea9f lib/galaxy/webapps/galaxy/api/configuration.py --- a/lib/galaxy/webapps/galaxy/api/configuration.py +++ b/lib/galaxy/webapps/galaxy/api/configuration.py @@ -31,6 +31,10 @@ serialization_params = self._parse_serialization_params( kwd, 'all' ) return self.get_config_dict( trans, is_admin, **serialization_params ) + @expose_api_anonymous + def version( self, trans, **kwds ): + return {"version_major": self.app.config.version_major } + def get_config_dict( self, trans, return_admin=False, view=None, keys=None, default_view='all' ): """ Return a dictionary with (a subset of) current Galaxy settings. @@ -97,6 +101,7 @@ 'nginx_upload_path' : _defaults_to( self.url_for( controller='api', action='tools' ) ), 'ftp_upload_dir' : _defaults_to( None ), 'ftp_upload_site' : _defaults_to( None ), + 'version_major' : _defaults_to( None ), } diff -r 40ab1d00a1b6ef6749998d70cdd5bf7d8e19befa -r c459517ff47e53666d490ff2be3cc679bcc8ea9f lib/galaxy/webapps/galaxy/buildapp.py --- a/lib/galaxy/webapps/galaxy/buildapp.py +++ b/lib/galaxy/webapps/galaxy/buildapp.py @@ -222,6 +222,9 @@ webapp.mapper.resource_with_deleted( 'history', 'histories', path_prefix='/api' ) webapp.mapper.connect( '/api/histories/{history_id}/citations', action='citations', controller="histories" ) webapp.mapper.resource( 'configuration', 'configuration', path_prefix='/api' ) + webapp.mapper.connect( "configuration_version", + "/api/version", controller="configuration", + action="version", conditions=dict( method=[ "GET" ] ) ) webapp.mapper.resource( 'datatype', 'datatypes', path_prefix='/api', https://bitbucket.org/galaxy/galaxy-central/commits/866296df94bf/ Changeset: 866296df94bf User: jmchilton Date: 2015-02-10 15:04:19+00:00 Summary: Change version format to YY.MM. Affected #: 1 file diff -r c459517ff47e53666d490ff2be3cc679bcc8ea9f -r 866296df94bf79132e81389b26f91847891025c8 lib/galaxy/version.py --- a/lib/galaxy/version.py +++ b/lib/galaxy/version.py @@ -1,1 +1,1 @@ -VERSION_MAJOR = "2015.03" +VERSION_MAJOR = "15.03" https://bitbucket.org/galaxy/galaxy-central/commits/c58911f54093/ Changeset: c58911f54093 User: dannon Date: 2015-02-10 18:46:38+00:00 Summary: Merged in jmchilton/galaxy-central-fork-1 (pull request #665) Add major version to Galaxy, expose via API. Affected #: 4 files diff -r 38529c8600696278d2c4299c03e9be38aa32e146 -r c58911f54093a4b5d963fa70393908d9e701aeaa lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -19,7 +19,7 @@ from galaxy.util import string_as_bool from galaxy.util.dbkeys import GenomeBuilds from galaxy.web.formatting import expand_pretty_datetime_format - +from .version import VERSION_MAJOR log = logging.getLogger( __name__ ) @@ -63,6 +63,7 @@ # This is not a uwsgi process, or something went horribly wrong. pass + self.version_major = VERSION_MAJOR # Database related configuration self.database = resolve_path( kwargs.get( "database_file", "database/universe.sqlite" ), self.root ) self.database_connection = kwargs.get( "database_connection", False ) diff -r 38529c8600696278d2c4299c03e9be38aa32e146 -r c58911f54093a4b5d963fa70393908d9e701aeaa lib/galaxy/version.py --- /dev/null +++ b/lib/galaxy/version.py @@ -0,0 +1,1 @@ +VERSION_MAJOR = "15.03" diff -r 38529c8600696278d2c4299c03e9be38aa32e146 -r c58911f54093a4b5d963fa70393908d9e701aeaa lib/galaxy/webapps/galaxy/api/configuration.py --- a/lib/galaxy/webapps/galaxy/api/configuration.py +++ b/lib/galaxy/webapps/galaxy/api/configuration.py @@ -31,6 +31,10 @@ serialization_params = self._parse_serialization_params( kwd, 'all' ) return self.get_config_dict( trans, is_admin, **serialization_params ) + @expose_api_anonymous + def version( self, trans, **kwds ): + return {"version_major": self.app.config.version_major } + def get_config_dict( self, trans, return_admin=False, view=None, keys=None, default_view='all' ): """ Return a dictionary with (a subset of) current Galaxy settings. @@ -97,6 +101,7 @@ 'nginx_upload_path' : _defaults_to( self.url_for( controller='api', action='tools' ) ), 'ftp_upload_dir' : _defaults_to( None ), 'ftp_upload_site' : _defaults_to( None ), + 'version_major' : _defaults_to( None ), } diff -r 38529c8600696278d2c4299c03e9be38aa32e146 -r c58911f54093a4b5d963fa70393908d9e701aeaa lib/galaxy/webapps/galaxy/buildapp.py --- a/lib/galaxy/webapps/galaxy/buildapp.py +++ b/lib/galaxy/webapps/galaxy/buildapp.py @@ -222,6 +222,9 @@ webapp.mapper.resource_with_deleted( 'history', 'histories', path_prefix='/api' ) webapp.mapper.connect( '/api/histories/{history_id}/citations', action='citations', controller="histories" ) webapp.mapper.resource( 'configuration', 'configuration', path_prefix='/api' ) + webapp.mapper.connect( "configuration_version", + "/api/version", controller="configuration", + action="version", conditions=dict( method=[ "GET" ] ) ) webapp.mapper.resource( 'datatype', 'datatypes', path_prefix='/api', 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.