Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Pulsar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
NDIP
Pulsar
Commits
31be67da
Commit
31be67da
authored
7 years ago
by
Nate Coraor
Browse files
Options
Downloads
Patches
Plain Diff
Fix conda_* app config options and don't auto_init conda during tests
unless explicitly requested.
parent
c20a7eba
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pulsar/core.py
+1
-4
1 addition, 4 deletions
pulsar/core.py
test/test_utils.py
+2
-0
2 additions, 0 deletions
test/test_utils.py
with
3 additions
and
4 deletions
pulsar/core.py
+
1
−
4
View file @
31be67da
...
...
@@ -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
):
...
...
This diff is collapsed.
Click to expand it.
test/test_utils.py
+
2
−
0
View file @
31be67da
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment