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

Updates to adapt pipeline to new template (This also include PR #142 Implementation of IsoformSwitchAnalyzeR) #160

Open
wants to merge 40 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
57db8c4
Add IsoformSwitchAnalyzeR to pipeline
jesseangelis Jun 4, 2024
e6ece86
Update json files and and config
jesseangelis Jun 4, 2024
a989f17
Add IsoformSwitchAnalyzeR test
jesseangelis Jun 4, 2024
c45dc42
Update documentation
jesseangelis Jun 4, 2024
e831da5
Resolve commit conflicts
jesseangelis Jun 4, 2024
4253946
Resolve missing output if no switches were found
jesseangelis Jun 4, 2024
1baebfe
Update Credits
jesseangelis Jun 4, 2024
aa375af
Update Docs
jesseangelis Jun 4, 2024
996d9f7
Format using prettier
jesseangelis Jun 5, 2024
f285915
Update output documentation
jesseangelis Jun 5, 2024
1f4bd68
Format output documentation
jesseangelis Jun 5, 2024
dad7ffd
Update dIF definition
jesseangelis Jun 6, 2024
437c209
Update CHANGELOG.md
lathikaa Oct 26, 2024
f03b010
Update multiqc_config.yml
lathikaa Oct 26, 2024
8fb1cb0
Update README.md
lathikaa Oct 26, 2024
001c191
Update output.md
lathikaa Oct 26, 2024
8a305f1
Update nextflow_schema.json
lathikaa Oct 28, 2024
34f2d60
Update nextflow_schema.json
lathikaa Oct 28, 2024
f789fa8
Delete lib directory to fix linting issues
lathikaa Oct 28, 2024
ffaf95f
Revert "Delete lib directory to fix linting issues"
lathikaa Oct 28, 2024
0df361f
Updates to migrate from nf-validation to nf-schema
lathikaa Oct 31, 2024
32741d9
Updated schema to add isoformanalyzer
lathikaa Oct 31, 2024
7457cc7
Updated the module to use the version with mem removed
lathikaa Oct 31, 2024
21c6508
Add files via upload
lathikaa Oct 31, 2024
f1f83a9
Updated to remove max_memory, max_cpus, max_time and replace with pro…
lathikaa Oct 31, 2024
f065e2c
Updated for nf-core template version 3.0.2
lathikaa Oct 31, 2024
50e0aab
Updated for nf-core template version 3.0.2
lathikaa Oct 31, 2024
a22086c
Updated for nf-core template version 3.0.2
lathikaa Oct 31, 2024
8ff801d
Updated for nf-core template version 3.0.2
lathikaa Oct 31, 2024
8ee1869
Updated for linting
lathikaa Oct 31, 2024
2226ba1
Updated to add all test config except isoformswitchanalyzer due to sa…
lathikaa Nov 1, 2024
381545f
Updated to change the version to address linting issues
lathikaa Nov 1, 2024
a9ff66b
Updated to address linting error and template version
lathikaa Nov 1, 2024
1fc9bcb
Updated to remove lib folder and add utils subworkflows.
lathikaa Nov 3, 2024
5b7e018
Updated to disable all config except test
lathikaa Nov 3, 2024
43dce0f
Updated to resolve lint issue for image not matching the template
lathikaa Nov 3, 2024
6544169
Updated directly from nf-core-template-merge-3.0.2 branch to resolve …
lathikaa Nov 3, 2024
8a4f656
Add files via upload
lathikaa Nov 3, 2024
9950a7e
Updated to set isoformanalyzer to false in other config files and add…
lathikaa Nov 4, 2024
8dcff23
Updated to fix syntax error
lathikaa Nov 4, 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
26 changes: 14 additions & 12 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/rnasplice then the best place to ask is on the nf-core Slack [#rnasplice](https://nfcore.slack.com/channels/rnasplice) channel ([join our Slack here](https://nf-co.re/join/slack)).
:::
> [!NOTE]
> If you need help using or modifying nf-core/rnasplice then the best place to ask is on the nf-core Slack [#rnasplice](https://nfcore.slack.com/channels/rnasplice) channel ([join our Slack here](https://nf-co.re/join/slack)).

## Contribution workflow

Expand All @@ -20,15 +19,18 @@ If you'd like to write some code for nf-core/rnasplice, the standard workflow is
1. Check that there isn't already an issue about your idea in the [nf-core/rnasplice issues](https://github.com/nf-core/rnasplice/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/rnasplice repository](https://github.com/nf-core/rnasplice) 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 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 All @@ -38,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 @@ -73,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 @@ -84,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 @@ -101,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
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/rnas
- [ ] 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/rnasplice/tree/master/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/rnasplice _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.
Expand Down
41 changes: 31 additions & 10 deletions .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,40 @@
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/rnasplice'
# 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/rnasplice' && 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
# 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)
# on the `test_full.config` test runs with only one set of parameters
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
Expand All @@ -27,9 +47,10 @@ jobs:
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/rnasplice/results-${{ github.sha }}"
}
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
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
Loading
Loading