Skip to content

Commit 2fe02a3

Browse files
committed
fix
1 parent 53bff6b commit 2fe02a3

File tree

4 files changed

+55
-34
lines changed

4 files changed

+55
-34
lines changed

README.md

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,18 @@ zarp \
5151
Quick installation requires the following:
5252

5353
- Linux with root permissions
54-
- [`conda >= 22.11.1`][conda]
55-
- [`mamba >=1.3.0`][mamba]
54+
- [`conda >= 24.11.3`][conda]
55+
- Recommended: [`apptainer >= 1.3.6`][apptainer] (only required if `APPTAINER`
56+
shall be used as the dependency embedding strategy)
5657

5758
Execute the following commands:
5859

5960
```sh
6061
git clone git@github.com:zavolanlab/zarp
6162
git clone git@github.com:zavolanlab/zarp-cli.git
6263
cd zarp-cli
63-
mamba env create -f install/environment.root.yml
64+
conda env create -f install/environment.yml
6465
conda activate zarp-cli
65-
```
66-
67-
> If you do not have root privileges on your machine, replace the `mamba env
68-
> create` call with the following one:
69-
>
70-
> ```sh
71-
> mamba env create -f install/environment.yml
72-
> ```
7366

7467
That's it - you can now use _ZARP-cli_!
7568
@@ -103,6 +96,7 @@ by [email][contact].
10396
10497
© 2021 [Zavolab, Biozentrum, University of Basel][zavolab]
10598
99+
[apptainer]: <https://apptainer.org/>
106100
[conda]: <https://docs.conda.io/projects/conda/en/latest/index.html>
107101
[contact]: <mailto:zavolab-biozentrum@unibas.ch>
108102
[badge-build-status]: <https://github.com/zavolanlab/zarp-cli/actions/workflows/tests.yml/badge.svg>
@@ -121,7 +115,6 @@ by [email][contact].
121115
[badge-url-license]: <http://www.apache.org/licenses/LICENSE-2.0>
122116
[htsinfer]: <https://github.com/zavolanlab/htsinfer>
123117
[issue-tracker]: <https://github.com/zavolanlab/zarp-cli/issues>
124-
[mamba]: <https://mamba.readthedocs.io/en/latest/>
125118
[semver]: <https://semver.org/>
126119
[zarp]: <https://github.com/zavolanlab/zarp>
127120
[zavolab]: <https://www.biozentrum.unibas.ch/research/researchgroups/overview/unit/zavolan/research-group-mihaela-zavolan/>

docs/guides/installation.md

Lines changed: 47 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,57 @@ On this page, you will find out how to install _ZARP-cli_ on your system.
66

77
Installation requires the following:
88

9-
- Linux (tested with Ubuntu 20.04; macOS has not been tested yet)
10-
- [Conda][conda] (tested with `conda 22.11.1`)
11-
- [Mamba][mamba] (tested with `mamba 1.3.0`)
12-
- [Apptainer][apptainer] (tested with `apptainer 1.3.6`; not required
13-
if you have root permissions on the machine you would like to install
14-
_ZARP-cli_ on; in that case, choose one of the `.root.` environment file
15-
flavors [below](#3-set-up-environment))
9+
- Linux (tested with Ubuntu 24.04)
10+
- [Conda][conda] (tested with `conda 24.11.3`)
11+
- **Recommended:** [Apptainer][apptainer] (tested with `apptainer 1.3.6`; only
12+
required for dependency embedding strategy `APPTAINER`)
1613

17-
> Other versions, especially older ones, are not guaranteed to work.
14+
!!! warning "Other versions, especially older ones, are not guaranteed to work!"
15+
16+
??? question "How do I install Apptainer?"
17+
18+
Please follow the [official documentation][apptainer-docs] to install
19+
Apptainer (formerly Singularity) globally and configure its permissions.
20+
To test whether your Apptainer configuration is adequate, you can check
21+
whether the following commands complete without errors:
22+
23+
```sh
24+
apptainer pull docker://alpine:latest
25+
apptainer run alpine_latest.sif echo "Hello from Apptainer"
26+
```
27+
28+
??? tip "Wanna run _ZARP_ on your HPC cluster?"
29+
30+
_ZARP_ should be able to run on a sufficiently powered (32+GB RAM), modern
31+
laptop for most samples. However, if you want to analyze large samples, or
32+
a large number of samples, we recommend connecting _ZARP_ to an HPC
33+
cluster.
34+
35+
In that case, you will need to make sure that compatible versions of at
36+
least one of Conda and Apptainer (when using dependency embedding
37+
strategies `CONDA` and `APPTAINER`, respectively) are installed and
38+
properly configured on each machine of the cluster, including the head
39+
node(s). Reach out to your systems administrator to set this up for you.
40+
41+
Once Conda and/or Apptainer are set up, follow the [_ZARP_
42+
documentation][zarp-docs] to use, create or extend the necessary
43+
Snakemake execution [profiles][snakemake-profiles] to connect _ZARP_
44+
runs to your HPC cluster.
1845

1946
## Installation steps
2047

21-
### 1. Clone ZARP
48+
### 1. Clone _ZARP_
2249

23-
Clone the [ZARP workflow repository][zarp] with:
50+
Clone the [_ZARP_ workflow repository][zarp] with:
2451

2552
```sh
2653
git clone git@github.com:zavolanlab/zarp
2754
# or: git clone https://github.com/zavolanlab/zarp.git
2855
```
2956

30-
### 2. Clone ZARP-cli
57+
### 2. Clone _ZARP-cli_
3158

32-
Clone the [ZARP-cli repository][zarp-cli] and traverse into it with:
59+
Clone the [_ZARP-cli_ repository][zarp-cli] and traverse into it with:
3360

3461
```sh
3562
git clone git@github.com:zavolanlab/zarp-cli.git
@@ -40,21 +67,20 @@ cd zarp-cli
4067
### 3. Set up environment
4168

4269
In the next step, you need to install the app with its dependencies. For that
43-
purpose, there exist four different environment files. Use this decision matrix
44-
to pick the most suitable one for you:
70+
purpose, there exist two different "environment files". Use this decision
71+
matrix to pick the most suitable one for you:
4572

46-
| I have root privileges on the machine | I want to run pre-packaged tests | Environment file to use &emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp; |
47-
|:---:|:---:| --- |
48-
| | | `install/environment.yml` |
49-
| :check_mark: | | `install/environment.root.yml` |
50-
| | :check_mark: | `install/environment.dev.yml` |
51-
| :check_mark: | :check_mark: | `install/environment.dev.root.yml` |
73+
| I want to run pre-packaged tests | Environment file to use
74+
&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp; |
75+
|:---:| --- |
76+
| | `install/environment.yml` |
77+
| :check_mark: | `install/environment.dev.yml` |
5278

5379
To set up the environment, execute the call below, but do not forget to replace
5480
the placeholder `ENVIRONMENT` with the appropriate file from the table above:
5581

5682
```sh
57-
mamba env create -f ENVIRONMENT
83+
conda env create -f ENVIRONMENT
5884
```
5985

6086
### 4. Activate environment

docs/includes/abbreviations.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
*[CLI]: command-line interface
2+
*[HPC]: High-Performance Computing

docs/includes/references.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[apptainer]: <https://apptainer.org/>
2+
[apptainer-docs]: <https://apptainer.org/documentation/>
23
[bioanalyzer]: <https://www.agilent.com/en/product/automated-electrophoresis/bioanalyzer-systems>
34
[conda]: <https://docs.conda.io/projects/conda/en/latest/index.html>
45
[contact]: <mailto:zavolab-biozentrum@unibas.ch>
@@ -8,7 +9,6 @@
89
[github-signup]: <https://github.com/signup>
910
[htsinfer]: <https://github.com/zavolanlab/htsinfer>
1011
[kallisto]: <https://github.com/pachterlab/kallisto>
11-
[mamba]: <https://github.com/mamba-org/mamba>
1212
[salmon]: <https://github.com/COMBINE-lab/salmon>
1313
[snakemake]: <https://github.com/snakemake/snakemake>
1414
[snakemake-profiles]: <https://snakemake.readthedocs.io/en/stable/executing/cli.html#profiles>
@@ -17,6 +17,7 @@
1717
[zarp]: <https://github.com/zavolanlab/zarp>
1818
[zarp-cli]: <https://github.com/zavolanlab/zarp-cli>
1919
[zarp-cli-issue-tracker]: <https://github.com/zavolanlab/zarp-cli/issues>
20+
[zarp-docs]: <https://zavolanlab.github.io/zarp/>
2021
[zarp-issue-tracker]: <https://github.com/zavolanlab/zarp/issues>
2122
[zarp-qa]: <https://github.com/zavolanlab/zarp/discussions>
2223
[zarp-supplementary]: <https://zenodo.org/records/10797372.

0 commit comments

Comments
 (0)