From 31be67da6a39f0d8c3add358d86c9ba23db50c2b Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Tue, 19 Sep 2017 09:39:08 -0400
Subject: [PATCH] Fix conda_* app config options and don't auto_init conda
during tests unless explicitly requested.
---
pulsar/core.py | 5 +----
test/test_utils.py | 2 ++
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/pulsar/core.py b/pulsar/core.py
index 79f242fb..db9818bf 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 a1498b61..08863b2c 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
--
GitLab