Skip to content

Commit 5baf5d3

Browse files
committed
Merge branch 'dev' of https://github.com/nf-core/seqinspector into fastqscreen_handles_more_than_1_fastq_file
2 parents 5d9122a + 1574c55 commit 5baf5d3

File tree

37 files changed

+905
-207
lines changed

37 files changed

+905
-207
lines changed

.github/CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# nf-core/seqinspector: Contributing Guidelines
1+
# `nf-core/seqinspector`: Contributing Guidelines
22

33
Hi there!
44
Many thanks for taking an interest in improving nf-core/seqinspector.
@@ -55,23 +55,23 @@ These tests are run both with the latest available version of `Nextflow` and als
5555

5656
:warning: Only in the unlikely and regretful event of a release happening with a bug.
5757

58-
- On your own fork, make a new branch `patch` based on `upstream/master`.
58+
- On your own fork, make a new branch `patch` based on `upstream/main` or `upstream/master`.
5959
- Fix the bug, and bump version (X.Y.Z+1).
60-
- A PR should be made on `master` from patch to directly this particular bug.
60+
- Open a pull-request from `patch` to `main`/`master` with the changes.
6161

6262
## Getting help
6363

6464
For further information/help, please consult the [nf-core/seqinspector documentation](https://nf-co.re/seqinspector/usage) and don't hesitate to get in touch on the nf-core Slack [#seqinspector](https://nfcore.slack.com/channels/seqinspector) channel ([join our Slack here](https://nf-co.re/join/slack)).
6565

6666
## Pipeline contribution conventions
6767

68-
To make the nf-core/seqinspector code and processing logic more understandable for new contributors and to ensure quality, we semi-standardise the way the code and other contributions are written.
68+
To make the `nf-core/seqinspector` code and processing logic more understandable for new contributors and to ensure quality, we semi-standardise the way the code and other contributions are written.
6969

7070
### Adding a new step
7171

7272
If you wish to contribute a new step, please use the following coding standards:
7373

74-
1. Define the corresponding input channel into your new process from the expected previous process channel
74+
1. Define the corresponding input channel into your new process from the expected previous process channel.
7575
2. Write the process block (see below).
7676
3. Define the output channel if needed (see below).
7777
4. Add any new parameters to `nextflow.config` with a default (see below).
@@ -90,7 +90,7 @@ If you wish to contribute a new step, please use the following coding standards:
9090

9191
### Default values
9292

93-
Parameters should be initialised / defined with default values in `nextflow.config` under the `params` scope.
93+
Parameters should be initialised / defined with default values within the `params` scope in `nextflow.config`.
9494

9595
Once there, use `nf-core pipelines schema build` to add to `nextflow_schema.json`.
9696

.github/workflows/awsfulltest.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
name: nf-core AWS full size tests
2-
# This workflow is triggered on PRs opened against the master branch.
2+
# This workflow is triggered on PRs opened against the main/master branch.
33
# It can be additionally triggered manually with GitHub actions workflow dispatch button.
44
# It runs the -profile 'test_full' on AWS batch
55

66
on:
77
pull_request:
88
branches:
9+
- main
910
- master
1011
workflow_dispatch:
1112
pull_request_review:
@@ -18,18 +19,30 @@ jobs:
1819
if: github.repository == 'nf-core/seqinspector' && github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'master' || github.event_name == 'workflow_dispatch'
1920
runs-on: ubuntu-latest
2021
steps:
21-
- uses: octokit/[email protected]
22+
- name: Get PR reviews
23+
uses: octokit/[email protected]
24+
if: github.event_name != 'workflow_dispatch'
2225
id: check_approvals
26+
continue-on-error: true
2327
with:
24-
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews
28+
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews?per_page=100
2529
env:
2630
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27-
- id: test_variables
31+
32+
- name: Check for approvals
33+
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
34+
run: |
35+
echo "No review approvals found. At least 2 approvals are required to run this action automatically."
36+
exit 1
37+
38+
- name: Check for enough approvals (>=2)
39+
id: test_variables
2840
if: github.event_name != 'workflow_dispatch'
2941
run: |
3042
JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}'
3143
CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length')
3244
test $CURRENT_APPROVALS_COUNT -ge 2 || exit 1 # At least 2 approvals are required
45+
3346
- name: Launch workflow via Seqera Platform
3447
uses: seqeralabs/action-tower-launch@v2
3548
# TODO nf-core: You can customise AWS full pipeline tests as required

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
profile: "singularity"
4646
steps:
4747
- name: Check out pipeline code
48-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
48+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
4949

5050
- name: Set up Nextflow
5151
uses: nf-core/setup-nextflow@v2

.github/workflows/download_pipeline.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Test successful pipeline download with 'nf-core pipelines download'
22

33
# Run the workflow when:
44
# - dispatched manually
5-
# - when a PR is opened or reopened to master branch
5+
# - when a PR is opened or reopened to main/master branch
66
# - the head branch of the pull request is updated, i.e. if fixes for a release are pushed last minute to dev.
77
on:
88
workflow_dispatch:
@@ -17,9 +17,11 @@ on:
1717
- edited
1818
- synchronize
1919
branches:
20+
- main
2021
- master
2122
pull_request_target:
2223
branches:
24+
- main
2325
- master
2426

2527
env:
@@ -35,7 +37,7 @@ jobs:
3537
- name: Disk space cleanup
3638
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
3739

38-
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
40+
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
3941
with:
4042
python-version: "3.12"
4143
architecture: "x64"
@@ -69,7 +71,7 @@ jobs:
6971
--outdir ./${{ env.REPOTITLE_LOWERCASE }} \
7072
--compress "none" \
7173
--container-system 'singularity' \
72-
--container-library "quay.io" -l "docker.io" -l "community.wave.seqera.io" \
74+
--container-library "quay.io" -l "docker.io" -l "community.wave.seqera.io/library/" \
7375
--container-cache-utilisation 'amend' \
7476
--download-configuration 'yes'
7577

.github/workflows/fix-linting.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
# Use the @nf-core-bot token to check out so we can push later
16-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
16+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1717
with:
1818
token: ${{ secrets.nf_core_bot_auth_token }}
1919

@@ -32,7 +32,7 @@ jobs:
3232
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}
3333

3434
# Install and run pre-commit
35-
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
35+
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
3636
with:
3737
python-version: "3.12"
3838

.github/workflows/release-announcements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: ubuntu-latest
3232

3333
steps:
34-
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
34+
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
3535
with:
3636
python-version: "3.10"
3737
- name: Install dependencies

.github/workflows/template_version_comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Check out pipeline code
12-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
12+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1313
with:
1414
ref: ${{ github.event.pull_request.head.sha }}
1515

.gitpod.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,5 @@ tasks:
66
nextflow self-update
77
88
vscode:
9-
extensions: # based on nf-core.nf-core-extensionpack
10-
#- esbenp.prettier-vscode # Markdown/CommonMark linting and style checking for Visual Studio Code
11-
- EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files
12-
- Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar
13-
- mechatroner.rainbow-csv # Highlight columns in csv files in different colors
14-
- nextflow.nextflow # Nextflow syntax highlighting
15-
- oderwat.indent-rainbow # Highlight indentation level
16-
- streetsidesoftware.code-spell-checker # Spelling checker for source code
17-
- charliermarsh.ruff # Code linter Ruff
9+
extensions:
10+
- nf-core.nf-core-extensionpack # https://github.com/nf-core/vscode-extensionpack

.nf-core.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
bump_version: null
21
lint:
32
files_unchanged:
43
- .github/CONTRIBUTING.md
5-
nf_core_version: 3.0.2
6-
org_path: null
4+
nf_core_version: 3.1.0
75
repository_type: pipeline
86
template:
97
author: Adrien Coulier
@@ -13,6 +11,4 @@ template:
1311
name: seqinspector
1412
org: nf-core
1513
outdir: .
16-
skip_features: null
1714
version: 1.0dev
18-
update: null

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"markdown.styles": ["public/vscode_markdown.css"]
3+
}

0 commit comments

Comments
 (0)