diff --git a/lib/galaxy/config/__init__.py b/lib/galaxy/config/__init__.py index 7a5be5e4568..a9eea29ec91 100644 --- a/lib/galaxy/config/__init__.py +++ b/lib/galaxy/config/__init__.py @@ -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")): diff --git a/packages/app/MANIFEST.in b/packages/app/MANIFEST.in index c92ee20bd38..c6c3f36dbb7 100644 --- a/packages/app/MANIFEST.in +++ b/packages/app/MANIFEST.in @@ -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 diff --git a/packages/app/galaxy/config_schema.yml b/packages/app/galaxy/config_schema.yml new file mode 120000 index 00000000000..6c9a0d37301 --- /dev/null +++ b/packages/app/galaxy/config_schema.yml @@ -0,0 +1 @@ +../../../lib/galaxy/webapps/galaxy/config_schema.yml \ No newline at end of file diff --git a/packages/app/galaxy/job_config_schema.yml b/packages/app/galaxy/job_config_schema.yml new file mode 120000 index 00000000000..075efbd9219 --- /dev/null +++ b/packages/app/galaxy/job_config_schema.yml @@ -0,0 +1 @@ +../../../lib/galaxy/webapps/galaxy/job_config_schema.yml \ No newline at end of file diff --git a/packages/app/galaxy/uwsgi_schema.yml b/packages/app/galaxy/uwsgi_schema.yml new file mode 120000 index 00000000000..7a34c111575 --- /dev/null +++ b/packages/app/galaxy/uwsgi_schema.yml @@ -0,0 +1 @@ +../../../lib/galaxy/webapps/galaxy/uwsgi_schema.yml \ No newline at end of file