Skip to content

Commit

Permalink
Try to get env in right place with nodejs
Browse files Browse the repository at this point in the history
  • Loading branch information
sverhoeven committed Aug 28, 2024
1 parent cb9a1c6 commit fd86758
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion roles/ewatercycle/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
dest: '{{ conda_root }}/conda-lock.yml'
mode: '0644'
- name: Created conda environment with locked ewatercycle dependencies
command: '{{ conda_root }}/bin/conda-lock install --no-dev -n {{ conda_environment }} {{ conda_root }}/conda-lock.yml' # noqa no-changed-when
command: '{{ conda_root }}/bin/conda-lock install --no-dev -n {{ conda_environment }} -p {{ conda_root }}/envs/{{ conda_environment }} {{ conda_root }}/conda-lock.yml' # noqa no-changed-when
args:
creates:
'{{ conda_root }}/envs/{{ conda_environment }}'
Expand Down
2 changes: 2 additions & 0 deletions roles/ewatercycle/templates/environment.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ channels:
- conda-forge
- defaults
dependencies:
# Skip ansible as running ansible second time in vagrant will make give --sudo does not exist error
# - ansible
- pip:
# TODO use released version
Expand Down Expand Up @@ -59,6 +60,7 @@ dependencies:
- ipympl
- ipynb-py-convert
- jupyterhub-idle-culler
- nodejs
# JupyterLab extensions server dependencies, lab extension should be added to defaults of jupyter role
- ipyleaflet
- jupyterlab_code_formatter
Expand Down
2 changes: 1 addition & 1 deletion roles/jupyter/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
name: configurable-http-proxy
executable: '{{ conda_environment_bin }}/npm'
environment:
PATH: "{{ conda_environment_bin }}:{{ ansible_env.PATH }}"
PATH: "{{ conda_environment_bin }}:{{ ansible_env.PATH }}"
- name: USGS data home directory
file:
path: '{{ jupyterhub_spawner_environment.USGS_DATA_HOME }}'
Expand Down

0 comments on commit fd86758

Please sign in to comment.