Include config schemas in galaxy-app package and support loading from

the package dir rather than a fixed path in lib/.
This commit is contained in:
Nate Coraor
2021-04-02 14:07:37 -04:00
parent e7127f7386
commit 38fcde0aaf
5 changed files with 9 additions and 1 deletions
+5 -1
View File
@@ -531,7 +531,11 @@ class GalaxyAppConfiguration(BaseAppConfiguration, CommonConfigurationMixin):
self._process_config(kwargs)
def _load_schema(self):
return AppSchema(GALAXY_CONFIG_SCHEMA_PATH, GALAXY_APP_NAME)
# Schemas are symlinked to the root of the galaxy-app package
config_schema_path = os.path.join(os.path.dirname(__file__), os.pardir, 'config_schema.yml')
if os.path.exists(GALAXY_CONFIG_SCHEMA_PATH):
config_schema_path = GALAXY_CONFIG_SCHEMA_PATH
return AppSchema(config_schema_path, GALAXY_APP_NAME)
def _override_tempdir(self, kwargs):
if string_as_bool(kwargs.get("override_tempdir", "True")):
+1
View File
@@ -1,3 +1,4 @@
include *.rst *.txt LICENSE
include galaxy/jobs/runners/util/job_script/*.sh
include galaxy/model/tool_shed_install/migrate/migrate.cfg
include galaxy/*.yml
+1
View File
@@ -0,0 +1 @@
../../../lib/galaxy/webapps/galaxy/config_schema.yml
+1
View File
@@ -0,0 +1 @@
../../../lib/galaxy/webapps/galaxy/job_config_schema.yml
+1
View File
@@ -0,0 +1 @@
../../../lib/galaxy/webapps/galaxy/uwsgi_schema.yml