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

3.2 release #229

Merged
merged 86 commits into from
Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
49345a1
Simplify samplesheet, input check, and qcat
christopher-hakkaart Feb 24, 2023
342429b
remove tools and add back in slowly
christopher-hakkaart Feb 25, 2023
a4ff7dc
Fix vc branch, sv calling
christopher-hakkaart Feb 28, 2023
5e2fcc7
Adding graphmap
christopher-hakkaart Mar 1, 2023
565a139
Merge pull request #220 from nf-core/update_3_1
yuukiiwa Mar 7, 2023
6e563e5
Merge pull request #222 from nf-core/dev
yuukiiwa Mar 10, 2023
368f1ef
Update align_graphmap2.nf
yuukiiwa Mar 13, 2023
d71927b
Merge pull request #228 from nf-core/master
yuukiiwa Mar 13, 2023
f78633d
make sure that python black is still passing
yuukiiwa Mar 13, 2023
f5d238a
Update check_samplesheet.py
yuukiiwa Mar 13, 2023
962aa51
python blacked
yuukiiwa Mar 13, 2023
6c6d67b
convert local modules with existing nf-core/modules
yuukiiwa Mar 14, 2023
45d21a5
refactoring
yuukiiwa Mar 16, 2023
5f5dcd1
replace medaka with clair3
yuukiiwa Mar 17, 2023
4f8a9f5
done refactoring: one fasta & gtf per run; replaced local modules wit…
yuukiiwa Mar 17, 2023
d094261
PRETTY
yuukiiwa Mar 21, 2023
38507c5
fix
yuukiiwa Mar 21, 2023
9eabb15
fix
yuukiiwa Mar 21, 2023
e3ac9c4
fix
yuukiiwa Mar 21, 2023
17fd627
Remove mapping and add in more meta information
christopher-hakkaart Mar 21, 2023
3d05290
tidy lines
christopher-hakkaart Mar 21, 2023
ada62a9
fix check_samplesheet
christopher-hakkaart Mar 21, 2023
69f9f5a
Merge pull request #232 from nf-core/update_3_1_dev_meta
yuukiiwa Mar 24, 2023
b127e3a
convert sniffles and cutesv to nf-core/modules
yuukiiwa Mar 24, 2023
403b456
PRETTY
yuukiiwa Mar 24, 2023
371ce6d
Template update for nf-core/tools version 2.8
nf-core-bot Apr 28, 2023
3075df6
Updated m6anet to 2.0.2
matthewstuartedwards May 9, 2023
ca4458f
Updated samplesheet error message when no fastq found
matthewstuartedwards May 9, 2023
d028b16
Merge pull request #241 from zovoilis-lab/update_3_1_dev_matthewSE
yuukiiwa May 10, 2023
854f134
Merge pull request #242 from zovoilis-lab/update_3_1_dev_matthewSE_sa…
yuukiiwa May 10, 2023
aa61fae
fix merge conflict
yuukiiwa May 10, 2023
0849ea5
Update modules.json
yuukiiwa May 10, 2023
015c24c
Update README.md
yuukiiwa May 10, 2023
06cfafa
Update nextflow.config
yuukiiwa May 10, 2023
0fbf1e1
Update samplesheet_check.nf
yuukiiwa May 10, 2023
de8aaf8
Update get_nanolyse_fasta.nf
yuukiiwa May 10, 2023
63498d7
Update get_nanolyse_fasta.nf
yuukiiwa May 10, 2023
4b1997d
Merge pull request #244 from nf-core/nf-core-template-merge
yuukiiwa May 10, 2023
c739ef6
python black linting fix
yuukiiwa May 10, 2023
1ad7c5f
fix linting
yuukiiwa May 10, 2023
fe68299
fix linting
yuukiiwa May 10, 2023
f2af6e9
update local modules
yuukiiwa May 10, 2023
391b7fd
update nf-core modules
yuukiiwa May 10, 2023
a03d1e3
add clair3 back in
yuukiiwa May 10, 2023
2f46ec2
add the missing nf-core modules
yuukiiwa May 10, 2023
a179ba2
add the missing nf-core modules
yuukiiwa May 10, 2023
b572c14
fix bug
yuukiiwa May 10, 2023
48384ce
fix bug
yuukiiwa May 10, 2023
748cba5
PRETTY!
yuukiiwa May 10, 2023
585cf23
Update nextflow_schema.json
yuukiiwa May 19, 2023
2ddff0c
Update nextflow_schema.json
yuukiiwa May 19, 2023
91db264
Update nextflow_schema.json
yuukiiwa May 19, 2023
8364c10
Update bin/check_samplesheet.py
yuukiiwa May 19, 2023
d14ce4e
address suggestions from Chris
yuukiiwa May 19, 2023
32a2afb
fix typo
yuukiiwa May 19, 2023
9b2d287
Update nextflow_schema.json
yuukiiwa May 19, 2023
2130938
Update nextflow_schema.json
yuukiiwa May 19, 2023
96e51e2
update m6anet biocontainer
yuukiiwa May 22, 2023
93d391a
update test-dataset paths
yuukiiwa May 22, 2023
c59485c
Update test_full.config
yuukiiwa May 23, 2023
0a2fb82
igenome
yuukiiwa May 23, 2023
855ce8b
igenome
yuukiiwa May 23, 2023
398ab24
clean up
yuukiiwa May 23, 2023
9ae4d1a
tmp: aws access denied
yuukiiwa May 23, 2023
95ac0ec
tmp: aws access denied
yuukiiwa May 23, 2023
7fcdb46
tmp: aws access denied
yuukiiwa May 23, 2023
2fa1fc5
tmp: aws access denied
yuukiiwa May 23, 2023
6cb98e2
tmp: aws access denied
yuukiiwa May 23, 2023
d86f3d2
tmp: aws access denied
yuukiiwa May 23, 2023
9358a7c
tmp: aws access denied
yuukiiwa May 24, 2023
8ba80ba
tmp: aws access denied
yuukiiwa May 24, 2023
5322c90
tmp: aws access denied
yuukiiwa May 25, 2023
210d774
tmp: aws access denied
yuukiiwa May 25, 2023
4a75758
tmp: aws access denied
yuukiiwa May 25, 2023
357ec04
tmp: aws access denied
yuukiiwa May 25, 2023
ecdf027
tmp: aws access denied
yuukiiwa May 25, 2023
4af13f4
Merge pull request #246 from nf-core/update_3_1_igenome
yuukiiwa May 25, 2023
47c7d85
Update test.config
yuukiiwa May 25, 2023
5ae8db5
test
yuukiiwa May 25, 2023
65990ab
nf-core modules update (All modules)
yuukiiwa Oct 9, 2023
791f9dd
fix samtools stats path
yuukiiwa Oct 9, 2023
e994f27
update
yuukiiwa Oct 9, 2023
3aa5ed6
fix graphmap
yuukiiwa Oct 9, 2023
3812706
linting fix
yuukiiwa Oct 9, 2023
bf4cd0a
fix
yuukiiwa Oct 9, 2023
5247122
PRETTY!
yuukiiwa Oct 9, 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
2 changes: 1 addition & 1 deletion .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 Down
5 changes: 3 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ 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/nanoseq then the best place to ask is on the nf-core Slack [#nanoseq](https://nfcore.slack.com/channels/nanoseq) channel ([join our Slack here](https://nf-co.re/join/slack)).
:::info
If you need help using or modifying nf-core/nanoseq then the best place to ask is on the nf-core Slack [#nanoseq](https://nfcore.slack.com/channels/nanoseq) channel ([join our Slack here](https://nf-co.re/join/slack)).
:::

## Contribution workflow

Expand Down Expand Up @@ -116,4 +118,3 @@ To get started:
Devcontainer specs:

- [DevContainer config](.devcontainer/devcontainer.json)
- [Dockerfile](.devcontainer/Dockerfile)
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ body:
attributes:
label: System information
description: |
* Nextflow version _(eg. 22.10.1)_
* 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 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/nanoseq _(eg. 1.1, 1.5, 1.8.2)_
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/nano

- [ ] 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/nanoseq/tree/master/.github/CONTRIBUTING.md)- [ ] If necessary, also make a PR on the nf-core/nanoseq _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/nf-core/nanoseq/tree/master/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/nanoseq _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] 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
2 changes: 1 addition & 1 deletion .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Launch workflow via tower
uses: nf-core/tower-action@v3
uses: seqeralabs/action-tower-launch@v1
# 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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/awstest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
# Launch workflow using Tower CLI tool action
- name: Launch workflow via tower
uses: nf-core/tower-action@v3
uses: seqeralabs/action-tower-launch@v1
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Check PRs
if: github.repository == 'nf-core/nanoseq'
run: |
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/nanoseq ]] && [[ $GITHUB_HEAD_REF = "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/nanoseq ]] && [[ $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
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 }}"
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: "3.7"
python-version: "3.11"
architecture: "x64"

- name: Install dependencies
Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
repos:
- repo: https://github.com/pre-commit/mirrors-prettier
rev: "v2.7.1"
hooks:
- id: prettier
Loading
Loading