Skip to content

Commit

Permalink
Merge pull request #156 from bird-house/fix-conda
Browse files Browse the repository at this point in the history
Fix conda
  • Loading branch information
cehbrecht authored Nov 15, 2024
2 parents bc58a26 + 15f1b20 commit f2d5930
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ tests/test.sh

# CEDA submodule for local modifcations
ansible-birdhouse-content

# macos
.DS_Store
8 changes: 7 additions & 1 deletion group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,15 @@ slurm_partitions:
Nodes: localhost
slurm_munge_key: /etc/munge/munge.key

# miniconda
# miniconda: we need to use Miniforge!
miniconda_parent_dir: "{{ prefix }}"
miniconda_make_sys_default: False
#url: https://github.com/conda-forge/miniforge/releases/download/24.9.2-0/Miniforge3-24.9.2-0-Linux-x86_64.sh
miniconda_ver: 24.9.2-0
miniconda_mirror: https://github.com/conda-forge/miniforge/releases/download
miniconda_name: 'Miniforge3-{{ miniconda_ver }}-{{ miniconda_platform }}'
miniconda_installer_url: '{{ miniconda_mirror }}/{{ miniconda_ver }}/{{ miniconda_installer_sh }}'
miniconda_checksum: sha256:ca8c544254c40ae5192eb7db4e133ff4eb9f942a1fec737dba8205ac3f626322

# conda
conda_location: "{{ prefix }}/anaconda"
Expand Down
2 changes: 1 addition & 1 deletion roles/pywps/tasks/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
- conda

- name: Install additional pip packages.
command: "{{ conda_envs_dir}}/{{ item.name }}/bin/pip install gunicorn[gevent] psycopg2-binary drmaa dill pytest"
command: "{{ conda_envs_dir}}/{{ item.name }}/bin/pip install gunicorn[gevent] psycopg2-binary drmaa dill pytest pytest-cov"
with_items: "{{ wps_services }}"
when: conda_env.changed or conda_env_spec.changed
tags:
Expand Down

0 comments on commit f2d5930

Please sign in to comment.