commit/galaxy-central: carlfeberhard: Visualizations registry: in universe_wsgi.ini, set default value of visualization_plugins_directory to config/plugins/visualizations
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/3180ca1c1994/ Changeset: 3180ca1c1994 User: carlfeberhard Date: 2014-09-03 15:30:27 Summary: Visualizations registry: in universe_wsgi.ini, set default value of visualization_plugins_directory to config/plugins/visualizations Affected #: 3 files diff -r 012e6eb765684020eb597d8925e4ca5b58b9d904 -r 3180ca1c1994705a17dedb5d6c4f8373b4f5aae4 lib/galaxy/app.py --- a/lib/galaxy/app.py +++ b/lib/galaxy/app.py @@ -96,11 +96,9 @@ # Load history import/export tools. load_history_imp_exp_tools( self.toolbox ) # visualizations registry: associates resources with visualizations, controls how to render - self.visualizations_registry = None - if self.config.visualization_plugins_directory: - self.visualizations_registry = VisualizationsRegistry( self, - directories_setting=self.config.visualization_plugins_directory, - template_cache_dir=self.config.template_cache ) + self.visualizations_registry = VisualizationsRegistry( self, + directories_setting=self.config.visualization_plugins_directory, + template_cache_dir=self.config.template_cache ) # Load security policy. self.security_agent = self.model.security_agent self.host_security_agent = galaxy.security.HostAgent( model=self.security_agent.model, permitted_actions=self.security_agent.permitted_actions ) diff -r 012e6eb765684020eb597d8925e4ca5b58b9d904 -r 3180ca1c1994705a17dedb5d6c4f8373b4f5aae4 lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -376,8 +376,9 @@ self.fluent_log = string_as_bool( kwargs.get( 'fluent_log', False ) ) self.fluent_host = kwargs.get( 'fluent_host', 'localhost' ) self.fluent_port = int( kwargs.get( 'fluent_port', 24224 ) ) - # visualization plugin framework - self.visualization_plugins_directory = kwargs.get( 'visualization_plugins_directory', None ) + # directory where the visualization/registry searches for plugins + self.visualization_plugins_directory = kwargs.get( + 'visualization_plugins_directory', 'config/plugins/visualizations' ) # Default chunk size for chunkable datatypes -- 64k self.display_chunk_size = int( kwargs.get( 'display_chunk_size', 65536) ) diff -r 012e6eb765684020eb597d8925e4ca5b58b9d904 -r 3180ca1c1994705a17dedb5d6c4f8373b4f5aae4 universe_wsgi.ini.sample --- a/universe_wsgi.ini.sample +++ b/universe_wsgi.ini.sample @@ -210,8 +210,8 @@ # Visualizations config directory: where to look for individual visualization plugins. # The path is relative to the Galaxy root dir. To use an absolute path begin the path -# with '/'. -visualization_plugins_directory = config/plugins/visualizations +# with '/'. Defaults to "config/plugins/visualizations". +#visualization_plugins_directory = config/plugins/visualizations # Each job is given a unique empty directory as its current working directory. # This option defines in what parent directory those directories will be 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.
participants (1)
-
commits-noreply@bitbucket.org