Skip to content

Commit 48fefd2

Browse files
author
LouisLeNezet
committed
Merge branch 'TEMPLATE' into merging-template-updates
2 parents 00d97a5 + bfa7258 commit 48fefd2

File tree

9 files changed

+71
-42
lines changed

9 files changed

+71
-42
lines changed

.editorconfig

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,12 @@ indent_size = unset
3232
[*.{py,md}]
3333
indent_style = unset
3434

35-
[/docs/*.xml*]
36-
indent_style = unset
37-
insert_final_newline = unset
38-
35+
# ignore xml files in docs used by metro maps
3936
[/docs/images/metro/*.xml*]
4037
indent_style = unset
4138
insert_final_newline = unset
4239
end_of_line = unset
40+
41+
# ignore ro-crate metadata files
42+
[**/ro-crate-metadata.json]
43+
insert_final_newline = unset

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ body:
99
1010
- [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting)
1111
- [nf-core/phaseimpute pipeline documentation](https://nf-co.re/phaseimpute/usage)
12-
1312
- type: textarea
1413
id: description
1514
attributes:

.github/workflows/download_pipeline.yml

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@ env:
2828
NXF_ANSI_LOG: false
2929

3030
jobs:
31-
download:
31+
configure:
3232
runs-on: ubuntu-latest
33+
outputs:
34+
REPO_LOWERCASE: ${{ steps.get_repo_properties.outputs.REPO_LOWERCASE }}
35+
REPOTITLE_LOWERCASE: ${{ steps.get_repo_properties.outputs.REPOTITLE_LOWERCASE }}
36+
REPO_BRANCH: ${{ steps.get_repo_properties.outputs.REPO_BRANCH }}
3337
steps:
3438
- name: Install Nextflow
3539
uses: nf-core/setup-nextflow@v2
@@ -53,65 +57,70 @@ jobs:
5357
pip install git+https://github.com/nf-core/tools.git@dev
5458
5559
- name: Get the repository name and current branch set as environment variable
60+
id: get_repo_properties
5661
run: |
57-
echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV}
58-
echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> ${GITHUB_ENV}
59-
echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> ${GITHUB_ENV}
62+
echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> "$GITHUB_OUTPUT"
63+
echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> "$GITHUB_OUTPUT"
64+
echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> "$GITHUB_OUTPUT"
6065
6166
- name: Make a cache directory for the container images
6267
run: |
6368
mkdir -p ./singularity_container_images
6469
70+
download:
71+
runs-on: ubuntu-latest
72+
needs: configure
73+
steps:
6574
- name: Download the pipeline
6675
env:
6776
NXF_SINGULARITY_CACHEDIR: ./singularity_container_images
6877
run: |
69-
nf-core pipelines download ${{ env.REPO_LOWERCASE }} \
70-
--revision ${{ env.REPO_BRANCH }} \
71-
--outdir ./${{ env.REPOTITLE_LOWERCASE }} \
78+
nf-core pipelines download ${{ needs.configure.outputs.REPO_LOWERCASE }} \
79+
--revision ${{ needs.configure.outputs.REPO_BRANCH }} \
80+
--outdir ./${{ needs.configure.outputs.REPOTITLE_LOWERCASE }} \
7281
--compress "none" \
7382
--container-system 'singularity' \
7483
--container-library "quay.io" -l "docker.io" -l "community.wave.seqera.io/library/" \
7584
--container-cache-utilisation 'amend' \
7685
--download-configuration 'yes'
7786
7887
- name: Inspect download
79-
run: tree ./${{ env.REPOTITLE_LOWERCASE }}
88+
run: tree ./${{ needs.configure.outputs.REPOTITLE_LOWERCASE }}
8089

8190
- name: Count the downloaded number of container images
8291
id: count_initial
8392
run: |
8493
image_count=$(ls -1 ./singularity_container_images | wc -l | xargs)
8594
echo "Initial container image count: $image_count"
86-
echo "IMAGE_COUNT_INITIAL=$image_count" >> ${GITHUB_ENV}
95+
echo "IMAGE_COUNT_INITIAL=$image_count" >> "$GITHUB_OUTPUT"
8796
8897
- name: Run the downloaded pipeline (stub)
8998
id: stub_run_pipeline
9099
continue-on-error: true
91100
env:
92101
NXF_SINGULARITY_CACHEDIR: ./singularity_container_images
93102
NXF_SINGULARITY_HOME_MOUNT: true
94-
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results
103+
run: nextflow run ./${{needs.configure.outputs.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ needs.configure.outputs.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results
95104
- name: Run the downloaded pipeline (stub run not supported)
96105
id: run_pipeline
97-
if: ${{ job.steps.stub_run_pipeline.status == failure() }}
106+
if: ${{ steps.stub_run_pipeline.outcome == 'failure' }}
98107
env:
99108
NXF_SINGULARITY_CACHEDIR: ./singularity_container_images
100109
NXF_SINGULARITY_HOME_MOUNT: true
101-
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -profile test,singularity --outdir ./results
110+
run: nextflow run ./${{ needs.configure.outputs.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ needs.configure.outputs.REPO_BRANCH }}) -profile test,singularity --outdir ./results
102111

103112
- name: Count the downloaded number of container images
104113
id: count_afterwards
105114
run: |
106115
image_count=$(ls -1 ./singularity_container_images | wc -l | xargs)
107116
echo "Post-pipeline run container image count: $image_count"
108-
echo "IMAGE_COUNT_AFTER=$image_count" >> ${GITHUB_ENV}
117+
echo "IMAGE_COUNT_AFTER=$image_count" >> "$GITHUB_OUTPUT"
109118
110119
- name: Compare container image counts
111120
run: |
112-
if [ "${{ env.IMAGE_COUNT_INITIAL }}" -ne "${{ env.IMAGE_COUNT_AFTER }}" ]; then
113-
initial_count=${{ env.IMAGE_COUNT_INITIAL }}
114-
final_count=${{ env.IMAGE_COUNT_AFTER }}
121+
if [ "${{ steps.count_initial.outputs.IMAGE_COUNT_INITIAL }}" -ne "${{ steps.count_afterwards.outputs.IMAGE_COUNT_AFTER }}" ]; then
122+
initial_count=${{ steps.count_initial.outputs.IMAGE_COUNT_INITIAL }}
123+
final_count=${{ steps.count_afterwards.outputs.IMAGE_COUNT_AFTER }}
115124
difference=$((final_count - initial_count))
116125
echo "$difference additional container images were \n downloaded at runtime . The pipeline has no support for offline runs!"
117126
tree ./singularity_container_images

.nf-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
nf_core_version: 3.1.0
1+
nf_core_version: 3.1.1
22
repository_type: pipeline
33
template:
44
author: Louis Le Nezet, Anabella Trigila

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ testing/
1010
testing*
1111
*.pyc
1212
bin/
13+
ro-crate-metadata.json

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) Louis Le Nezet, Anabella Trigila
3+
Copyright (c) The nf-core/phaseimpute team
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
</picture>
66
</h1>
77

8-
**Multi-step pipeline dedicated to genetic imputation from simulation to validation**
8+
[![GitHub Actions CI Status](https://github.com/nf-core/phaseimpute/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/phaseimpute/actions/workflows/ci.yml) [![GitHub Actions Linting Status](https://github.com/nf-core/phaseimpute/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/phaseimpute/actions/workflows/linting.yml) [![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/phaseimpute/results) [![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.14329225-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.14329225) [![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)
99

10-
[![GitHub Actions CI Status](https://github.com/nf-core/phaseimpute/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/phaseimpute/actions/workflows/ci.yml)
11-
[![GitHub Actions Linting Status](https://github.com/nf-core/phaseimpute/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/phaseimpute/actions/workflows/linting.yml) [![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/phaseimpute/results) [![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.14329225-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.14329225) [![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)
1210
[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A524.04.2-23aa62.svg)](https://www.nextflow.io/)
1311
[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)
1412
[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)
@@ -50,7 +48,7 @@ For more detailed instructions, please refer to the [usage documentation](https:
5048
## Usage
5149

5250
> [!NOTE]
53-
> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how to set-up Nextflow. Make sure to [test your setup](https://nf-co.re/docs/usage/introduction#how-to-run-a-pipeline) with `-profile test` before running the workflow on actual data.
51+
> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how to set-up Nextflow.Make sure to [test your setup](https://nf-co.re/docs/usage/introduction#how-to-run-a-pipeline) with `-profile test` before running the workflow on actual data.
5452
5553
The primary function of this pipeline is to impute a target dataset based on a phased panel. Begin by preparing a samplesheet with your input data, formatted as follows:
5654

docs/usage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ Several generic profiles are bundled with the pipeline which instruct the pipeli
570570
> [!IMPORTANT]
571571
> We highly recommend the use of Docker or Singularity containers for full pipeline reproducibility, however when this is not possible, Conda is also supported.
572572
573-
The pipeline also dynamically loads configurations from [https://github.com/nf-core/configs](https://github.com/nf-core/configs) when it runs, making multiple config profiles for various institutional clusters available at run time. For more information and to check if your system is suported, please see the [nf-core/configs documentation](https://github.com/nf-core/configs#documentation).
573+
The pipeline also dynamically loads configurations from [https://github.com/nf-core/configs](https://github.com/nf-core/configs) when it runs, making multiple config profiles for various institutional clusters available at run time. For more information and to check if your system is supported, please see the [nf-core/configs documentation](https://github.com/nf-core/configs#documentation).
574574

575575
Note that multiple profiles can be loaded, for example: `-profile test,docker` - the order of arguments is important!
576576
They are loaded in sequence, so later profiles can overwrite earlier profiles.

0 commit comments

Comments
 (0)