diff --git a/config/galaxy.yml.sample b/config/galaxy.yml.sample index 0e733553171..7f43547bfab 100644 --- a/config/galaxy.yml.sample +++ b/config/galaxy.yml.sample @@ -1344,10 +1344,6 @@ galaxy: # the special topics area of the admin documentation. #enable_beta_gdpr: false - # Enable the new interface for installing tools from Tool Shed via the - # API. Admin menu will list both if enabled. - #enable_beta_ts_api_install: true - # Enable the new container interface for Interactive Environments #enable_beta_containers_interface: false diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst index bd2d8bdadbf..c61954579d4 100644 --- a/doc/source/admin/galaxy_options.rst +++ b/doc/source/admin/galaxy_options.rst @@ -2784,17 +2784,6 @@ :Type: bool -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -``enable_beta_ts_api_install`` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -:Description: - Enable the new interface for installing tools from Tool Shed via - the API. Admin menu will list both if enabled. -:Default: ``true`` -:Type: bool - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``enable_beta_containers_interface`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py index fcaadab0628..3f7b810dbce 100644 --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -366,10 +366,6 @@ class Configuration(object): self.local_task_queue_workers = int(kwargs.get("local_task_queue_workers", 2)) self.tool_submission_burst_threads = int(kwargs.get('tool_submission_burst_threads', '1')) self.tool_submission_burst_at = int(kwargs.get('tool_submission_burst_at', '10')) - - # Enable new interface for API installations from TS. - # Admin menu will list both if enabled. - self.enable_beta_ts_api_install = string_as_bool(kwargs.get('enable_beta_ts_api_install', 'True')) # The transfer manager and deferred job queue self.enable_beta_job_managers = string_as_bool(kwargs.get('enable_beta_job_managers', 'False')) # Set this to go back to setting the object store in the tool request instead of diff --git a/lib/galaxy/managers/configuration.py b/lib/galaxy/managers/configuration.py index bd3d7466183..c992fe52dc5 100644 --- a/lib/galaxy/managers/configuration.py +++ b/lib/galaxy/managers/configuration.py @@ -53,8 +53,6 @@ class ConfigSerializer(base.ModelSerializer): 'biostar_url' : _defaults_to(''), 'biostar_url_redirect' : lambda *a, **c: self.url_for(controller='biostar', action='biostar_redirect', qualified=True), 'default_locale' : _defaults_to(self.app.config.default_locale), - - 'enable_beta_ts_api_install' : _defaults_to(False), 'enable_communication_server' : _defaults_to(False), 'communication_server_port' : _defaults_to(None), 'communication_server_host' : _defaults_to(None), diff --git a/lib/galaxy/webapps/galaxy/config_schema.yml b/lib/galaxy/webapps/galaxy/config_schema.yml index 9fa6a566648..47839459241 100644 --- a/lib/galaxy/webapps/galaxy/config_schema.yml +++ b/lib/galaxy/webapps/galaxy/config_schema.yml @@ -2078,13 +2078,6 @@ mapping: Please read the GDPR section under the special topics area of the admin documentation. - enable_beta_ts_api_install: - type: bool - default: true - required: false - desc: | - Enable the new interface for installing tools from Tool Shed - via the API. Admin menu will list both if enabled. enable_beta_containers_interface: type: bool