diff --git a/pulsar/core.py b/pulsar/core.py index 79f242fb10306c2c185f8ec42c4043e94ea68321..db9818bf106353e9d778d8bd20382c86dac182ce 100644 --- a/pulsar/core.py +++ b/pulsar/core.py @@ -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): diff --git a/test/test_utils.py b/test/test_utils.py index a1498b61c5cfdcf57791c641f987cef8fb627724..08863b2c2db9830d2d92f7a2be3339d51bb91ff8 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -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