Skip to content
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

Release PR 1.5.0 #242

Merged
merged 300 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
300 commits
Select commit Hold shift + click to select a range
06240de
Fixed editorconfig issues
nschcolnicov Jul 17, 2024
6099e0e
feat: update bcl_demultiplex subworkflow
k1sauce Jul 17, 2024
ab786a8
test: update snaps for new versions
Jul 18, 2024
0d91126
fix schema format path
atrigila Jul 18, 2024
52a1b14
Merge pull request #205 from atrigila/fix_path_schema
atrigila Jul 18, 2024
605f9a4
Updated main.nf.test and snap
Jul 19, 2024
dca93a2
Merge branch 'add_demultiplexing_subworkflow_10x' of https://github.c…
Jul 19, 2024
174bd3d
update changelog
atrigila Jul 22, 2024
574a256
Merge pull request #206 from atrigila/test_uncompress
atrigila Jul 22, 2024
412efdf
Added CI test for mkfastq:
Jul 22, 2024
1ab96c0
Pulled from dev
Jul 22, 2024
04bd37b
Installed mkfastq from modules for CI test
nschcolnicov Jul 22, 2024
b76b664
Re-added removed test profile during merge, updated mkfastq test reso…
nschcolnicov Jul 22, 2024
5d24e0b
add checkqc module
atrigila Jul 23, 2024
a4db7ef
Added adapter removal
Jul 23, 2024
89d8ced
Updated conditional statement and nextflow_schema
Jul 23, 2024
4813c51
Updated snaps and changelog
Jul 23, 2024
e34c4c5
Ran pre-commun
nschcolnicov Jul 23, 2024
42928d5
add config checkqc
atrigila Jul 23, 2024
ace3efa
create temp dir for testing checkqc
atrigila Jul 23, 2024
18c9671
add checkqc config
atrigila Jul 23, 2024
787744e
Updated CI test and mkfastq nf-test and snap
nschcolnicov Jul 23, 2024
885e867
Apply suggestions from code review
nschcolnicov Jul 24, 2024
4f6a841
Merge pull request #208 from nschcolnicov/remove_trimming
nschcolnicov Jul 24, 2024
6026d78
add checkqc module config
atrigila Jul 24, 2024
59941e6
add condition to run checkqc
atrigila Jul 24, 2024
e07ed2b
add checkqc config as param
atrigila Jul 24, 2024
b981ca0
update checkqc test
atrigila Jul 24, 2024
0c1d9f9
update modules config
atrigila Jul 24, 2024
6d16ffb
skip checkqc if required
atrigila Jul 24, 2024
f27d7b5
move default checkqc config to test_checkqc
atrigila Jul 24, 2024
7e5e6e4
test
atrigila Jul 24, 2024
ba9329d
polish checkqc test config
atrigila Jul 24, 2024
a761876
Merge branch 'dev' of https://github.com/nf-core/demultiplex into add…
nschcolnicov Jul 25, 2024
a747c66
Pulled from dev and removed mkfastq from CI tests
nschcolnicov Jul 25, 2024
cccaae2
Merge pull request #202 from nschcolnicov/add_demultiplexing_subworkf…
nschcolnicov Jul 25, 2024
55b076d
Add additional arguments to mkfastq to test CI
Jul 25, 2024
dd01c48
Add mkfastq to CI tests
Jul 25, 2024
7471444
Update output.md:
Jul 25, 2024
98b17fd
Synced mkfastq with modules repo, updated changelog
nschcolnicov Jul 25, 2024
39a26dc
code refactoring and re-structure
atrigila Jul 25, 2024
eb4ef29
Merge pull request #212 from nschcolnicov/fix_ci_mkfastq
nschcolnicov Jul 25, 2024
25a7b1e
Merge branch 'dev' of https://github.com/nf-core/demultiplex into add…
nschcolnicov Jul 25, 2024
5a5a167
Added section dedicated to trimming
nschcolnicov Jul 25, 2024
e3fac0b
remove resources limit
atrigila Jul 25, 2024
16a2e5c
remove symlinks from copy
atrigila Jul 25, 2024
4871f5b
create subw similar to bcl_demux
atrigila Jul 25, 2024
8a568ef
export checkqc dir from bcl2fastq
atrigila Jul 25, 2024
9038b4c
add subw to main workflow
atrigila Jul 25, 2024
84cef83
fix typo
atrigila Jul 25, 2024
865718a
run only if demultiplexer is bcl2fastq
atrigila Jul 25, 2024
e64dd2e
back to original structure
atrigila Jul 25, 2024
319913a
update docs
atrigila Jul 25, 2024
67757cc
Merge branch 'dev' into add_checkqc_2
atrigila Jul 25, 2024
1914db6
fix linting
atrigila Jul 25, 2024
f995da3
update bcl2fastq
atrigila Jul 25, 2024
837fd2d
update bcl_demultiplex
atrigila Jul 25, 2024
3a46211
fix pre-commit
atrigila Jul 25, 2024
1f5196b
Updated snaps
nschcolnicov Jul 25, 2024
ad02bce
remove unused module
atrigila Jul 25, 2024
e59f538
update changelog
atrigila Jul 25, 2024
35ad4f5
fix precommit
atrigila Jul 25, 2024
d3c20b4
Update docs/usage.md
apeltzer Jul 26, 2024
6b48b80
Merge pull request #213 from nschcolnicov/add_trimming_docs
nschcolnicov Jul 26, 2024
f7c77c3
update checkqc to v4.0.3
atrigila Jul 29, 2024
5834ea6
update tests to skip checkqc in bcl2fastq
atrigila Jul 29, 2024
fefa56e
apply suggestions from code review
atrigila Jul 29, 2024
44f1232
update snapshot
atrigila Jul 29, 2024
38d3d0d
Merge pull request #210 from atrigila/add_checkqc_2
atrigila Jul 29, 2024
0d6ffa2
Remove adapter lines entirely from samplesheet
grst Jul 30, 2024
0681a72
Update demultiplex.nf
grst Jul 30, 2024
7c4e9ce
Update demultiplex.nf
grst Jul 30, 2024
c6bd23a
Use file()
grst Jul 30, 2024
b4f3a48
Revert "Use file()"
grst Jul 30, 2024
38226b2
simplify regex
grst Jul 30, 2024
48bd769
Be more specific in regex
grst Jul 30, 2024
49d4454
Updated CHANGELOG and pulled from dev
nschcolnicov Jul 30, 2024
af0d810
Fixed issue with CHANGELOG
nschcolnicov Jul 30, 2024
61a376b
Remove unused variable
grst Jul 30, 2024
751e7b9
Merge pull request #204 from k1sauce/bcl_demultiplex
nschcolnicov Jul 30, 2024
f0eabc3
add checkqc multiqc files
atrigila Jul 30, 2024
6e23aef
test separate by reads
atrigila Jul 30, 2024
5a8cd52
Updated method for removing adapters
nschcolnicov Jul 30, 2024
a07924a
Pulled from dev
nschcolnicov Jul 30, 2024
8806987
update multiqc config
atrigila Jul 30, 2024
c7ba319
run all modules
atrigila Jul 30, 2024
62463f8
update changelog
atrigila Jul 30, 2024
4d917f6
Merge branch 'dev' into multiqc_fastq
atrigila Jul 30, 2024
65c7b79
Merge pull request #216 from atrigila/multiqc_fastq
apeltzer Jul 31, 2024
c04ad38
Merge branch 'dev' into grst-patch-2
apeltzer Jul 31, 2024
2e954ef
Added test_pe profile
nschcolnicov Jul 31, 2024
3f96a60
update untar module
atrigila Jul 31, 2024
2286e4c
update dumpsoftwareversions module
atrigila Jul 31, 2024
d5bb4ed
update fastqc module
atrigila Jul 31, 2024
3aeba33
update fastqc module
atrigila Jul 31, 2024
b34cc23
update fqtk module
atrigila Jul 31, 2024
0abecc6
update fastp module
atrigila Jul 31, 2024
69dec71
update bases2fastq
atrigila Jul 31, 2024
328dba4
update modules json
atrigila Jul 31, 2024
c459f47
update multiqc module
atrigila Jul 31, 2024
af00665
update md5sum module
atrigila Jul 31, 2024
6aa5f08
Merge pull request #214 from nf-core/grst-patch-2
apeltzer Jul 31, 2024
25be131
update snapshots
atrigila Jul 31, 2024
f86230d
update mkfastq snapshot
atrigila Aug 1, 2024
b13f826
update sgdemux snapshot
atrigila Aug 1, 2024
11df372
uncomment dumps
atrigila Aug 1, 2024
da48bfd
add other modules to multiqc
atrigila Aug 1, 2024
2d25f63
update bcl2fastq test
atrigila Aug 1, 2024
156021d
update bclconvert test
atrigila Aug 1, 2024
581ad2a
Samplesheet 2 outputdir
Aug 1, 2024
9dba330
Updated changelog with PR number
Aug 1, 2024
5432099
update sgdemux snapshot
atrigila Aug 1, 2024
c00117a
update bases2fastq test
atrigila Aug 1, 2024
8450c4f
Merge dev
atrigila Aug 1, 2024
634b2a0
update test_pe test
atrigila Aug 1, 2024
81ace0b
Merge branch 'dev' into template_update
atrigila Aug 1, 2024
0070b64
update changelog
atrigila Aug 1, 2024
ea6bfb8
Pulled from dev
Aug 1, 2024
1bba298
Updated modules and subworkflows to latest version
Aug 1, 2024
7697ba1
Merge pull request #217 from atrigila/template_update
apeltzer Aug 1, 2024
cd150b9
Merge branch 'dev' into samplesheed_to_outputdir
apeltzer Aug 1, 2024
7a26aee
Merge pull request #219 from nschcolnicov/samplesheed_to_outputdir
apeltzer Aug 1, 2024
ad51e53
Added test profile and CI test, minor fixes
Aug 1, 2024
f253dd0
Updated docs, and changelog
Aug 1, 2024
3252798
add missing params to schema
atrigila Aug 2, 2024
99d14fb
update changelog
atrigila Aug 2, 2024
48c2b7f
update docs
atrigila Aug 2, 2024
d3669f4
Minor changes & Updated test profile
Aug 2, 2024
712ea76
Merge pull request #221 from atrigila/nf_validation
atrigila Aug 2, 2024
5901da5
Pulled from dev
Aug 2, 2024
53e53fb
Ran pre-commit
Aug 2, 2024
b380c96
Fixed nf-tests:
Aug 2, 2024
f5d737b
Fixed bast2fastq nftest:
Aug 2, 2024
384d38e
Updated schema
Aug 5, 2024
35d98d1
Updated nextflow.config
Aug 5, 2024
746f1a8
Updated kraken snap
Aug 5, 2024
01187bf
update modules
atrigila Aug 5, 2024
b8f89c0
Fixed issues for multi-lane samples, added multi-lane test profile
Aug 5, 2024
10f28af
Merge branch 'add_kraken_step_aratz' of https://github.com/nschcolnic…
Aug 5, 2024
569cffe
Pulled from kraken branch, updated CHANGELOG, and input for new test …
Aug 5, 2024
6b86df5
Fixed pre-commit issues
Aug 5, 2024
3007873
Fixed kraken test, improved join
Aug 5, 2024
c06a4fc
Fix merge issues
Aug 5, 2024
a092e17
pre-commit
Aug 5, 2024
d394c87
change output pattern
atrigila Aug 6, 2024
c40bce7
remove reports and stats from nf-test
atrigila Aug 6, 2024
dbdbc91
update snapshots
atrigila Aug 6, 2024
2f3a276
update snapshot
atrigila Aug 6, 2024
4ef6f6c
update nf-test version
atrigila Aug 6, 2024
52e27e1
remove commas
atrigila Aug 6, 2024
d6344f0
use conda to install nf-test
nvnieuwk Aug 6, 2024
27726a0
typo
nvnieuwk Aug 6, 2024
b2af8e2
Use conda nf-test
nvnieuwk Aug 6, 2024
4506dea
change ci to latest-stable
atrigila Aug 6, 2024
cd054c4
update snapshots
atrigila Aug 6, 2024
af9862f
Merge pull request #224 from atrigila/issue_106
atrigila Aug 6, 2024
97c8ffb
update directory structure
atrigila Aug 7, 2024
14b0bb0
update changelog
atrigila Aug 7, 2024
9938c0a
Merge pull request #229 from atrigila/fix_dir_structure
nschcolnicov Aug 7, 2024
b2dffb8
Pulled from dev
Aug 7, 2024
1293d6f
Updated version of bcl2fastq snap
Aug 7, 2024
79637ae
Merge pull request #220 from nschcolnicov/add_kraken_step_aratz
nschcolnicov Aug 7, 2024
7d71b79
Pulled from dev
Aug 7, 2024
9ce19f7
Merge branch 'add_sample_two_lanes' of https://github.com/nschcolnico…
Aug 7, 2024
7aee468
Merge pull request #225 from nschcolnicov/add_sample_two_lanes
nschcolnicov Aug 7, 2024
2207443
update checkqc
atrigila Aug 8, 2024
4fd0dc4
fix demux name error
atrigila Aug 8, 2024
808014b
update changelog
atrigila Aug 8, 2024
468883b
emit outputs in checkqc report directory
atrigila Aug 8, 2024
094ca56
Started adding samplesheet validator
Aug 8, 2024
5030413
Fixed module execution
Aug 8, 2024
e3d6e94
Merge pull request #231 from atrigila/update_checkqc
atrigila Aug 8, 2024
0f38381
Updated docs, schema and module
Aug 8, 2024
be62c8f
Remove testing line
Aug 8, 2024
e502194
Ran precommit, updated changelog
nschcolnicov Aug 8, 2024
51e29f1
Merge branch 'dev' of https://github.com/nf-core/demultiplex into sam…
nschcolnicov Aug 8, 2024
f7769e9
Reverted change to default kraken_db:
Aug 8, 2024
a3153bf
Updated container to wave
Aug 8, 2024
3b5f83e
Fixed tests
Aug 8, 2024
de35498
fixing bcl2fastq test
nschcolnicov Aug 8, 2024
f77f1bd
Fixed linting
nschcolnicov Aug 8, 2024
a534f20
build: Add environment.yml
edmundmiller Aug 8, 2024
62953f3
ci: Try using new CI from official nf-test tutorial
edmundmiller Aug 6, 2024
a368bfe
ci: Only test pipeline and subworkflows for now
edmundmiller Aug 6, 2024
3fbf3bb
style: Make it more readable
edmundmiller Aug 6, 2024
4f4cbd5
fixup! subworkflows => workflows
edmundmiller Aug 6, 2024
6a68043
ci: Actually use the nf-test version
edmundmiller Aug 6, 2024
af488b0
ci: Define total shards to avoid version issues
edmundmiller Aug 6, 2024
3a03356
ci: Use setup-nf-test
edmundmiller Aug 9, 2024
90bdd58
Apply suggestions from code review
apeltzer Aug 9, 2024
8700822
Added versions.yml
Aug 9, 2024
896d02b
Updated kraken snap to work with CI
nschcolnicov Aug 9, 2024
1ea4a7f
Added resource definitions to nf-tests
nschcolnicov Aug 9, 2024
6f3abdb
test: Add explicit config
edmundmiller Aug 9, 2024
ebcbe53
add fastq samplesheet generation
atrigila Aug 9, 2024
7f640c9
update tests
atrigila Aug 9, 2024
958913c
update docs
atrigila Aug 9, 2024
60c02f4
update changelog
atrigila Aug 9, 2024
be3a3b6
update nf-tests
atrigila Aug 9, 2024
2e28aa4
update kraken snapshot
atrigila Aug 9, 2024
b327a84
improve docs section
atrigila Aug 9, 2024
4e63010
docs: rearrange sections for clarity
atrigila Aug 9, 2024
e84f14d
Associated configs to nftests
nschcolnicov Aug 9, 2024
8587df1
Updated citations and readme, renamed module
Aug 9, 2024
bb0a4ef
add default samplesheet
atrigila Aug 9, 2024
16e6b1a
add nf-test to samplesheet generation
atrigila Aug 9, 2024
8353819
Merge pull request #236 from atrigila/add_samplesheet_generation
apeltzer Aug 10, 2024
c95aa4b
Merge branch 'dev' into samplesheet_validator
apeltzer Aug 10, 2024
119e8bc
Merge pull request #234 from nschcolnicov/samplesheet_validator
apeltzer Aug 12, 2024
b50e71d
Fix lint
apeltzer Aug 12, 2024
08460b2
Add versions to csv2tsv module
apeltzer Aug 12, 2024
ee95c5d
Update test to include sed version
apeltzer Aug 12, 2024
ec132a3
PR comments
nschcolnicov Aug 12, 2024
892b9d8
Merge pull request #238 from nf-core/samplesheet-validator
apeltzer Aug 12, 2024
c44e7c8
remove publishdir from config
atrigila Aug 12, 2024
99cee25
Added cache=false to multiqc:
Aug 12, 2024
486c659
Merge pull request #239 from nschcolnicov/multiqc
apeltzer Aug 12, 2024
41a3481
Updated samshee
nschcolnicov Aug 12, 2024
79f0bba
Update conf/modules.config
nschcolnicov Aug 12, 2024
d51c4d4
Revert "remove publishdir from config"
atrigila Aug 12, 2024
761d273
update nf-tests with profile
atrigila Aug 12, 2024
d69dbbc
fix bclconvert test
atrigila Aug 12, 2024
ab49b06
renamed test workflows for better CI traceability
atrigila Aug 12, 2024
92e7dd0
Updated snap for CI
nschcolnicov Aug 12, 2024
89dc4ee
Merge branch 'samshee_improvements' of https://github.com/nf-core/dem…
nschcolnicov Aug 12, 2024
2c9a8eb
change config for profile
atrigila Aug 12, 2024
da4c627
Merge branch 'dev' into fresh-ci
atrigila Aug 12, 2024
1b72fbb
remove redundant params
atrigila Aug 12, 2024
0381e51
Merge pull request #227 from nf-core/fresh-ci
atrigila Aug 12, 2024
0df2f24
Update conf/modules.config
apeltzer Aug 12, 2024
f92dfec
Update skip_tools.nf.test.snap
apeltzer Aug 12, 2024
9bb0b6b
Bumped tests to nf-test 0.9.0 everywhere
apeltzer Aug 12, 2024
9441ff0
Merge branch 'dev' of https://github.com/nf-core/demultiplex into sam…
nschcolnicov Aug 12, 2024
62f9850
Merge branch 'samshee_improvements' of https://github.com/nf-core/dem…
apeltzer Aug 12, 2024
8fb01a8
Update version of skip nftest
nschcolnicov Aug 12, 2024
ec12969
Updated nftest version
nschcolnicov Aug 12, 2024
b25ae5f
Merge pull request #240 from nf-core/samshee_improvements
apeltzer Aug 12, 2024
c31a90d
Bump Release PR
apeltzer Aug 12, 2024
d4683bd
Added Gregor/myself [skip ci]
apeltzer Aug 12, 2024
5d118e5
Typo
apeltzer Aug 12, 2024
073f2a5
Merge pull request #241 from nf-core/bump-1.5.0
apeltzer Aug 12, 2024
f2dc294
Update two modules
apeltzer Aug 13, 2024
db045f0
Bump to use nf-schema
apeltzer Aug 13, 2024
1136c72
Use the latest version already
apeltzer Aug 13, 2024
4291886
Lets stay with nf-validation for now
apeltzer Aug 13, 2024
f6c31b8
Merge pull request #245 from nf-core/fix-utils
apeltzer Aug 13, 2024
c105ec5
Removed workflow testing
nschcolnicov Aug 13, 2024
ee35363
Merge pull request #247 from nf-core/remove_workflow_ci_testing
apeltzer Aug 13, 2024
b48fba9
Removed customdumpsoftwareversions and updated README.md
nschcolnicov Aug 13, 2024
7b37e90
Merge pull request #248 from nf-core/release_pr_comments
apeltzer Aug 13, 2024
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
10 changes: 1 addition & 9 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,7 @@
"vscode": {
// Set *default* container specific settings.json values on container create.
"settings": {
"python.defaultInterpreterPath": "/opt/conda/bin/python",
"python.linting.enabled": true,
"python.linting.pylintEnabled": true,
"python.formatting.autopep8Path": "/opt/conda/bin/autopep8",
"python.formatting.yapfPath": "/opt/conda/bin/yapf",
"python.linting.flake8Path": "/opt/conda/bin/flake8",
"python.linting.pycodestylePath": "/opt/conda/bin/pycodestyle",
"python.linting.pydocstylePath": "/opt/conda/bin/pydocstyle",
"python.linting.pylintPath": "/opt/conda/bin/pylint"
"python.defaultInterpreterPath": "/opt/conda/bin/python"
},

// Add the IDs of extensions you want installed when the container is created.
Expand Down
15 changes: 8 additions & 7 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@ end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset
[/subworkflows/nf-core/**]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset

[/assets/email*]
indent_size = unset

# ignore Readme
[README.md]
indent_style = unset

# ignore python
[*.{py}]
# ignore python and markdown
[*.{py,md}]
indent_style = unset
14 changes: 8 additions & 6 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ Please use the pre-filled template to save time.
However, don't be put off by this template - other more general issues and suggestions are welcome!
Contributions to the code are even more welcome ;)

:::info
If you need help using or modifying nf-core/demultiplex then the best place to ask is on the nf-core Slack [#demultiplex](https://nfcore.slack.com/channels/demultiplex) channel ([join our Slack here](https://nf-co.re/join/slack)).
:::
> [!NOTE]
> If you need help using or modifying nf-core/demultiplex then the best place to ask is on the nf-core Slack [#demultiplex](https://nfcore.slack.com/channels/demultiplex) channel ([join our Slack here](https://nf-co.re/join/slack)).

## Contribution workflow

Expand All @@ -27,8 +26,11 @@ If you're not used to this workflow with git, you can start with some [docs from

## Tests

You can optionally test your changes by running the pipeline locally. Then it is recommended to use the `debug` profile to
receive warnings about process selectors and other debug info. Example: `nextflow run . -profile debug,test,docker --outdir <OUTDIR>`.
You have the option to test your changes locally by running the pipeline. For receiving warnings about process selectors and other `debug` information, it is recommended to use the debug profile. Execute all the tests with the following command:

```bash
nf-test test --profile debug,test,docker --verbose
```

When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests.
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then.
Expand Down Expand Up @@ -90,7 +92,7 @@ Once there, use `nf-core schema build` to add to `nextflow_schema.json`.

Sensible defaults for process resource requirements (CPUs / memory / time) for a process should be defined in `conf/base.config`. These should generally be specified generic with `withLabel:` selectors so they can be shared across multiple processes/steps of the pipeline. A nf-core standard set of labels that should be followed where possible can be seen in the [nf-core pipeline template](https://github.com/nf-core/tools/blob/master/nf_core/pipeline-template/conf/base.config), which has the default process as a single core-process, and then different levels of multi-core configurations for increasingly large memory requirements defined with standardised labels.

The process resources can be passed on to the tool dynamically within the process with the `${task.cpu}` and `${task.memory}` variables in the `script:` block.
The process resources can be passed on to the tool dynamically within the process with the `${task.cpus}` and `${task.memory}` variables in the `script:` block.

### Naming schemes

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ on:
types: [published]
workflow_dispatch:
jobs:
run-tower:
run-platform:
name: Run AWS full tests
if: github.repository == 'nf-core/demultiplex'
runs-on: ubuntu-latest
steps:
- name: Launch workflow via tower
- name: Launch workflow via Seqera Platform
uses: seqeralabs/action-tower-launch@v2
# TODO nf-core: You can customise AWS full pipeline tests as required
# Add full size test data (but still relatively small datasets for few samples)
Expand All @@ -33,7 +33,7 @@ jobs:

- uses: actions/upload-artifact@v4
with:
name: Tower debug log file
name: Seqera Platform debug log file
path: |
tower_action_*.log
tower_action_*.json
seqera_platform_action_*.log
seqera_platform_action_*.json
12 changes: 6 additions & 6 deletions .github/workflows/awstest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ name: nf-core AWS test
on:
workflow_dispatch:
jobs:
run-tower:
run-platform:
name: Run AWS tests
if: github.repository == 'nf-core/demultiplex'
runs-on: ubuntu-latest
steps:
# Launch workflow using Tower CLI tool action
- name: Launch workflow via tower
# Launch workflow using Seqera Platform CLI tool action
- name: Launch workflow via Seqera Platform
uses: seqeralabs/action-tower-launch@v2
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
Expand All @@ -27,7 +27,7 @@ jobs:

- uses: actions/upload-artifact@v4
with:
name: Tower debug log file
name: Seqera Platform debug log file
path: |
tower_action_*.log
tower_action_*.json
seqera_platform_action_*.log
seqera_platform_action_*.json
2 changes: 1 addition & 1 deletion .github/workflows/branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
- name: Post PR comment
if: failure()
uses: mshick/add-pr-comment@v2
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2
with:
message: |
## This PR is against the `master` branch :x:
Expand Down
56 changes: 33 additions & 23 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ on:

env:
NXF_ANSI_LOG: false
CAPSULE_LOG: none
NFTEST_VER: "0.8.2"
NFT_VER: "0.9.0"
NFT_WORKDIR: "~"
NFT_DIFF: "pdiff"
NFT_DIFF_ARGS: "--line-numbers --expand-tabs=2"

concurrency:
group: "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}"
Expand All @@ -27,9 +29,9 @@ jobs:
- id: nxf_versions
run: |
if [[ "${{ github.event_name }}" == "pull_request" && "${{ github.base_ref }}" == "dev" && "${{ matrix.NXF_VER }}" != "latest-everything" ]]; then
echo matrix='["latest-everything"]' | tee -a $GITHUB_OUTPUT
echo matrix='["latest-stable"]' | tee -a $GITHUB_OUTPUT
else
echo matrix='["latest-everything", "23.04.0"]' | tee -a $GITHUB_OUTPUT
echo matrix='["latest-stable", "23.04.0"]' | tee -a $GITHUB_OUTPUT
fi

test:
Expand All @@ -39,35 +41,43 @@ jobs:
strategy:
fail-fast: false
matrix:
shard: [1, 2, 3, 4, 5, 6]
NXF_VER: ${{ fromJson(needs.define_nxf_versions.outputs.matrix) }}
profile:
- docker
profile: ["docker"]
env:
SHARDS: "6"
steps:
- name: Check out pipeline code
uses: actions/checkout@v4
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
with:
fetch-depth: 0

# Install Nextflow
- name: Install Nextflow
uses: nf-core/setup-nextflow@v1
- uses: actions/setup-python@v4
with:
version: "${{ matrix.NXF_VER }}"
python-version: "3.11"
architecture: "x64"

# Install nf-test
- name: Install nf-test
- name: Install pdiff to see diff between nf-test snapshots
run: |
wget -qO- https://code.askimed.com/install/nf-test | bash -s $NFTEST_VER
sudo mv nf-test /usr/local/bin/
python -m pip install --upgrade pip
pip install pdiff

- uses: nf-core/setup-nextflow@v2
with:
version: "${{ matrix.NXF_VER }}"

# Run nf-test
- name: Run nf-test
run: nf-test test tests/pipeline/ --profile=test,${{ matrix.profile }} --junitxml=test.xml
- uses: nf-core/setup-nf-test@v1
with:
version: ${{ env.NFT_VER }}

# If the test fails, output the software_versions.yml using the 'batcat' utility
- name: Output log on failure
if: failure()
- name: Run Tests (Shard ${{ matrix.shard }}/${{ env.SHARDS }})
run: |
sudo apt install bat > /dev/null
batcat --decorations=always --color=always .nf-test/tests/*/output/pipeline_info/software_versions.yml
nf-test test \
--ci \
--shard ${{ matrix.shard }}/${{ env.SHARDS }} \
--changed-since HEAD^ \
--profile "+${{ matrix.profile }}" \
--filter pipeline

- name: Publish Test Report
uses: mikepenz/action-junit-report@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clean-up.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v9
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
with:
stale-issue-message: "This issue has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor. Remove stale label or add a comment otherwise this issue will be closed in 20 days."
stale-pr-message: "This PR has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor. Remove stale label or add a comment if it is still useful."
Expand Down
26 changes: 19 additions & 7 deletions .github/workflows/download_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,16 @@ name: Test successful pipeline download with 'nf-core download'
# - the head branch of the pull request is updated, i.e. if fixes for a release are pushed last minute to dev.
on:
workflow_dispatch:
inputs:
testbranch:
description: "The specific branch you wish to utilize for the test execution of nf-core download."
required: true
default: "dev"
pull_request:
types:
- opened
- edited
- synchronize
branches:
- master
pull_request_target:
Expand All @@ -23,13 +30,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Nextflow
uses: nf-core/setup-nextflow@v1
uses: nf-core/setup-nextflow@v2

- uses: actions/setup-python@v5
- name: Disk space cleanup
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1

- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
with:
python-version: "3.11"
python-version: "3.12"
architecture: "x64"
- uses: eWaterCycle/setup-singularity@v7
- uses: eWaterCycle/setup-singularity@931d4e31109e875b13309ae1d07c70ca8fbc8537 # v7
with:
singularity-version: 3.8.3

Expand All @@ -42,13 +52,13 @@ jobs:
run: |
echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV}
echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> ${GITHUB_ENV}
echo "REPO_BRANCH=${GITHUB_REF#refs/heads/}" >> ${GITHUB_ENV}
echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> ${GITHUB_ENV}

- name: Download the pipeline
env:
NXF_SINGULARITY_CACHEDIR: ./
run: |
nf-core download ${{ env.REPO_LOWERCASE }} \
nf-core download ${{ env.REPO_LOWERCASE }} \
--revision ${{ env.REPO_BRANCH }} \
--outdir ./${{ env.REPOTITLE_LOWERCASE }} \
--compress "none" \
Expand All @@ -60,7 +70,9 @@ jobs:
- name: Inspect download
run: tree ./${{ env.REPOTITLE_LOWERCASE }}

- name: Run the downloaded pipeline
- name: Run the downloaded pipeline (stub)
id: stub_run_pipeline
continue-on-error: true
env:
NXF_SINGULARITY_CACHEDIR: ./
NXF_SINGULARITY_HOME_MOUNT: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/fix-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
# Use the @nf-core-bot token to check out so we can push later
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
with:
token: ${{ secrets.nf_core_bot_auth_token }}

Expand All @@ -32,9 +32,9 @@ jobs:
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}

# Install and run pre-commit
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
with:
python-version: 3.11
python-version: "3.12"

- name: Install pre-commit
run: pip install pre-commit
Expand Down
21 changes: 10 additions & 11 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- name: Set up Python 3.11
uses: actions/setup-python@v5
- name: Set up Python 3.12
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
with:
python-version: 3.11
cache: "pip"
python-version: "3.12"

- name: Install pre-commit
run: pip install pre-commit
Expand All @@ -32,20 +31,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out pipeline code
uses: actions/checkout@v4
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- name: Install Nextflow
uses: nf-core/setup-nextflow@v1
uses: nf-core/setup-nextflow@v2

- uses: actions/setup-python@v5
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
with:
python-version: "3.11"
python-version: "3.12"
architecture: "x64"

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install nf-core==2.12.1
pip install nf-core

- name: Run nf-core lint
env:
Expand All @@ -60,7 +59,7 @@ jobs:

- name: Upload linting log file artifact
if: ${{ always() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
with:
name: linting-logs
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linting_comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download lint results
uses: dawidd6/action-download-artifact@v3
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3
with:
workflow: linting.yml
workflow_conclusion: completed
Expand All @@ -21,7 +21,7 @@ jobs:
run: echo "pr_number=$(cat linting-logs/PR_number.txt)" >> $GITHUB_OUTPUT

- name: Post PR comment
uses: marocchino/sticky-pull-request-comment@v2
uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
number: ${{ steps.pr_number.outputs.pr_number }}
Expand Down
Loading
Loading