Skip to content

Use Miniforge instead of regular conda #284

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.

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 3 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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: 0 additions & 2 deletions host_vars/deploy/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ static_ngi_log_path: "{{ static_ngi_pipeline_path }}/log"
ngi_softlinks: "{{ ngi_pipeline_workdir }}/softlinks"

NGI_venv_name: "NGI"
NGI_venv_py2_name: "NGI_py2"
ngi_pipeline_venv: "{{ sw_path }}/anaconda/envs/{{ NGI_venv_name }}"
ngi_pipeline_venv_py2: "{{ sw_path }}/anaconda/envs/{{ NGI_venv_py2_name }}"

ngi_pipeline_conf: "{{ root_path }}/conf/"
ngi_resources: "{{ root_path }}/resources/"
Expand Down
1 change: 0 additions & 1 deletion install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
- { role: arteria-sequencing-report-ws, tags: arteria-sequencing-report }
- { role: snpseq-metadata-service, tags: snpseq-metadata-service }
- { role: standalone_scripts, tags: standalone_scripts }
- { role: delivery, tags: delivery }
- { role: misc-tools, tags: misc-tools }
- { role: archive-upload-ws, tags: archive-upload }
- { role: archive-verify-ws, tags: archive-verify }
Expand Down
9 changes: 5 additions & 4 deletions roles/anaconda/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
anaconda_file: Anaconda3-2021.05-Linux-x86_64.sh
anaconda_checksum: 2751ab3d678ff0277ae80f9e8a74f218cfc70fe9a9cdc7bb1c137d7e47e33d53
anaconda_url: "http://repo.anaconda.com/archive/{{ anaconda_file }}"
anaconda_src: "/scratch/{{ anaconda_file }}"
anaconda_version: "24.7.1-0"
anaconda_file: "Miniforge-pypy3-{{ anaconda_version }}-Linux-x86_64.sh"
anaconda_checksum: 538afb0f656fffcc4b4015b676fbf3905052d3817dd091e3b1043bd7f68f0de6
anaconda_url: "https://github.com/conda-forge/miniforge/releases/download/{{ anaconda_version }}/{{ anaconda_file }}"
anaconda_src: "/scratch/{{ anaconda_file }}"
2 changes: 1 addition & 1 deletion roles/anaconda/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
creates: "{{ anaconda_path }}/LICENSE.txt"

- name: Update anaconda
shell: "{{ anaconda_path }}/bin/conda update -n base -c defaults conda -y"
shell: "{{ anaconda_path }}/bin/conda update -n base -c conda-forge conda -y"

- name: "Check if {{ conda_tools_env }} virtual env exists"
shell: "{{ anaconda_path }}/bin/conda env list"
Expand Down
3 changes: 3 additions & 0 deletions roles/archive-upload-ws/tasks/1_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
args:
creates: "{{ arteria_service_env_root }}"

- name: make sure pip is up to date
shell: "{{ arteria_service_env_root }}/bin/python -m ensurepip --upgrade"

- name: get archive-upload from git
git:
repo: "{{ archive_upload_repo }}"
Expand Down
5 changes: 4 additions & 1 deletion roles/arteria-checksum-ws/tasks/1_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

- name: create virtual python env for arteria-checksum
shell: "conda create --name {{ arteria_service_name }} python=2.7"
args:
args:
creates: "{{ arteria_service_env_root }}"

- name: make sure pip is up to date
shell: "{{ arteria_service_env_root }}/bin/python -m ensurepip --upgrade"

- name: get arteria-checksum from git
git:
repo: "{{ arteria_checksum_repo }}"
Expand Down
6 changes: 0 additions & 6 deletions roles/delivery/defaults/main.yml

This file was deleted.

3 changes: 0 additions & 3 deletions roles/delivery/meta/main.yml

This file was deleted.

44 changes: 0 additions & 44 deletions roles/delivery/tasks/main.yml

This file was deleted.

4 changes: 0 additions & 4 deletions roles/delivery/templates/sourceme_ugc.sh.j2

This file was deleted.

2 changes: 1 addition & 1 deletion roles/nf-core/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
register: "nfcore_envs"

- name: Setup {{ nf_core_env_name }} virtual env with python3 and nf-core v{{ nf_core_version }}
command: "conda create -n {{ nf_core_env_name }} -c conda-forge -c bioconda -c anaconda python={{ python3_version }} nf-core={{ nf_core_version }} nextflow={{ nextflow_version_tag }} awscli={{ awscli_version }}"
command: "conda create -n {{ nf_core_env_name }} -c conda-forge -c bioconda python={{ python3_version }} nf-core={{ nf_core_version }} nextflow={{ nextflow_version_tag }} awscli={{ awscli_version }}"
when: not nf_core_env_name in nfcore_envs.stdout|split

# Setup pipelines
Expand Down
4 changes: 0 additions & 4 deletions roles/ngi_pipeline/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
shell: "conda create -n {{ NGI_venv_name }} pip python={{ python3_version }}"
when: not NGI_venv_name in py_venv_exists.stdout|split

- name: Setup virtual env with python{{ python2_version }} and install dependencies
shell: "conda create -n {{ NGI_venv_py2_name }} -c anaconda python={{ python2_version }}"
when: not NGI_venv_py2_name in py_venv_exists.stdout|split

- name: Fetch ngi_pipeline from github
git:
repo: "{{ ngi_pipeline_repo }}"
Expand Down