-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added missing files for configuration and settings
- Loading branch information
1 parent
fa03040
commit 1abac83
Showing
19 changed files
with
576 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
{ | ||
"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", | ||
"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" | ||
}, | ||
|
||
// 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"] | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
root = true | ||
|
||
[*] | ||
charset = utf-8 | ||
end_of_line = lf | ||
insert_final_newline = true | ||
trim_trailing_whitespace = true | ||
indent_size = 4 | ||
indent_style = space | ||
|
||
[*.{md,yml,yaml,html,css,scss,js}] | ||
indent_size = 2 | ||
|
||
# These files are edited and tested upstream in nf-core/modules | ||
[/modules/nf-core/**] | ||
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,113 @@ | ||
# phac-nml/speciesabundance: Contributing Guidelines | ||
|
||
Hi there! | ||
Many thanks for taking an interest in improving phac-nml/speciesabundance. | ||
|
||
We try to manage the required tasks for phac-nml/speciesabundance using GitHub issues, you probably came to this page when creating one. | ||
Please use the pre-filled template to save time. | ||
|
||
## Contribution workflow | ||
|
||
If you'd like to write some code for phac-nml/speciesabundance, the standard workflow is as follows: | ||
|
||
1. Check that there isn't already an issue about your idea in the [phac-nml/speciesabundance issues](https://github.com/phac-nml/speciesabundance/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 [phac-nml/speciesabundance repository](https://github.com/phac-nml/speciesabundance) 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 | ||
|
||
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/main`. | ||
- Fix the bug, and bump version (X.Y.Z+1). | ||
- A PR should be made on `main` from patch to directly this particular bug. | ||
|
||
## Getting help | ||
|
||
For further information/help, please consult the [phac-nml/speciesabundance documentation](https://github.com/phac-nml/speciesabundance/). | ||
|
||
## Pipeline contribution conventions | ||
|
||
To make the phac-nml/speciesabundance 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.cpu}` 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/phac-nml/speciesabundance/codespaces) | ||
- Tools installed | ||
- nf-core | ||
- Nextflow | ||
|
||
Devcontainer specs: | ||
|
||
- [DevContainer config](.devcontainer/devcontainer.json) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
name: Bug report | ||
description: Report something that is broken or incorrect | ||
labels: bug | ||
body: | ||
- type: markdown | ||
attributes: | ||
value: | | ||
Before you post this issue, please check the documentation. | ||
- 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 phac-nml/speciesabundance _(eg. 1.1, 1.5, 1.8.2)_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
contact_links: | ||
- name: "GitHub" | ||
url: https://github.com/phac-nml/speciesabundance | ||
about: The GitHub page for development. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
name: Feature request | ||
description: Suggest an idea for the phac-nml/speciesabundance 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<!-- | ||
# phac-nml/speciesabundance pull request | ||
Many thanks for contributing to phac-nml/speciesabundance! | ||
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/phac-nml/speciesabundance/tree/main/.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/phac-nml/speciesabundance/tree/main/.github/CONTRIBUTING.md) | ||
- [ ] Make sure your code lints (`nf-core lint`). | ||
- [ ] Ensure the test suite passes (`nextflow run . -profile 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). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 main branch on the repository | ||
# It fails when someone tries to make a PR against the phac-nml `main` branch instead of `dev` | ||
on: | ||
pull_request_target: | ||
branches: [main] | ||
|
||
jobs: | ||
test: | ||
runs-on: ubuntu-latest | ||
steps: | ||
# PRs to the phac-nml repo main branch are only ok if coming from the phac-nml repo `dev` or any `patch` branches | ||
- name: Check PRs | ||
if: github.repository == 'phac-nml/speciesabundance' | ||
run: | | ||
{ [[ ${{github.event.pull_request.head.repo.full_name }} == phac-nml/speciesabundance ]] && [[ $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@v1 | ||
with: | ||
message: | | ||
## This PR is against the `main` 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 }}) `main` branch. | ||
The `main` branch on phac-nml repositories should always contain code from the latest release. | ||
Because of this, PRs to `main` 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
name: Pipeline CI | ||
# This workflow runs the pipeline with the minimal test dataset to check that it completes without any syntax errors | ||
on: | ||
push: | ||
branches: | ||
- dev | ||
pull_request: | ||
release: | ||
types: [published] | ||
|
||
env: | ||
NXF_ANSI_LOG: false | ||
|
||
concurrency: | ||
group: "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}" | ||
cancel-in-progress: true | ||
|
||
jobs: | ||
test: | ||
name: Run pipeline with test data | ||
# Only run on push if this is the phac-nml dev branch (merged PRs) | ||
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'phac-nml/speciesabundance') }}" | ||
runs-on: ubuntu-latest | ||
strategy: | ||
matrix: | ||
NXF_VER: | ||
- "23.04.0" | ||
- "latest-everything" | ||
steps: | ||
- name: Check out pipeline code | ||
uses: actions/checkout@v3 | ||
|
||
- name: Install Nextflow | ||
uses: nf-core/setup-nextflow@v1 | ||
with: | ||
version: "${{ matrix.NXF_VER }}" | ||
|
||
- name: Cache nf-test installation | ||
id: cache-software | ||
uses: actions/cache@v3 | ||
with: | ||
path: | | ||
/usr/local/bin/nf-test | ||
/home/runner/.nf-test/nf-test.jar | ||
key: ${{ runner.os }}-${{ env.NFTEST_VER }}-nftest | ||
|
||
- name: Install nf-test | ||
if: steps.cache-software.outputs.cache-hit != 'true' | ||
run: | | ||
wget -qO- https://code.askimed.com/install/nf-test | bash | ||
sudo mv nf-test /usr/local/bin/ | ||
- name: Run nf-test | ||
run: | | ||
nf-test test | ||
- name: Nextflow run with test profile | ||
run: | | ||
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results |
Oops, something went wrong.