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 1.0.0 #7

Open
wants to merge 68 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
4475b7e
Template update for nf-core/tools version 2.11
nf-core-bot Dec 19, 2023
a9012e8
Template update for nf-core/tools version 2.11.1
nf-core-bot Dec 20, 2023
30d36cb
Moved to a more stable version of FORCE
Felix-Kummer Jan 24, 2024
9beb427
Fixed publishDir for visualization processes
Felix-Kummer Jan 24, 2024
d760cc7
Template update for nf-core/tools version 2.12
nf-core-bot Jan 29, 2024
51a4fa5
Template update for nf-core/tools version 2.13
nf-core-bot Feb 20, 2024
9dc069b
Added version number to nf-validation plugin
Felix-Kummer Feb 23, 2024
4790c2d
Template update for nf-core/tools version 2.13.1
nf-core-bot Feb 29, 2024
dd9e3da
Template update for nf-core/tools version 2.14.0
nf-core-bot May 8, 2024
d6e1398
Template update for nf-core/tools version 2.14.1
nf-core-bot May 9, 2024
841399d
Removed unnecessary resource requests in modules.conf in favor of nf-…
Felix-Kummer May 10, 2024
8c1c9d9
fixed docker test failures in certain situations
Felix-Kummer May 16, 2024
6fb5757
Ensured that remaining tests run after a single test failure
Felix-Kummer May 17, 2024
edf0b33
Merge branch 'dev' into nf-core-template-merge-2.14.1
Felix-Kummer May 24, 2024
9b17ae7
Fixed indents in merge scripts
Felix-Kummer May 24, 2024
4ff325a
Merge pull request #6 from nf-core/nf-core-template-merge-2.14.1
Felix-Kummer May 28, 2024
665e862
Added appropriate raster comparisons for trend tif's to test.R
Felix-Kummer May 30, 2024
b4e8152
Increased robustness of test profile against FORCE-related flakiness
Felix-Kummer Jun 28, 2024
f292928
Removed only_tile parameter
Felix-Kummer Jun 28, 2024
52c93c9
Added new options for higher level processing and visualization.
Felix-Kummer Jul 24, 2024
a4d297f
Added test_full profile
Felix-Kummer Jul 31, 2024
b896dda
bumped version to 1.0.0
Felix-Kummer Jul 31, 2024
443ba0a
Implemented minor reviewer requests
Felix-Kummer Aug 7, 2024
3dca391
Added parameters to control publishing behavior for intermediate proc…
Felix-Kummer Aug 8, 2024
a5df347
Added descriptions to custom scripts.
Felix-Kummer Aug 8, 2024
2e208fc
Applied more minor changes requested by the reviewers
Felix-Kummer Aug 21, 2024
e5d4425
Reworked merge scripts
Felix-Kummer Aug 23, 2024
fd29a4b
Added authors and licenses to scripts
Felix-Kummer Aug 23, 2024
e042a1c
Removed unused sensors_level1 parameter
Felix-Kummer Aug 23, 2024
69fd493
Applied one-sentence-per-line-scheme in .md files
Felix-Kummer Aug 28, 2024
17db3ba
Removed unnecessarily ignored parameters in test profile
Felix-Kummer Aug 29, 2024
4a7518b
Improved parameter references in docs
Felix-Kummer Aug 29, 2024
4949334
Replaced retry strategies with error_retry label
Felix-Kummer Sep 6, 2024
d7ba83b
Adopted nf-core pseudo-standard directory structure for local modules
Felix-Kummer Sep 18, 2024
64c909a
Updated nf-core untar module
Felix-Kummer Sep 18, 2024
5e006c0
Enriched schema with patterns for parameters
Felix-Kummer Sep 18, 2024
980347f
Improved output documentation for tss files
Felix-Kummer Sep 18, 2024
e036cb3
Added date format to date parameters
Felix-Kummer Sep 18, 2024
7564dd6
Removed deprecated docker parameter
Felix-Kummer Sep 18, 2024
cd5fb92
Added tags to all modules
Felix-Kummer Sep 19, 2024
f12f0c9
Removed restrictions on FORCE thread numbers and corresponding parameter
Felix-Kummer Sep 26, 2024
7f7805b
Replaced usage of params in modules and subworkflows with channels
Felix-Kummer Sep 26, 2024
fd09671
Added more output channels to the top level workflow
Felix-Kummer Sep 26, 2024
a4d2e7f
Added automatic tarball extraction for input parameters
Felix-Kummer Sep 28, 2024
99ff909
Changed UNTAR container to its default container image
Felix-Kummer Oct 7, 2024
605f154
Changed force-pyramid to process a single file instead of groups of f…
Felix-Kummer Oct 11, 2024
e8731e1
Added missing description in the manifest scope.
Felix-Kummer Oct 14, 2024
ac70e35
Merge branch 'nf-core:dev' into dev
Felix-Kummer Oct 14, 2024
16b4a23
Template update for nf-core/tools version 3.0.2
nf-core-bot Oct 14, 2024
7d32cb3
Merge branch 'dev' into nf-core-template-merge-3.0.2
Felix-Kummer Oct 18, 2024
7e34131
Merge branch 'dev' into nf-core-template-merge-3.0.2
Felix-Kummer Oct 18, 2024
6fe422b
Merge pull request #10 from nf-core/nf-core-template-merge-3.0.2
Felix-Kummer Oct 18, 2024
b6c2e63
Merge remote-tracking branch 'origin/dev' into dev
Felix-Kummer Oct 18, 2024
22166e9
Updated input mimetype in schema
Felix-Kummer Oct 25, 2024
c822ba7
Added missing fields to schema
Felix-Kummer Oct 25, 2024
15e4c1e
Updated changelog
Felix-Kummer Oct 25, 2024
415edb4
Fixed some linter warnings
Felix-Kummer Oct 26, 2024
0585e5e
Replaced for-loops with GNU parallel
Felix-Kummer Oct 28, 2024
bd82d81
Migrated check result modules to nf-test
Felix-Kummer Nov 9, 2024
a8da0e3
Added parameter to disable all output publishing
Felix-Kummer Nov 11, 2024
e67107d
Fixed log output for preprocessing
Felix-Kummer Nov 13, 2024
88ea70f
Added pipeline-level nf-test tests
Felix-Kummer Nov 24, 2024
72996b1
Aligned run command in usage docs with other pipelines
Felix-Kummer Nov 26, 2024
ba1d17f
Updated nf-core workflows and modules
Felix-Kummer Nov 26, 2024
d8be4ef
Fix nf-test entry in .gitignore
Felix-Kummer Nov 26, 2024
3d64227
Fixed wrong pipeline version in usage.md
Felix-Kummer Nov 26, 2024
a651b55
Added concrete boolean values for parameters in usage.md
Felix-Kummer Nov 26, 2024
caee766
Merge pull request #9 from CRC-FONDA/dev
Felix-Kummer Nov 26, 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
11 changes: 10 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +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 python and markdown
[*.{py,md}]
indent_style = unset
25 changes: 15 additions & 10 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/rangeland then the best place to ask is on the nf-core Slack [#rangeland](https://nfcore.slack.com/channels/rangeland) channel ([join our Slack here](https://nf-co.re/join/slack)).
:::
> [!NOTE]
> If you need help using or modifying nf-core/rangeland then the best place to ask is on the nf-core Slack [#rangeland](https://nfcore.slack.com/channels/rangeland) channel ([join our Slack here](https://nf-co.re/join/slack)).

## Contribution workflow

Expand All @@ -20,13 +19,19 @@ If you'd like to write some code for nf-core/rangeland, the standard workflow is
1. Check that there isn't already an issue about your idea in the [nf-core/rangeland issues](https://github.com/nf-core/rangeland/issues) to avoid duplicating work. If there isn't one already, please create one so that others know you're working on this
2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [nf-core/rangeland repository](https://github.com/nf-core/rangeland) to your GitHub account
3. Make the necessary changes / additions within your forked repository following [Pipeline conventions](#pipeline-contribution-conventions)
4. Use `nf-core schema build` and add any new parameters to the pipeline JSON schema (requires [nf-core tools](https://github.com/nf-core/tools) >= 1.10).
4. Use `nf-core pipelines schema build` and add any new parameters to the pipeline JSON schema (requires [nf-core tools](https://github.com/nf-core/tools) >= 1.10).
5. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged

If you're not used to this workflow with git, you can start with some [docs from GitHub](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests) or even their [excellent `git` resources](https://try.github.io/).

## Tests

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 All @@ -35,7 +40,7 @@ There are typically two types of tests that run:
### Lint tests

`nf-core` has a [set of guidelines](https://nf-co.re/developers/guidelines) which all pipelines must adhere to.
To enforce these and ensure that all pipelines stay in sync, we have developed a helper tool which runs checks on the pipeline code. This is in the [nf-core/tools repository](https://github.com/nf-core/tools) and once installed can be run locally with the `nf-core lint <pipeline-directory>` command.
To enforce these and ensure that all pipelines stay in sync, we have developed a helper tool which runs checks on the pipeline code. This is in the [nf-core/tools repository](https://github.com/nf-core/tools) and once installed can be run locally with the `nf-core pipelines lint <pipeline-directory>` command.

If any failures or warnings are encountered, please follow the listed URL for more documentation.

Expand Down Expand Up @@ -70,7 +75,7 @@ If you wish to contribute a new step, please use the following coding standards:
2. Write the process block (see below).
3. Define the output channel if needed (see below).
4. Add any new parameters to `nextflow.config` with a default (see below).
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core schema build` tool).
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core pipelines schema build` tool).
6. Add sanity checks and validation for all relevant parameters.
7. Perform local tests to validate that the new code works as expected.
8. If applicable, add a new test command in `.github/workflow/ci.yml`.
Expand All @@ -81,13 +86,13 @@ If you wish to contribute a new step, please use the following coding standards:

Parameters should be initialised / defined with default values in `nextflow.config` under the `params` scope.

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

### Default processes resource requirements

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.
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/main/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 All @@ -98,7 +103,7 @@ Please use the following naming schemes, to make it easy to understand what is g

### Nextflow version bumping

If you are using a new feature from core Nextflow, you may bump the minimum required version of nextflow in the pipeline with: `nf-core bump-version --nextflow . [min-nf-version]`
If you are using a new feature from core Nextflow, you may bump the minimum required version of nextflow in the pipeline with: `nf-core pipelines bump-version --nextflow . [min-nf-version]`

### Images and figures

Expand Down
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/rang
- [ ] If you've fixed a bug or added code that should be tested, add tests!
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/rangeland/tree/master/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/rangeland _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] Make sure your code lints (`nf-core lint`).
- [ ] Make sure your code lints (`nf-core pipelines lint`).
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
- [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir <OUTDIR>`).
- [ ] Usage Documentation in `docs/usage.md` is updated.
- [ ] Output Documentation in `docs/output.md` is updated.
- [ ] `CHANGELOG.md` is updated.
Expand Down
37 changes: 27 additions & 10 deletions .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,36 @@
name: nf-core AWS full size tests
# This workflow is triggered on published releases.
# This workflow is triggered on PRs opened against the master branch.
# It can be additionally triggered manually with GitHub actions workflow dispatch button.
# It runs the -profile 'test_full' on AWS batch

on:
release:
types: [published]
pull_request:
branches:
- master
workflow_dispatch:
pull_request_review:
types: [submitted]

jobs:
run-tower:
run-platform:
name: Run AWS full tests
if: github.repository == 'nf-core/rangeland'
# run only if the PR is approved by at least 2 reviewers and against the master branch or manually triggered
if: github.repository == 'nf-core/rangeland' && github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'master' || github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
steps:
- name: Launch workflow via tower
- uses: octokit/[email protected]
id: check_approvals
with:
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- id: test_variables
if: github.event_name != 'workflow_dispatch'
run: |
JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}'
CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length')
test $CURRENT_APPROVALS_COUNT -ge 2 || exit 1 # At least 2 approvals are required
- name: Launch workflow via Seqera Platform
uses: seqeralabs/action-tower-launch@v2
# Add full size test data (but still relatively small datasets for few samples)
# on the `test_full.config` test runs with only one set of parameters
Expand All @@ -30,9 +47,9 @@ jobs:
}
profiles: test_full

- uses: actions/upload-artifact@v3
- 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
14 changes: 7 additions & 7 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/rangeland'
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 @@ -25,9 +25,9 @@ jobs:
}
profiles: test

- uses: actions/upload-artifact@v3
- 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@v1
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2
with:
message: |
## This PR is against the `master` branch :x:
Expand Down
61 changes: 52 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,79 @@ on:
pull_request:
release:
types: [published]
workflow_dispatch:

env:
NXF_ANSI_LOG: false
NXF_SINGULARITY_CACHEDIR: ${{ github.workspace }}/.singularity
NXF_SINGULARITY_LIBRARYDIR: ${{ github.workspace }}/.singularity

concurrency:
group: "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}"
cancel-in-progress: true

jobs:
test:
name: Run pipeline with test data
name: "Run pipeline with test data (${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }})"
# Only run on push if this is the nf-core dev branch (merged PRs)
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/rangeland') }}"
runs-on: ubuntu-latest
strategy:
matrix:
NXF_VER:
- "23.04.0"
- "24.04.2"
- "latest-everything"
profile:
- "conda"
- "docker"
- "singularity"
test_name:
- "test"
isMaster:
- ${{ github.base_ref == 'master' }}
# Exclude conda and singularity on dev
exclude:
- isMaster: false
profile: "conda"
- isMaster: false
profile: "singularity"
steps:
- name: Check out pipeline code
uses: actions/checkout@v3
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- name: Install Nextflow
uses: nf-core/setup-nextflow@v1
- name: Set up Nextflow
uses: nf-core/setup-nextflow@v2
with:
version: "${{ matrix.NXF_VER }}"

- name: Run pipeline with test data
# For example: adding multiple test runs with different parameters
# Remember that you can parallelise this by using strategy.matrix
- name: Set up Apptainer
if: matrix.profile == 'singularity'
uses: eWaterCycle/setup-apptainer@main

- name: Set up Singularity
if: matrix.profile == 'singularity'
run: |
mkdir -p $NXF_SINGULARITY_CACHEDIR
mkdir -p $NXF_SINGULARITY_LIBRARYDIR

- name: Set up Miniconda
if: matrix.profile == 'conda'
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3
with:
miniconda-version: "latest"
auto-update-conda: true
conda-solver: libmamba
channels: conda-forge,bioconda

- name: Set up Conda
if: matrix.profile == 'conda'
run: |
echo $(realpath $CONDA)/condabin >> $GITHUB_PATH
echo $(realpath python) >> $GITHUB_PATH

- name: Clean up Disk space
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1

- name: "Run pipeline with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.test_name }},${{ matrix.profile }} --outdir ./results
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@v7
- 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
Loading
Loading