opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use newer-style Galaxy configuration of interactive environments.

Browse Source 
Setup a sample file and fallback on it if a materialized .ini isn't present. Use .ini instead of .conf for consistency with the rest of the config directory.
This commit is contained in:
John Chilton
2014-10-18 18:38:04 -04:00
parent a52f4c21ee
commit c58742e55b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/plugins/interactive_environments/ipython/config/ipython.conf → config/plugins/interactive_environments/ipython/config/ipython.ini.sample
View File
config/plugins/interactive_environments/ipython/templates/ie.mako
+4 -1
View File
@@ -30,7 +30,10 @@ import ConfigParser
self.attr.our_config_dir = os.path.join(plugin_path, "config")
self.attr.our_template_dir = os.path.join(plugin_path, "templates")
self.attr.viz_config = ConfigParser.SafeConfigParser(default_dict)
self.attr.viz_config.read( os.path.join( self.attr.our_config_dir, self.attr.viz_id + ".conf" ) )
conf_path = os.path.join( self.attr.our_config_dir, self.attr.viz_id + ".ini" )
if not os.path.exists( conf_path ):
conf_path = "%s.sample" % conf_path
self.attr.viz_config.read( conf_path )
# Store some variables we want by default
self.attr.PASSWORD_AUTH = self.attr.viz_config.getboolean("main", "password_auth")
self.attr.APACHE_URLS = self.attr.viz_config.getboolean("main", "apache_urls")