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

Candidate for 0.4.0 #59

Merged
merged 90 commits into from
Oct 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
cefe885
Added orthofinder
GallVp Jun 17, 2024
be19f59
Added orthofinder_annotations param
GallVp Jun 18, 2024
10164c8
Fixed spellings
GallVp Jun 19, 2024
735a823
Updated modules and subworkflows
GallVp Jun 19, 2024
23e0b56
Fixed liftoff failure when lifting off from a single reference
GallVp Jun 19, 2024
ad20b4b
Added evaluation by BUSCO
GallVp Jun 19, 2024
39aeab5
Added pattern to busco_lineage_datasets
GallVp Jun 20, 2024
7049e0b
Fixed fasat/gff fead for busco
GallVp Jun 20, 2024
43db2ce
Included common tax ids for eggnog mapper
GallVp Jun 20, 2024
c3895cc
Added versions from GFF_STORE sub-workflows
GallVp Jun 20, 2024
9970b35
Implemented hierarchical naming scheme: geneI.tJ, geneI.tJ.exonK, gen…
GallVp Jun 20, 2024
df2183f
Updated contributors
GallVp Jun 20, 2024
cfa93b3
Now sorting list of bam and list of fastq before cat to avoid resume …
GallVp Jun 20, 2024
48e3e29
Renamed external_protein_fastas param to protein_evidence
GallVp Jun 20, 2024
0d14d97
Allowed BAM files for RNA evidence
GallVp Jun 21, 2024
f325bbd
Added GXF_FASTA_AGAT_SPADDINTRONS_SPEXTRACTSEQUENCES sub-workflow
GallVp Jun 24, 2024
2d7f9a5
Updated fastq_fastqc_umitools_fastp
GallVp Jun 24, 2024
343ed20
Changed orthofinder_annotations from FASTA/GFF to protein FASTA
GallVp Jun 25, 2024
70f34d0
Renamed braker_allow_isoforms param to allow_isoforms
GallVp Jun 25, 2024
587c169
Added param to turn on/off strict model purging by TSEBRA
GallVp Jun 25, 2024
183e5d0
Added top level subworkflow paths to module config blocks
GallVp Jun 26, 2024
088c3d6
Refactored GFF_TSEBRA_SPFILTERFEATUREFROMKILLLIST subworkflow
GallVp Jun 26, 2024
0ea16a6
Added param filter_liftoff_by_hints
GallVp Jun 26, 2024
6bb61d4
Updated flowchart
GallVp Jun 26, 2024
91b22f2
Updated flowchart
GallVp Jun 26, 2024
93ff754
Updated flowchart
GallVp Jun 26, 2024
6a02807
Now publishing more outputs
GallVp Jul 1, 2024
6d958bf
Added a script to automatically check module version updates
GallVp Jul 24, 2024
e07c595
Updated contributors
GallVp Jul 24, 2024
72a6423
Removed dependency on kherronism repo for BRAKER3 and REPEATMASKER
GallVp Jul 25, 2024
9cb7c62
Updated modules and sub workflows
GallVp Jul 26, 2024
bb6b1c6
Removed dependency on PlantandFoodResearch/nxf-modules
GallVp Jul 26, 2024
3ec77a3
Added missing nf-core moduels
GallVp Jul 26, 2024
4e3004f
Reduced BRAKER3 threads to 8
GallVp Aug 6, 2024
ac4c14f
Now the final annotations are stored in the annotations folder
GallVp Aug 6, 2024
c85852a
Updated test data paths
GallVp Aug 7, 2024
230448f
Added -gff flag to REPEATMASKER to save the gff file
GallVp Aug 7, 2024
b5c4229
Added a test profile based on public data
GallVp Aug 15, 2024
60aba33
Fixed CI
GallVp Aug 15, 2024
10fc01c
Renamed the pipeline
GallVp Aug 15, 2024
22304ec
Added disk clean-up before ci test
GallVp Aug 15, 2024
2dc213b
Simplified test file
GallVp Aug 16, 2024
3e1e801
Updated test params
GallVp Aug 19, 2024
89f53e8
Merge pull request #56 from PlantandFoodResearch/tests/public
GallVp Aug 19, 2024
cea7bae
Merge branch 'dev' into rename
GallVp Aug 19, 2024
402063d
More renaming
GallVp Aug 19, 2024
d8aa380
Merge pull request #57 from PlantandFoodResearch/rename
GallVp Aug 19, 2024
50ed8e8
initial template build from nf-core/tools, version 2.14.1
GallVp Aug 19, 2024
7c32d49
Added nf-core template
GallVp Aug 19, 2024
c122e62
Stub test is now passing again
GallVp Aug 19, 2024
51b7482
Fixed multiple linting issues
GallVp Aug 20, 2024
d1bc3ce
Updated README and flowchart
GallVp Aug 20, 2024
f94ff82
Updated tool list and contributors
GallVp Aug 23, 2024
2baea7f
Reduced image dpi to 300
GallVp Aug 23, 2024
e94e37c
Updated modules and subworkflows
GallVp Aug 23, 2024
a31ba79
Added info for outputs
GallVp Aug 23, 2024
806c7cf
Updated deps and parameters docs
GallVp Sep 10, 2024
99eb4ae
Updated output.md
GallVp Sep 10, 2024
8a64bee
Added outputs for RNAseq alignment
GallVp Sep 10, 2024
78a3553
Added outputs for Annotation with BRAKER
GallVp Sep 11, 2024
8509069
Updated outputs doc
GallVp Sep 12, 2024
024417d
Fixed linting
GallVp Sep 12, 2024
7c35254
Completed the output doc
GallVp Sep 12, 2024
274f697
Partially completed the usage doc
GallVp Sep 13, 2024
ab8fe9e
Added to usage doc
GallVp Sep 13, 2024
ca0d3bb
Completed docs and updated stub test
GallVp Sep 13, 2024
75c629c
Updated modules
GallVp Sep 13, 2024
3e00ad6
Updated modules
GallVp Sep 13, 2024
ffccf53
Fixed linting issues
GallVp Sep 13, 2024
19cdd3c
Added parameter add_attrs_to_proteins_fasta
GallVp Sep 20, 2024
5f16a82
Added nonmasked test case
GallVp Sep 23, 2024
75b66fd
Added a check for input assembly size
GallVp Sep 23, 2024
5d419b8
Now skipping file size check for stub run
GallVp Sep 25, 2024
2c79787
Updated flowchart
GallVp Sep 26, 2024
5bf2411
Updated flowchart
GallVp Sep 26, 2024
b750053
Updated modules
GallVp Sep 26, 2024
43776a3
Updated schema and params doc
GallVp Sep 26, 2024
c11b878
Updated PFR params
GallVp Sep 26, 2024
3eb9ace
Added benchmark column to the input sheet and used GFFCOMPARE to perf…
GallVp Sep 27, 2024
287916e
Updated input schema and stub test
GallVp Sep 27, 2024
745bae8
Updated pfr params
GallVp Sep 27, 2024
bd6bb64
Changed org caps
GallVp Sep 27, 2024
2768d40
Fixed linting
GallVp Sep 27, 2024
320b07a
Updated modules
GallVp Sep 27, 2024
b8b4d5a
Now REPEATMASKER GFF output is saved via CUSTOM_RMOUTTOGFF3
GallVp Sep 29, 2024
504b3a8
Added multiple tests to ci
GallVp Sep 29, 2024
c7ebfdc
Added SEQKIT_RMDUP to detect duplicate sequence and wrap the fasta to…
GallVp Sep 29, 2024
0c0269c
Added PFR instructions
GallVp Sep 29, 2024
6ec662c
Updated parameter section labels
GallVp Oct 4, 2024
0acb62b
Bumped version to 0.4.0
GallVp Oct 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 20 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "nfcore",
"image": "nfcore/gitpod:latest",
"remoteUser": "gitpod",
"runArgs": ["--privileged"],

// Configure tool-specific properties.
"customizations": {
// Configure properties specific to VS Code.
"vscode": {
// Set *default* container specific settings.json values on container create.
"settings": {
"python.defaultInterpreterPath": "/opt/conda/bin/python"
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": ["ms-python.python", "ms-python.vscode-pylance", "nf-core.nf-core-extensionpack"]
}
}
}
29 changes: 10 additions & 19 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ trim_trailing_whitespace = true
indent_size = 4
indent_style = space

[*.{md,yml,yaml,html,css,scss,js,cff}]
[*.{md,yml,yaml,html,css,scss,js}]
indent_size = 2

# These files are edited and tested upstream in nf-core/modules
Expand All @@ -18,43 +18,34 @@ 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

# These files are edited and tested upstream in pfr/modules
[/modules/pfr/**]
# ignore python and markdown
[*.{py,md}]
indent_style = unset

# These files are edited and tested upstream in gallvp/modules,subworkflows
[/modules/gallvp/**]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset

[/subworkflows/pfr/**]
[/subworkflows/gallvp/**]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset

[/assets/email*]
indent_size = unset

# ignore Readme
[README.md]
indent_style = unset

# ignore python
[*.{py}]
indent_style = unset

# ignore perl
[*.{pl,pm}]
Expand Down
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*.config linguist-language=nextflow
*.nf.test linguist-language=nextflow
modules/nf-core/** linguist-generated
subworkflows/nf-core/** linguist-generated
6 changes: 6 additions & 0 deletions .github/.dockstore.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Dockstore config version, not pipeline version
version: 1.2
workflows:
- subclass: nfl
primaryDescriptorPath: /nextflow.config
publish: True
118 changes: 118 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
# plant-food-research-open/genepal: Contributing Guidelines

Hi there!
Many thanks for taking an interest in improving plant-food-research-open/genepal.

We try to manage the required tasks for plant-food-research-open/genepal using GitHub issues, you probably came to this page when creating one.
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 ;)

## Contribution workflow

If you'd like to write some code for plant-food-research-open/genepal, the standard workflow is as follows:

1. Check that there isn't already an issue about your idea in the [plant-food-research-open/genepal issues](https://github.com/plant-food-research-open/genepal/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 [plant-food-research-open/genepal repository](https://github.com/plant-food-research-open/genepal) 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).
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.

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.

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

### Pipeline tests

Each `nf-core` pipeline should be set up with a minimal set of test-data.
`GitHub Actions` then runs the pipeline on this data to ensure that it exits successfully.
If there are any failures then the automated tests fail.
These tests are run both with the latest available version of `Nextflow` and also the minimum required version that is stated in the pipeline code.

## Patch

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

- On your own fork, make a new branch `patch` based on `upstream/master`.
- Fix the bug, and bump version (X.Y.Z+1).
- A PR should be made on `master` from patch to directly this particular bug.

## Pipeline contribution conventions

To make the plant-food-research-open/genepal 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.

### Adding a new step

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

1. Define the corresponding input channel into your new process from the expected previous process channel
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).
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`.
9. Update MultiQC config `assets/multiqc_config.yml` so relevant suffixes, file name clean up and module plots are in the appropriate order. If applicable, add a [MultiQC](https://https://multiqc.info/) module.
10. Add a description of the output files and if relevant any appropriate images from the MultiQC report to `docs/output.md`.

### Default values

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`.

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

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

Please use the following naming schemes, to make it easy to understand what is going where.

- initial process channel: `ch_output_from_<process>`
- intermediate and terminal channels: `ch_<previousprocess>_for_<nextprocess>`

### 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]`

### Images and figures

For overview images and other documents we follow the nf-core [style guidelines and examples](https://nf-co.re/developers/design_guidelines).

## GitHub Codespaces

This repo includes a devcontainer configuration which will create a GitHub Codespaces for Nextflow development! This is an online developer environment that runs in your browser, complete with VSCode and a terminal.

To get started:

- Open the repo in [Codespaces](https://github.com/plant-food-research-open/genepal/codespaces)
- Tools installed
- nf-core
- Nextflow

Devcontainer specs:

- [DevContainer config](.devcontainer/devcontainer.json)
54 changes: 54 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Bug report
description: Report something that is broken or incorrect
labels: bug
body:
- type: textarea
id: description
attributes:
label: Description of the bug
description: A clear and concise description of what the bug is.
validations:
required: true
- type: textarea
id: command_used
attributes:
label: Command used and terminal output
description: Steps to reproduce the behaviour. Please paste the command you used
to launch the pipeline and the output from your terminal.
render: console
placeholder: "$ nextflow run ...


Some output where something broke

"
- type: textarea
id: files
attributes:
label: Relevant files
description: "Please drag and drop the relevant files here. Create a `.zip` archive
if the extension is not allowed.

Your verbose log file `.nextflow.log` is often useful _(this is a hidden file
in the directory where you launched the pipeline)_ as well as custom Nextflow
configuration files.

"
- type: textarea
id: system
attributes:
label: System information
description: "* Nextflow version _(eg. 23.04.0)_

* Hardware _(eg. HPC, Desktop, Cloud)_

* Executor _(eg. slurm, local, awsbatch)_

* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter, Charliecloud,
or Apptainer)_

* OS _(eg. CentOS Linux, macOS, Linux Mint)_

* Version of plant-food-research-open/genepal _(eg. 1.1, 1.5, 1.8.2)_

"
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Feature request
description: Suggest an idea for the plant-food-research-open/genepal pipeline
labels: enhancement
body:
- type: textarea
id: description
attributes:
label: Description of feature
description: Please describe your suggestion for a new feature. It might help to describe a problem or use case, plus any alternatives that you have considered.
validations:
required: true
25 changes: 25 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<!--
# plant-food-research-open/genepal pull request

Many thanks for contributing to plant-food-research-open/genepal!

Please fill in the appropriate checklist below (delete whatever is not relevant).
These are the most common things requested on pull requests (PRs).

Remember that PRs should be made against the dev branch, unless you're preparing a pipeline release.

Learn more about contributing: [CONTRIBUTING.md](https://github.com/plant-food-research-open/genepal/tree/master/.github/CONTRIBUTING.md)
-->

## PR checklist

- [ ] This comment contains a description of changes (with reason).
- [ ] 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/plant-food-research-open/genepal/tree/master/.github/CONTRIBUTING.md)
- [ ] Make sure your code lints (`nf-core 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.
- [ ] `README.md` is updated (including new tool citations and authors/contributors).
5 changes: 5 additions & 0 deletions .github/contributors.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env bash

module_authors=$(find ./modules -name meta.yml | xargs -I {} grep -A20 'authors:' {} | grep '\- ' | tr -d '"' | tr '[:upper:]' '[:lower:]' | awk '{print $2}')
workflow_authors=$(find ./subworkflows -name meta.yml | xargs -I {} grep -A20 'authors:' {} | grep '\- ' | tr -d '"' | tr '[:upper:]' '[:lower:]' | awk '{print $2}')
echo -e "${module_authors}\n${workflow_authors}" | sort -V | uniq -c | sort -k1,1 -r | awk '{print $2}' | sed -n 's|@\(.*\)|<a href="https://github.com/\1"><img src="https://github.com/\1.png" width="50" height="50"></a>|p'
File renamed without changes.
44 changes: 44 additions & 0 deletions .github/workflows/branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: nf-core branch protection
# This workflow is triggered on PRs to master branch on the repository
# It fails when someone tries to make a PR against the nf-core `master` branch instead of `dev`
on:
pull_request_target:
branches: [master]

jobs:
test:
runs-on: ubuntu-latest
steps:
# PRs to the nf-core repo master branch are only ok if coming from the nf-core repo `dev` or any `patch` branches
- name: Check PRs
if: github.repository == 'Plant-Food-Research-Open/genepal'
run: |
{ [[ ${{github.event.pull_request.head.repo.full_name }} == Plant-Food-Research-Open/genepal ]] && [[ $GITHUB_HEAD_REF == "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]

# If the above check failed, post a comment on the PR explaining the failure
# 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@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2
with:
message: |
## This PR is against the `master` branch :x:

* Do not close this PR
* Click _Edit_ and change the `base` to `dev`
* This CI test will remain failed until you push a new commit

---

Hi @${{ github.event.pull_request.user.login }},

It looks like this pull-request is has been made against the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `master` branch.
The `master` branch on nf-core repositories should always contain code from the latest release.
Because of this, PRs to `master` are only allowed if they come from the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `dev` branch.

You do not need to close this PR, you can change the target branch to `dev` by clicking the _"Edit"_ button at the top of this page.
Note that even after this, the test will continue to show as failing until you push a new commit.

Thanks again for your contribution!
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false
Loading