Add local_conda_mapping_file to schema

Purpose: let the config system load this just like any other path to a config file.
Update comment in sample file
Enable unit test
Run make config-rebuild.
This commit is contained in:
Sergey Golitsynskiy
2020-09-05 00:35:11 -04:00
parent 43ffc43e2c
commit cef89bfac5
6 changed files with 30 additions and 3 deletions
+12
View File
@@ -474,6 +474,18 @@
:Type: bool
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
``local_conda_mapping_file``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
:Description:
Path to a file that provides a mapping from abstract packages to
concrete conda packages. See
`config/local_conda_mapping.yml.sample` for examples.
:Default: ``local_conda_mapping.yml``
:Type: str
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
``use_cached_dependency_manager``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-1
View File
@@ -787,7 +787,6 @@ class GalaxyAppConfiguration(BaseAppConfiguration, CommonConfigurationMixin):
build_sites_config_file=[self._in_config_dir('build_sites.yml'), self._in_sample_dir('build_sites.yml.sample')],
datatypes_config_file=[self._in_config_dir('datatypes_conf.xml'), self._in_sample_dir('datatypes_conf.xml.sample')],
job_metrics_config_file=[self._in_config_dir('job_metrics_conf.xml'), self._in_sample_dir('job_metrics_conf.xml.sample')],
local_conda_mapping_file=[self._in_config_dir('local_conda_mapping.yml')],
modules_mapping_files=[self._in_config_dir('environment_modules_mapping.yml')],
)
listify_defaults = {
@@ -326,6 +326,11 @@ galaxy:
# and extra time spent copying packages.
#conda_copy_dependencies: false
# Path to a file that provides a mapping from abstract packages to
# concrete conda packages. See `config/local_conda_mapping.yml.sample`
# for examples.
#local_conda_mapping_file: local_conda_mapping.yml
# Certain dependency resolvers (namely Conda) take a considerable
# amount of time to build an isolated job environment in the
# job_working_directory if the job working directory is on a network
@@ -1,2 +1,3 @@
# See $GALAXY_ROOT/lib/galaxy/tools/deps/resolvers/default_conda_mapping.yml for example mapping -
# additional site-specific mappings can be added to config/local_conda_mapping.yml.
# See $GALAXY_ROOT/lib/galaxy/tool_util/deps/resolvers/default_conda_mapping.yml for example mapping -
# additional site-specific mappings can be added to config/local_conda_mapping.yml (or the location
# of <local_conda_mapping_file> specified in galaxy.yml).
@@ -368,6 +368,15 @@ mapping:
This will prevent problems with some specific packages (perl, R), at the cost
of extra disk space usage and extra time spent copying packages.
local_conda_mapping_file:
type: str
default: 'local_conda_mapping.yml'
path_resolves_to: config_dir
required: false
desc: |
Path to a file that provides a mapping from abstract packages to concrete conda packages.
See `config/local_conda_mapping.yml.sample` for examples.
use_cached_dependency_manager:
type: bool
default: false
+1
View File
@@ -123,6 +123,7 @@ class ExpectedValues:
'job_metrics_config_file': self._in_sample_dir('job_metrics_conf.xml.sample'),
'job_resource_params_file': self._in_config_dir('job_resource_params_conf.xml'),
'len_file_path': self._in_root_dir('tool-data/shared/ucsc/chrom'),
'local_conda_mapping_file': self._in_config_dir('local_conda_mapping.yml'),
'managed_config_dir': self._in_managed_config_dir(),
'markdown_export_css': self._in_config_dir('markdown_export.css'),
'markdown_export_css_invocation_reports': self._in_config_dir('markdown_export_invocation_reports.css'),