1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/7fcc92fb8035/ Changeset: 7fcc92fb8035 User: natefoo Date: 2014-09-23 14:12:00+00:00 Summary: Merge next-stable to default. Affected #: 3 files diff -r 5cda4ac27e0a3c7b688e479a593698bfb3f0deb8 -r 7fcc92fb8035f854b0f72085b40ac5f772ff9205 lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -13,7 +13,6 @@ import ConfigParser from datetime import timedelta from galaxy.web.formatting import expand_pretty_datetime_format -from galaxy.util.properties import load_app_properties from galaxy.util import string_as_bool from galaxy.util import listify from galaxy.util.dbkeys import GenomeBuilds @@ -37,9 +36,6 @@ deprecated_options = ( 'database_file', ) def __init__( self, **kwargs ): - kwargs = load_app_properties( - kwds=kwargs - ) self.config_dict = kwargs self.root = kwargs.get( 'root_dir', '.' ) diff -r 5cda4ac27e0a3c7b688e479a593698bfb3f0deb8 -r 7fcc92fb8035f854b0f72085b40ac5f772ff9205 lib/galaxy/webapps/galaxy/buildapp.py --- a/lib/galaxy/webapps/galaxy/buildapp.py +++ b/lib/galaxy/webapps/galaxy/buildapp.py @@ -19,6 +19,7 @@ import galaxy.web.framework.webapp from galaxy import util from galaxy.util import asbool +from galaxy.util.properties import load_app_properties import logging log = logging.getLogger( __name__ ) @@ -31,6 +32,9 @@ """ Return a wsgi application serving the root object """ + kwargs = load_app_properties( + kwds=kwargs + ) # Create the Galaxy application unless passed in if 'app' in kwargs: app = kwargs.pop( 'app' ) diff -r 5cda4ac27e0a3c7b688e479a593698bfb3f0deb8 -r 7fcc92fb8035f854b0f72085b40ac5f772ff9205 scripts/functional_tests.py --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -66,8 +66,8 @@ default_galaxy_test_port_max = 9999 default_galaxy_locales = 'en' default_galaxy_test_file_dir = "test-data" -migrated_tool_panel_config = 'migrated_tools_conf.xml' -installed_tool_panel_configs = [ 'shed_tool_conf.xml' ] +migrated_tool_panel_config = 'config/migrated_tools_conf.xml' +installed_tool_panel_configs = [ 'config/shed_tool_conf.xml' ] # should this serve static resources (scripts, images, styles, etc.) STATIC_ENABLED = True @@ -224,7 +224,7 @@ datatypes_conf_override = os.path.join( framework_tool_dir, 'sample_datatypes_conf.xml' ) else: # Use tool_conf.xml toolbox. - tool_conf = 'tool_conf.xml' + tool_conf = None if __check_arg( '-with_framework_test_tools' ): # Some of these tools will not work without swapping # default interactor to point to test. @@ -239,11 +239,10 @@ ignore_files = () start_server = 'GALAXY_TEST_EXTERNAL' not in os.environ + tool_data_table_config_path = None if os.path.exists( 'tool_data_table_conf.test.xml' ): tool_data_table_config_path = 'tool_data_table_conf.test.xml' - else: - tool_data_table_config_path = 'tool_data_table_conf.xml' - shed_tool_data_table_config = 'shed_tool_data_table_conf.xml' + shed_tool_data_table_config = 'config/shed_tool_data_table_conf.xml' tool_dependency_dir = os.environ.get( 'GALAXY_TOOL_DEPENDENCY_DIR', None ) use_distributed_object_store = os.environ.get( 'GALAXY_USE_DISTRIBUTED_OBJECT_STORE', False ) galaxy_test_tmp_dir = os.environ.get( 'GALAXY_TEST_TMP_DIR', None ) 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.