1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/916aee1b2e3d/ Changeset: 916aee1b2e3d User: natefoo Date: 2015-02-12 20:42:50+00:00 Summary: Rename the egg env vars back to GALAXY_* now that they are not config file options anymore. Affected #: 3 files
diff -r 6730c4cb28dead6bbf57a3e1f599136ab71dd34d -r 916aee1b2e3d74015a727133cd7f4a2ef9c1a447 lib/galaxy/eggs/__init__.py --- a/lib/galaxy/eggs/__init__.py +++ b/lib/galaxy/eggs/__init__.py @@ -293,9 +293,9 @@ self.py_platform = None if platform is not None: self.py_platform = platform.split( '-' )[0] - self.enable_egg_fetch = string_as_bool(os.environ.get('GALAXY_CONFIG_ENABLE_EGG_FETCH', True)) - self.enable_eggs = string_as_bool(os.environ.get('GALAXY_CONFIG_ENABLE_EGGS', True)) - self.try_dependencies_from_env = string_as_bool(os.environ.get('GALAXY_CONFIG_TRY_DEPENDENCIES_FROM_ENV', False)) + self.enable_egg_fetch = string_as_bool(os.environ.get('GALAXY_ENABLE_EGG_FETCH', True)) + self.enable_eggs = string_as_bool(os.environ.get('GALAXY_ENABLE_EGGS', True)) + self.try_dependencies_from_env = string_as_bool(os.environ.get('GALAXY_TRY_DEPENDENCIES_FROM_ENV', False)) self.galaxy_config = GalaxyConfig( galaxy_config_file ) self.parse()
diff -r 6730c4cb28dead6bbf57a3e1f599136ab71dd34d -r 916aee1b2e3d74015a727133cd7f4a2ef9c1a447 lib/galaxy/jobs/runners/__init__.py --- a/lib/galaxy/jobs/runners/__init__.py +++ b/lib/galaxy/jobs/runners/__init__.py @@ -274,7 +274,7 @@ env = [] crate = galaxy.eggs.Crate() for opt in ('enable_egg_fetch', 'enable_eggs', 'try_dependencies_from_env'): - env.append('GALAXY_CONFIG_%s="%s"; export GALAXY_CONFIG_%s' % (opt.upper(), getattr(crate, opt), opt.upper())) + env.append('GALAXY_%s="%s"; export GALAXY_%s' % (opt.upper(), getattr(crate, opt), opt.upper())) return env
def get_job_file(self, job_wrapper, **kwds):
diff -r 6730c4cb28dead6bbf57a3e1f599136ab71dd34d -r 916aee1b2e3d74015a727133cd7f4a2ef9c1a447 requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ # However, you may want to manage these dependencies on your own. If so, this # file can be used with pip to install all of the bare minimum dependencies for # starting a Galaxy server. Use this in conjunction with the -# `GALAXY_CONFIG_ENABLE_EGGS=False` environment variable. +# `GALAXY_ENABLE_EGGS=False` environment variable. # # Note that except in the case of SQLAlchemy, all dependencies will be # installed at their newest versions. Galaxy has not been tested with these and
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.