diff --git a/scripts/grt/export.py b/scripts/grt/export.py index b2e13e85c3b..fe5edbcf97e 100644 --- a/scripts/grt/export.py +++ b/scripts/grt/export.py @@ -26,25 +26,18 @@ sample_config = os.path.abspath(os.path.join(os.path.dirname(__file__), 'grt.yml default_config = os.path.abspath(os.path.join(os.path.dirname(__file__), 'grt.yml')) -def _init(args, need_app=False): +def _init(args): properties = app_properties_from_args(args) config = galaxy.config.Configuration(**properties) object_store = build_object_store_from_config(config) if not config.database_connection: logging.warning("The database connection is empty. If you are using the default value, please uncomment that in your galaxy.yml") - if need_app: - config_file = config_file_from_args(args) - app = galaxy.app.UniverseApplication(global_conf={'__file__': config_file, 'here': os.getcwd()}) - else: - app = None - model = galaxy.config.init_models_from_config(config, object_store=object_store) return ( model, object_store, config, - app ) @@ -172,7 +165,7 @@ def main(argv): last_job_sent = -1 annotate('galaxy_init', 'Loading Galaxy...') - model, object_store, gxconfig, app = _init(args, need_app=config['grt']['share_toolbox']) + model, object_store, gxconfig = _init(args) # Galaxy overrides our logging level. logging.getLogger().setLevel(getattr(logging, args.loglevel.upper())) @@ -409,16 +402,8 @@ def main(argv): # Now serialize the individual report data. with open(REPORT_BASE + '.json', 'w') as handle: - if config['grt']['share_toolbox']: - toolbox = [ - (tool.id, tool.name, tool.version, tool.tool_shed, tool.repository_id, tool.repository_name) - for tool_id, tool in app.toolbox._tools_by_id.items() - ] - else: - toolbox = None - json.dump({ - "version": 1, + "version": 2, "galaxy_version": gxconfig.version_major, "generated": REPORT_IDENTIFIER, "report_hash": "sha256:" + sha, @@ -430,7 +415,6 @@ def main(argv): "total": sa_session.query(model.User.id).count(), }, "jobs": job_state_data, - "tools": toolbox }, handle) # Write our checkpoint file so we know where to start next time. diff --git a/scripts/grt/grt.yml.sample b/scripts/grt/grt.yml.sample index d0cecd68b10..e775d66f0cf 100644 --- a/scripts/grt/grt.yml.sample +++ b/scripts/grt/grt.yml.sample @@ -8,14 +8,6 @@ grt: # willing and able to contribute your data publicly. url: https://telescope.galaxyproject.org/grt-admin/ - # Are you willing to share your toolbox? I.e. what tools are installed. - # If your instance is public, this can help us direct users to your - # instance. If you elect to not send your entire toolbox, we will still - # (necessarily) receive a list of tools that have been run, just not the - # complete list. WARNING: This may not work on production instances, currently. - share_toolbox: False - - sanitization: # Blacklist the entire tool from appearing tools: