Skip to content
Snippets Groups Projects
Commit 31be67da authored by Nate Coraor's avatar Nate Coraor
Browse files

Fix conda_* app config options and don't auto_init conda during tests

unless explicitly requested.
parent c20a7eba
No related branches found
No related tags found
No related merge requests found
......@@ -124,10 +124,7 @@ class PulsarApp(object):
def __setup_dependency_manager(self, conf):
dependencies_dir = conf.get("tool_dependency_dir", "dependencies")
resolvers_config_file = conf.get("dependency_resolvers_config_file", "dependency_resolvers_conf.xml")
conda_config = {}
for key, value in conf.items():
if key.startswith("conda_"):
conda_config[key[len('conda_'):]] = value
conda_config = {k: v for k, v in conf.items() if k.startswith("conda_")}
self.dependency_manager = DependencyManager(dependencies_dir, resolvers_config_file, app_config=conda_config)
def __setup_job_metrics(self, conf):
......
......@@ -304,6 +304,8 @@ def test_pulsar_app(
app_conf["staging_directory"] = staging_directory
app_conf["file_cache_dir"] = cache_directory
app_conf["ensure_cleanup"] = True
app_conf["conda_auto_init"] = app_conf.get("conda_auto_init", False)
app_conf["conda_auto_install"] = app_conf.get("conda_auto_install", False)
try:
with _yield_app(global_conf, app_conf, test_conf, web) as app:
yield app
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment