Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Template update #102

Merged
merged 190 commits into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from 189 commits
Commits
Show all changes
190 commits
Select commit Hold shift + click to select a range
ce4ac38
Initial template commit
DLBPointon May 18, 2023
9b8365a
Merge
DLBPointon May 18, 2023
aea730c
TEMPLATE updates, modification to groovy code to match previous versi…
DLBPointon May 19, 2023
5578d9e
Updates to match dev
DLBPointon May 19, 2023
a859004
Updates to match dev
DLBPointon May 19, 2023
6c5bdb3
Updates to match dev
DLBPointon May 19, 2023
c5b28a9
Merge branch 'dev' into template_update
DLBPointon May 19, 2023
550f2d4
Reformatting Python scripts for python black
DLBPointon May 19, 2023
fb1cb1c
Merge branch 'template_update' of https://github.com/sanger-tol/treev…
DLBPointon May 19, 2023
9df142f
Updates to schema
DLBPointon May 19, 2023
e848c0f
PythonBlack updates
DLBPointon May 19, 2023
f2cb10f
More pythonblack formatting
DLBPointon May 19, 2023
60ef1a2
More pythonblack formatting
DLBPointon May 19, 2023
62cd56d
More pythonblack formatting
DLBPointon May 19, 2023
f2bf0db
More pythonblack formatting
DLBPointon May 19, 2023
64b73c8
More pythonblack formatting
DLBPointon May 19, 2023
1a2b256
Reverting cmap2bed and fixing README
DLBPointon May 19, 2023
86fa4bc
Updates to copy the gap_finder fix into the pep subworkflow which nee…
DLBPointon May 19, 2023
2b32dc4
changed yaml_input, add subworkflow telo_finer.nf and two modules
yumisims May 19, 2023
db6ddef
add extract_telo,nf
yumisims May 20, 2023
17db4a1
removed comments from workflow, added some config to seperate out out…
DLBPointon May 22, 2023
8b7cc34
Linting
DLBPointon May 22, 2023
e2089f2
Removing Groovy Function Testing
DLBPointon May 22, 2023
a0795e6
add busco workflow
yumisims May 22, 2023
f8ec31d
update busco workflow
yumisims May 22, 2023
6f353b5
Merge remote-tracking branch 'origin/telo' into template_update
DLBPointon May 22, 2023
813a097
Merge branch 'anc' of https://github.com/sanger-tol/treeval into anc
yumisims May 22, 2023
32ce705
Updates for the telo inclusion
DLBPointon May 22, 2023
8a28098
Linting fix
DLBPointon May 22, 2023
4fe9954
Linging spaces fix
DLBPointon May 22, 2023
8a81d5d
Re-adding find_telo_regions
DLBPointon May 22, 2023
9574c7f
closes #93 - Reorganising shell script as part of the module, some ha…
DLBPointon May 22, 2023
4b57017
Linting and bash reorg
DLBPointon May 22, 2023
68be1b8
Bash reorg
DLBPointon May 22, 2023
371637b
Merge with dev
weaglesBio May 23, 2023
344bc0e
Update modules.json
weaglesBio May 23, 2023
dcb1ca2
Linting
weaglesBio May 24, 2023
f9f625f
Merge with template update
weaglesBio May 24, 2023
e5043d5
Initial template commit
priyanka-surana May 25, 2023
f4c143e
Merge pull request #97 from sanger-tol/anc
DLBPointon May 25, 2023
4a969e7
Updates
DLBPointon May 25, 2023
095ee91
Merge branch 'template_update' of https://github.com/sanger-tol/treev…
DLBPointon May 25, 2023
7dcbfda
Updates
DLBPointon May 25, 2023
cc522a8
Fixed busco anno, merge with template update
weaglesBio May 25, 2023
dd26461
Update branch to avoid repeated busco
weaglesBio May 25, 2023
0de9154
Merge branch 'anc_fixed' into template_update
DLBPointon May 25, 2023
a89adfb
Removing the rapid from full
DLBPointon May 25, 2023
3cf9e36
Minor updates and linting
DLBPointon May 25, 2023
28e0b79
Updates
DLBPointon May 26, 2023
975f81f
Merge remote-tracking branch 'origin/TEMPLATE' into template_update
DLBPointon May 26, 2023
9df6567
Duplicated busco entries
DLBPointon May 26, 2023
9c3f9ea
hicmapping
yumisims May 26, 2023
477da99
add indexing and change cramfilter module
yumisims May 27, 2023
8acfa50
deleted an unuseful module
yumisims May 27, 2023
8047a00
add comments
yumisims May 27, 2023
b55cae4
Update hic_mapping.nf
yumisims May 29, 2023
1b2c065
Updates to testing yamls
DLBPointon May 30, 2023
64d1f83
Merge remote-tracking branch 'origin/supermodule' into template_update
DLBPointon May 30, 2023
412f720
Linting changes
DLBPointon May 30, 2023
212b109
formatting and linting
DLBPointon May 30, 2023
d029916
Updates to supermodule
DLBPointon May 30, 2023
1cf1dfb
Updates to supermodule
DLBPointon May 30, 2023
f2e1157
Updating test yamls
DLBPointon May 30, 2023
ca1dc62
Add latter part of hic workflow
weaglesBio May 30, 2023
49ea665
Add latter part of hic workflow
weaglesBio May 30, 2023
d6ec10b
Fix code layout
weaglesBio May 30, 2023
7d79b88
Updates to config
DLBPointon May 30, 2023
06d60a9
Merge branch 'template_update' of https://github.com/sanger-tol/treev…
DLBPointon May 30, 2023
6d7fc5c
Update hic_mapping.nf
yumisims May 30, 2023
40a61f7
Update split_genomes_for_ensembl.pl
yumisims May 30, 2023
e354f3e
Update hic_mapping.nf
yumisims May 31, 2023
265da01
Update cram_filter_align_bwamem2_fixmate_sort.nf
yumisims May 31, 2023
d5bc26e
Update generate_cram_csv.sh
yumisims May 31, 2023
732d8c0
Add samtools markdup prefix
weaglesBio Jun 1, 2023
2d49b05
Fixing values
DLBPointon Jun 1, 2023
85f83ac
Update merge input logic.
weaglesBio Jun 1, 2023
f4f011c
Update base.config
yumisims Jun 1, 2023
1463eab
changed generate_cram_csv
yumisims Jun 1, 2023
67c221e
Update hic_mapping.nf
yumisims Jun 1, 2023
ef7974d
Fixes
DLBPointon Jun 2, 2023
52a16f4
Phase 2 work subworkflow complete
DLBPointon Jun 2, 2023
1928377
Phase 2 work subworkflow complete
DLBPointon Jun 2, 2023
8543db1
Update
DLBPointon Jun 2, 2023
60cdb6d
Linting fix
DLBPointon Jun 2, 2023
2613a2c
Update treeval_rapid.nf
yumisims Jun 2, 2023
fae662c
Remove deprecated workflows
weaglesBio Jun 3, 2023
eff790f
Add documentation
weaglesBio Jun 5, 2023
935a969
Add rapid sections
weaglesBio Jun 5, 2023
824d0c5
Updates to Generate Genome and Gene Alignment subworkflows, closing #…
DLBPointon Jun 5, 2023
9938bf3
Updates to YAML_INPUT and usage.md, closing #58
DLBPointon Jun 5, 2023
0538312
Update to usage docs and modules.config
DLBPointon Jun 5, 2023
c05fa99
Adding some bits
DLBPointon Jun 5, 2023
9185964
Adding docs for TELO_FINDER, closes #103
DLBPointon Jun 5, 2023
8dcbd95
Notes for GAP_FINDER
DLBPointon Jun 5, 2023
f51c956
Merge pull request #108 from sanger-tol/dp24_docs
DLBPointon Jun 5, 2023
352239f
Update output.md
yumisims Jun 6, 2023
b9e42b1
Update output.md
yumisims Jun 6, 2023
cd1f71f
Update to doc headers and linting for python scripts
DLBPointon Jun 6, 2023
51e907a
Update to doc headers and linting for python scripts
DLBPointon Jun 6, 2023
792a3b0
Prettier linting
DLBPointon Jun 6, 2023
4710e43
ECLint fixes
DLBPointon Jun 6, 2023
079dd3b
Update base.config
yumisims Jun 6, 2023
83846d7
Update output.md
yumisims Jun 6, 2023
7a041de
Update output.md
yumisims Jun 6, 2023
e6b4964
Update output.md
yumisims Jun 6, 2023
23273e4
Update output.md
yumisims Jun 6, 2023
294d22c
Update output.md
yumisims Jun 7, 2023
5e26551
Update output.md
yumisims Jun 7, 2023
01aa113
Update output.md
yumisims Jun 7, 2023
ecafc68
Update output.md
yumisims Jun 7, 2023
9a5d6cf
Updates to Citations.md, added all tools used
DLBPointon Jun 7, 2023
7a90850
Updating README for current progress
DLBPointon Jun 7, 2023
ee8416f
Update output.md
yumisims Jun 7, 2023
e2389c2
Updates to all docs
DLBPointon Jun 7, 2023
9a14143
Update output.md
yumisims Jun 7, 2023
309c6a1
Update output.md
yumisims Jun 7, 2023
5c938bb
Updated workflow images
weaglesBio Jun 7, 2023
9251fd7
Merge branch 'template_update' of https://github.com/sanger-tol/treev…
DLBPointon Jun 7, 2023
7de5ece
Update output.md
yumisims Jun 7, 2023
5403b80
minor updates
DLBPointon Jun 7, 2023
7c484b4
Merge branch 'hic_mapping_doc' of https://github.com/sanger-tol/treev…
DLBPointon Jun 7, 2023
bdf7ec8
Merge branch 'template_update' into hic_mapping_doc
yumisims Jun 7, 2023
7c9683a
Merge pull request #111 from sanger-tol/hic_mapping_doc
DLBPointon Jun 7, 2023
b093838
Linting fix
DLBPointon Jun 7, 2023
fd7d53c
Update output.md
yumisims Jun 7, 2023
804d5a4
Update output.md
yumisims Jun 7, 2023
8679a47
Update output.md
yumisims Jun 7, 2023
b7922fb
Update output.md
yumisims Jun 7, 2023
c0b7b8f
Update output.md
yumisims Jun 7, 2023
3442d80
Update output.md
yumisims Jun 7, 2023
b9d1398
Update output.md
yumisims Jun 7, 2023
0860a36
Add line to telo explainer
DLBPointon Jun 8, 2023
1c0b73f
Update output.md with busco
yumisims Jun 8, 2023
17b65b0
Update output.md
yumisims Jun 8, 2023
b751611
Update output.md
yumisims Jun 8, 2023
5a50076
Standardising Subworkflows and adding missing ch_versions
DLBPointon Jun 8, 2023
6c40c82
Fixing some modules that lack versions info
DLBPointon Jun 8, 2023
0632ddf
Standardising Subworkflows and adding missing ch_versions
DLBPointon Jun 8, 2023
f8e5da5
Merge branch 'template_update' of https://github.com/sanger-tol/treev…
DLBPointon Jun 8, 2023
0fb8716
Linting fix for prettier and ECLint
DLBPointon Jun 8, 2023
89b90ea
Update output.md
yumisims Jun 8, 2023
50676d6
Update output.md
yumisims Jun 8, 2023
67bd6f4
Update output.md
yumisims Jun 8, 2023
3bb0aa7
busco is done
yumisims Jun 8, 2023
c212b8b
Update selfcomp
yumisims Jun 8, 2023
adf4407
Update selfcomp
yumisims Jun 8, 2023
8f73831
MUMMER
yumisims Jun 8, 2023
ede241c
SELFCOMP done
yumisims Jun 8, 2023
eb380d2
Update output.md
yumisims Jun 8, 2023
506b072
INSILICO_DIGEST
yumisims Jun 9, 2023
ab7d6c2
insilico digest done
yumisims Jun 9, 2023
a51f1d0
Update README.md
yumisims Jun 9, 2023
c56da18
Update CITATIONS.md
yumisims Jun 9, 2023
13a60c6
Minor doc fixes from proofread
weaglesBio Jun 9, 2023
89fbf1c
put back selfcomp and insilico digest
yumisims Jun 9, 2023
118b365
Fixes for PR plus Pretext name change requested
DLBPointon Jun 12, 2023
2f07f1d
Fixes
DLBPointon Jun 12, 2023
fc1bedf
Updates to busco modules
yumisims Jun 12, 2023
e92ab7b
Merge branch 'template_update' of https://github.com/sanger-tol/treev…
DLBPointon Jun 13, 2023
41ac56e
Updated to remove hardcoded arg
DLBPointon Jun 13, 2023
0135d89
Updating comment
DLBPointon Jun 13, 2023
d6d5e4c
Fixed version error
DLBPointon Jun 14, 2023
6e2c64d
Fixing version informatino and harshil alignments
DLBPointon Jun 14, 2023
8247c0d
Updates to module configs and now outputting .hic
DLBPointon Jun 14, 2023
dabce65
adding BWAMEM2_INDEX config
DLBPointon Jun 14, 2023
35810c1
changed extract busco gene
yumisims Jun 14, 2023
d47ef3f
Update get_busco_gene.sh
yumisims Jun 15, 2023
8572200
Update ancestral_gene.nf
yumisims Jun 15, 2023
4820f4d
Update assign_ancestral.nf
yumisims Jun 15, 2023
cb0c26a
Update extract_ancestral.nf
yumisims Jun 15, 2023
e51109f
Update extract_buscogene.nf
yumisims Jun 15, 2023
15aa82b
Merge pull request #118 from sanger-tol/busco_gene
yumisims Jun 15, 2023
5275fd7
Troubleshoot rapid workflow
weaglesBio Jun 19, 2023
1e3b178
Updates
DLBPointon Jun 19, 2023
a64f3cb
Merge branch 'template_update' of https://github.com/sanger-tol/treev…
DLBPointon Jun 19, 2023
a4ee45d
Fix for multiple input to merge
DLBPointon Jun 21, 2023
76eeeff
Fixes to resource allocation
DLBPointon Jun 21, 2023
99f0660
Fixes version bug and completes pipeline
DLBPointon Jun 22, 2023
65a44da
Fixes and updates
DLBPointon Jun 22, 2023
a522879
Linting Fix
DLBPointon Jun 22, 2023
9cbe035
Python linting fix
DLBPointon Jun 22, 2023
5743589
Merge branch 'template_update' of https://github.com/sanger-tol/treev…
DLBPointon Jun 22, 2023
ac9a38b
Python Black linting
DLBPointon Jun 22, 2023
ceaf137
Python Black linting
DLBPointon Jun 22, 2023
2aecce4
Spelling mistake
DLBPointon Jun 22, 2023
683023f
Fix for enable_conda
DLBPointon Jun 22, 2023
f58fa55
Fixs and remove unnecessary imports
DLBPointon Jun 22, 2023
80554a8
Fix juicer
DLBPointon Jun 22, 2023
6bb819b
Testing Fix, adding stubs
DLBPointon Jun 23, 2023
269fdc0
Remove resources for `test_full`
priyanka-surana Jun 23, 2023
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
27 changes: 27 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"name": "nfcore",
"image": "nfcore/gitpod:latest",
"remoteUser": "gitpod",

// 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"]
}
}
}
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.config linguist-language=nextflow
*.nf.test linguist-language=nextflow
modules/nf-core/** linguist-generated
subworkflows/nf-core/** linguist-generated
36 changes: 23 additions & 13 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
# nf-core/treeval: Contributing Guidelines
# sanger-tol/treeval: Contributing Guidelines

Hi there!
Many thanks for taking an interest in improving nf-core/treeval.
Many thanks for taking an interest in improving sanger-tol/treeval.

We try to manage the required tasks for nf-core/treeval using GitHub issues, you probably came to this page when creating one.
We try to manage the required tasks for sanger-tol/treeval 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 ;)

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

If you'd like to write some code for nf-core/treeval, the standard workflow is as follows:
If you'd like to write some code for sanger-tol/treeval, the standard workflow is as follows:

1. Check that there isn't already an issue about your idea in the [nf-core/treeval issues](https://github.com/nf-core/treeval/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/treeval repository](https://github.com/nf-core/treeval) to your GitHub account
1. Check that there isn't already an issue about your idea in the [sanger-tol/treeval issues](https://github.com/sanger-tol/treeval/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 [sanger-tol/treeval repository](https://github.com/sanger-tol/treeval) 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
Expand Down Expand Up @@ -52,13 +50,9 @@ These tests are run both with the latest available version of `Nextflow` and als
- Fix the bug, and bump version (X.Y.Z+1).
- A PR should be made on `master` from patch to directly this particular bug.

## Getting help

For further information/help, please consult the [nf-core/treeval documentation](https://nf-co.re/treeval/usage) and don't hesitate to get in touch on the nf-core Slack [#treeval](https://nfcore.slack.com/channels/treeval) channel ([join our Slack here](https://nf-co.re/join/slack)).

## Pipeline contribution conventions

To make the nf-core/treeval 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.
To make the sanger-tol/treeval 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

Expand Down Expand Up @@ -101,3 +95,19 @@ If you are using a new feature from core Nextflow, you may bump the minimum requ
### 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/sanger-tol/treeval/codespaces)
- Tools installed
- nf-core
- Nextflow

Devcontainer specs:

- [DevContainer config](.devcontainer/devcontainer.json)
- [Dockerfile](.devcontainer/Dockerfile)
42 changes: 23 additions & 19 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,53 @@ 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:
- [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting)
- [nf-core/treeval pipeline documentation](https://nf-co.re/treeval/usage)
- 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.
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 ...
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.
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. 21.10.3)_
description: "* Nextflow version _(eg. 22.10.1)_
* Hardware _(eg. HPC, Desktop, Cloud)_
* Executor _(eg. slurm, local, awsbatch)_
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter or Charliecloud)_
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter, Charliecloud,
or Apptainer)_
* OS _(eg. CentOS Linux, macOS, Linux Mint)_
* Version of nf-core/treeval _(eg. 1.1, 1.5, 1.8.2)_
* Version of sanger-tol/treeval _(eg. 1.1, 1.5, 1.8.2)_
"
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ contact_links:
about: Please join the nf-core community here
- name: "Slack #treeval channel"
url: https://nfcore.slack.com/channels/treeval
about: Discussion about the nf-core/treeval pipeline
about: Discussion about the sanger-tol/treeval pipeline
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Feature request
description: Suggest an idea for the nf-core/treeval pipeline
description: Suggest an idea for the sanger-tol/treeval pipeline
labels: enhancement
body:
- type: textarea
Expand Down
9 changes: 4 additions & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
<!--
# nf-core/treeval pull request
# sanger-tol/treeval pull request

Many thanks for contributing to nf-core/treeval!
Many thanks for contributing to sanger-tol/treeval!

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/nf-core/treeval/tree/master/.github/CONTRIBUTING.md)
Learn more about contributing: [CONTRIBUTING.md](https://github.com/sanger-tol/treeval/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/nf-core/treeval/tree/master/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/treeval _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/sanger-tol/treeval/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>`).
- [ ] Usage Documentation in `docs/usage.md` is updated.
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/awsfulltest.yml

This file was deleted.

25 changes: 0 additions & 25 deletions .github/workflows/awstest.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
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 == 'nf-core/treeval'
if: github.repository == 'sanger-tol/treeval'
run: |
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/treeval ]] && [[ $GITHUB_HEAD_REF = "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
{ [[ ${{github.event.pull_request.head.repo.full_name }} == sanger-tol/treeval ]] && [[ $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
Expand Down
19 changes: 12 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,34 @@ on:

env:
NXF_ANSI_LOG: false
CAPSULE_LOG: none

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 nf-core dev branch (merged PRs)
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/treeval') }}"
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'sanger-tol/treeval') }}"
runs-on: ubuntu-latest
strategy:
matrix:
# Nextflow versions
NXF_VER:
- "22.04.0"
- "22.10.1"
- "latest-everything"
steps:
- name: Check out pipeline code
uses: actions/checkout@v2
uses: actions/checkout@v3

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

- name: Run the full test profile of the pipeline
- name: Run pipeline with test data
# TODO nf-core: You can customise CI pipeline run tests as required
# For example: adding multiple test runs with different parameters
# Remember that you can parallelise this by using strategy.matrix
run: |
nextflow run ${GITHUB_WORKSPACE} -profile full_s3_test,docker --outdir ./results_full
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results
24 changes: 24 additions & 0 deletions .github/workflows/clean-up.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: "Close user-tagged issues and PRs"
on:
schedule:
- cron: "0 0 * * 0" # Once a week

jobs:
clean-up:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v7
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."
close-issue-message: "This issue was closed because it has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor and then staled for 20 days with no activity."
days-before-stale: 30
days-before-close: 20
days-before-pr-close: -1
any-of-labels: "awaiting-changes,awaiting-feedback"
exempt-issue-labels: "WIP"
exempt-pr-labels: "WIP"
repo-token: "${{ secrets.GITHUB_TOKEN }}"
8 changes: 4 additions & 4 deletions .github/workflows/fix-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
if: >
contains(github.event.comment.html_url, '/pull/') &&
contains(github.event.comment.body, '@nf-core-bot fix linting') &&
github.repository == 'nf-core/treeval'
github.repository == 'sanger-tol/treeval'
runs-on: ubuntu-latest
steps:
# Use the @nf-core-bot token to check out so we can push later
Expand All @@ -24,7 +24,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}

- uses: actions/setup-node@v2
- uses: actions/setup-node@v3

- name: Install Prettier
run: npm install -g prettier @prettier/plugin-php
Expand All @@ -34,9 +34,9 @@ jobs:
id: prettier_status
run: |
if prettier --check ${GITHUB_WORKSPACE}; then
echo "::set-output name=result::pass"
echo "result=pass" >> $GITHUB_OUTPUT
else
echo "::set-output name=result::fail"
echo "result=fail" >> $GITHUB_OUTPUT
fi
- name: Run 'prettier --write'
Expand Down
Loading