Skip to content
Snippets Groups Projects
Commit 35cb5f87 authored by BIOPZ-Gypas Foivos's avatar BIOPZ-Gypas Foivos
Browse files

Merge branch 'buxfix/fix-time-in-snakemake-report' into 'dev'

Bump snakemake version that fixes the reported time in snakemake report.

See merge request !95
parents bb60c716 37910a09
No related branches found
No related tags found
1 merge request!95Bump snakemake version that fixes the reported time in snakemake report.
Pipeline #12912 passed
...@@ -139,7 +139,7 @@ bash tests/test_integration_workflow_with_conda/test.slurm.sh ...@@ -139,7 +139,7 @@ bash tests/test_integration_workflow_with_conda/test.slurm.sh
> **NOTE:** Depending on the configuration of your Slurm installation or if > **NOTE:** Depending on the configuration of your Slurm installation or if
> using a different workload manager, you may need to adapt file `cluster.json` > using a different workload manager, you may need to adapt file `cluster.json`
> and the arguments to options `--config` and `--cores` in the file > and the arguments to options `--config`, `--cores` and `--jobs` in the file
> `test.slurm.sh`, both located in directory `tests/test_integration_workflow`. > `test.slurm.sh`, both located in directory `tests/test_integration_workflow`.
> Consult the manual of your workload manager as well as the section of the > Consult the manual of your workload manager as well as the section of the
> Snakemake manual dealing with [cluster execution]. > Snakemake manual dealing with [cluster execution].
...@@ -210,6 +210,7 @@ your run. ...@@ -210,6 +210,7 @@ your run.
--cluster-config="cluster.json" \ --cluster-config="cluster.json" \
--cluster="sbatch --cpus-per-task={cluster.threads} --mem={cluster.mem} --qos={cluster.queue} --time={cluster.time} --job-name={cluster.name} -o {cluster.out} -p scicore" \ --cluster="sbatch --cpus-per-task={cluster.threads} --mem={cluster.mem} --qos={cluster.queue} --time={cluster.time} --job-name={cluster.name} -o {cluster.out} -p scicore" \
--cores=256 \ --cores=256 \
--jobs=256 \
--printshellcmds \ --printshellcmds \
--rerun-incomplete \ --rerun-incomplete \
--use-singularity \ --use-singularity \
......
...@@ -12,5 +12,4 @@ dependencies: ...@@ -12,5 +12,4 @@ dependencies:
- python=3.7.4 - python=3.7.4
- pip: - pip:
- pandas==1.0.1 - pandas==1.0.1
- snakemake==5.19.2 - snakemake==6.5.5
\ No newline at end of file
...@@ -31,6 +31,7 @@ snakemake \ ...@@ -31,6 +31,7 @@ snakemake \
--cluster-config="../input_files/cluster.json" \ --cluster-config="../input_files/cluster.json" \
--cluster="sbatch --cpus-per-task={cluster.threads} --mem={cluster.mem} --qos={cluster.queue} --time={cluster.time} --job-name={cluster.name} -o {cluster.out} -p scicore" \ --cluster="sbatch --cpus-per-task={cluster.threads} --mem={cluster.mem} --qos={cluster.queue} --time={cluster.time} --job-name={cluster.name} -o {cluster.out} -p scicore" \
--cores=256 \ --cores=256 \
--jobs=256 \
--printshellcmds \ --printshellcmds \
--rerun-incomplete \ --rerun-incomplete \
--use-singularity \ --use-singularity \
......
...@@ -31,6 +31,7 @@ snakemake \ ...@@ -31,6 +31,7 @@ snakemake \
--cluster-config="../input_files/cluster.json" \ --cluster-config="../input_files/cluster.json" \
--cluster="sbatch --cpus-per-task={cluster.threads} --mem={cluster.mem} --qos={cluster.queue} --time={cluster.time} --job-name={cluster.name} -o {cluster.out} -p scicore" \ --cluster="sbatch --cpus-per-task={cluster.threads} --mem={cluster.mem} --qos={cluster.queue} --time={cluster.time} --job-name={cluster.name} -o {cluster.out} -p scicore" \
--cores=256 \ --cores=256 \
--jobs=256 \
--printshellcmds \ --printshellcmds \
--rerun-incomplete \ --rerun-incomplete \
--use-singularity \ --use-singularity \
......
...@@ -31,6 +31,7 @@ snakemake \ ...@@ -31,6 +31,7 @@ snakemake \
--cluster-config="../input_files/cluster.json" \ --cluster-config="../input_files/cluster.json" \
--cluster="sbatch --cpus-per-task={cluster.threads} --mem={cluster.mem} --qos={cluster.queue} --time={cluster.time} --job-name={cluster.name} -o {cluster.out} -p scicore" \ --cluster="sbatch --cpus-per-task={cluster.threads} --mem={cluster.mem} --qos={cluster.queue} --time={cluster.time} --job-name={cluster.name} -o {cluster.out} -p scicore" \
--cores=256 \ --cores=256 \
--jobs=256 \
--printshellcmds \ --printshellcmds \
--rerun-incomplete \ --rerun-incomplete \
--use-conda \ --use-conda \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment