Skip to content

use double quotes around pkgs in conda and pip installs #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 17, 2019
Merged

use double quotes around pkgs in conda and pip installs #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bdf8aa
use double quotes around pkgs in conda and pip installs
Jul 17, 2019
1788917
add user workdir to fix conda installs
Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions neurodocker/interfaces/tests/test_miniconda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ def test_docker(self):
'instructions': [
('base', 'centos:7'),
('user', 'neuro'),
('workdir', '/home/neuro'),
(
'miniconda',
{
Expand Down Expand Up @@ -40,6 +41,7 @@ def test_singularity(self):
'instructions': [
('base', 'docker://debian:stretch-slim'),
('user', 'neuro'),
('workdir', '/home/neuro'),
(
'miniconda',
{
Expand Down
8 changes: 4 additions & 4 deletions neurodocker/templates/miniconda.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ generic:
conda install -y {{ miniconda.conda_opts|default("-q") }} --name {{ miniconda.env_name }} \
{%- for pkg in miniconda.conda_install %}
{% if not loop.last -%}
'{{ pkg }}' \
"{{ pkg }}" \
{%- else -%}
'{{ pkg }}'
"{{ pkg }}"
{%- endif -%}
{% endfor %}
sync && conda clean --all && sync
Expand All @@ -47,9 +47,9 @@ generic:
pip install --no-cache-dir {{ miniconda.pip_opts }} \
{%- for pkg in miniconda.pip_install %}
{% if not loop.last -%}
'{{ pkg }}' \
"{{ pkg }}" \
{%- else -%}
'{{ pkg }}'
"{{ pkg }}"
{%- endif -%}
{% endfor %}"
rm -rf ~/.cache/pip/*
Expand Down