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

Release 2.2.0 #122

Merged
merged 76 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
cca4d5c
bump version to 2.2.0dev
Daniel-VM Oct 23, 2023
97c8afe
fix indentation in mainfest
Daniel-VM Oct 24, 2023
8a24a5a
update formatting in comments of allowed options
Daniel-VM Oct 24, 2023
77cab10
Merge pull request #100 from Daniel-VM/bump-version-2.2.0dev
Daniel-VM Oct 24, 2023
af842a6
update bakta to v1.8.2
Daniel-VM Oct 26, 2023
94058bd
Merge pull request #103 from Daniel-VM/dev
Daniel-VM Oct 26, 2023
06e76ca
add nfcore module dragonfyle
Daniel-VM Oct 25, 2023
296bb39
create test for assembly with dragonflye
Daniel-VM Oct 27, 2023
e27d4c1
tmp fix for handling gzip/no-gzip assemblies
Daniel-VM Oct 27, 2023
8a8d754
add genome_size value in the input file to meta map
Daniel-VM Oct 27, 2023
2a442cd
add genome_size value to ext.args in dragonflye
Daniel-VM Oct 27, 2023
7a529d5
add dragonfly documentation plus fixme message in workflow
Daniel-VM Oct 27, 2023
1dab52e
fix prettier
Daniel-VM Oct 27, 2023
795a419
fix processing of gziped assemblies for gene annotation
Daniel-VM Oct 28, 2023
af444ff
fix ext.args and update help text on dragonflye module
Daniel-VM Oct 30, 2023
8f984b1
Merge branch 'module_dragonflye' into dev
Daniel-VM Oct 30, 2023
2fe2a26
update changelog #104
Daniel-VM Oct 30, 2023
aa09a83
fix condition to parse gsize in dragonflye module conf
Daniel-VM Oct 31, 2023
209a2bd
patch dragonflye module to allow short-reads polishing of draft genome
Daniel-VM Oct 31, 2023
c3ad68a
applied reviewer suggestions #104
Daniel-VM Nov 2, 2023
39de87c
Merge pull request #104 from Daniel-VM/dev
Daniel-VM Nov 2, 2023
1a01a47
porechop patch to prevent input file from being overwritten with outp…
Daniel-VM Nov 2, 2023
ed3d296
update dragonflye version and fix output file name
Daniel-VM Nov 3, 2023
1bfafe9
add dragonflye hybrid-mode to readme
Daniel-VM Nov 3, 2023
0bba270
Merge branch 'dragonflye_hybridmode' into dev
Daniel-VM Nov 3, 2023
43d5aed
temp fix of dragonflye modules.config
Daniel-VM Nov 3, 2023
01df1d2
complete fix of dragonflye module config
Daniel-VM Nov 6, 2023
7eb9931
update CHANGELOG #106
Daniel-VM Nov 7, 2023
ca59305
add reviewer suggestions #106
Daniel-VM Nov 9, 2023
34d2f48
fix prettier #106
Daniel-VM Nov 9, 2023
544fbbb
add profile test_hybrid_dragonflye to github CI test
Daniel-VM Nov 9, 2023
126e080
Merge pull request #106 from Daniel-VM/dev
Daniel-VM Nov 9, 2023
db2ff83
Template update for nf-core/tools version 2.11
nf-core-bot Dec 19, 2023
7fe520d
Template update for nf-core/tools version 2.11.1
nf-core-bot Dec 20, 2023
8c6d121
Template update for nf-core/tools version 2.12
nf-core-bot Jan 29, 2024
65d6264
merge nf-core template v2.12
Daniel-VM Feb 12, 2024
8214a07
fix input file format after template update
Daniel-VM Feb 12, 2024
cfabdfa
fix linting module update required
Daniel-VM Feb 12, 2024
79df4a5
fix linging after template v2.12 update
Daniel-VM Feb 13, 2024
bb830b6
update changelog in PR #111
Daniel-VM Feb 13, 2024
f5aba95
fixed git CLI test by recovering patched module #111
Daniel-VM Feb 13, 2024
2387547
fix prettier #111
Daniel-VM Feb 13, 2024
0aaeebe
add reviewer suggestions in #111
Daniel-VM Feb 19, 2024
144d239
Merge pull request #111 from Daniel-VM/dev
Daniel-VM Feb 19, 2024
4b85b2d
Template update for nf-core/tools version 2.13
nf-core-bot Feb 20, 2024
2d5631a
Template update for nf-core/tools version 2.13.1
nf-core-bot Feb 29, 2024
7422138
Merge branch 'nf-core-template-merge-2.13.1' into dev
Daniel-VM Mar 18, 2024
7c41764
fix input parsing after template update
Daniel-VM Mar 18, 2024
2ac9a42
remove conflicting null val injected via ifempty
Daniel-VM Mar 18, 2024
11b82b7
workaround to fix test profile long regarding null channel ch_versions
Daniel-VM Mar 19, 2024
1dfdb1d
fix linting after updating to template 2.13.1
Daniel-VM Mar 19, 2024
83c0830
fix old quote format in docs
Daniel-VM Mar 19, 2024
5ac3802
fix prettier and update changelog #117
Daniel-VM Mar 19, 2024
7ad7ff2
fix linting x2 #117
Daniel-VM Mar 19, 2024
5ceb33c
applying reviewer suggestions on #117
Daniel-VM Mar 19, 2024
6265523
Merge pull request #117 from Daniel-VM/dev
Daniel-VM Mar 19, 2024
9e6497d
replace image repo
Daniel-VM Mar 21, 2024
48ea030
fix lint warning regarding version channel
Daniel-VM Mar 21, 2024
655010f
updated local modules-subworkflows
Daniel-VM Mar 21, 2024
eed095f
update all nf-core modules
Daniel-VM Mar 21, 2024
3dbc4e9
update changelog #120
Daniel-VM Mar 21, 2024
f900973
recover dfast version from the updated one with broken dependencies
Daniel-VM Mar 21, 2024
c87b636
fix miniap2 input channels after updating modules
Daniel-VM Mar 21, 2024
c148815
update local modules structure
Daniel-VM Mar 21, 2024
9bd943a
fix fastp linting #120
Daniel-VM Mar 21, 2024
c1512ff
Merge pull request #120 from Daniel-VM/dev
Daniel-VM Mar 22, 2024
b581e4a
bump version 2.2.0
Daniel-VM Mar 27, 2024
2c23b60
Merge pull request #121 from Daniel-VM/dev
Daniel-VM Mar 30, 2024
cd0f061
fix download pipeline workflow - gitCLI
Daniel-VM Mar 30, 2024
1003eb3
fix linting error after updating workflow download pipeline
Daniel-VM Mar 30, 2024
c1ae590
update changelog #123
Daniel-VM Mar 30, 2024
3555cbc
Merge pull request #123 from Daniel-VM/dev
Daniel-VM Apr 2, 2024
82d0925
add reviewer suggestions in PR #122
Daniel-VM Apr 3, 2024
00429c7
add reviewer 2 suggestions in PR #122
Daniel-VM Apr 3, 2024
820e7cf
Update .github/CONTRIBUTING.md in #124
Daniel-VM Apr 4, 2024
4a8016a
Merge pull request #124 from Daniel-VM/dev
Daniel-VM Apr 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
10 changes: 1 addition & 9 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,7 @@
"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"
"python.defaultInterpreterPath": "/opt/conda/bin/python"
},

// Add the IDs of extensions you want installed when the container is created.
Expand Down
11 changes: 10 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,16 @@ 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

# ignore python and markdown
[*.{py,md}]
indent_style = unset
17 changes: 13 additions & 4 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/bacass then the best place to ask is on the nf-core Slack [#bacass](https://nfcore.slack.com/channels/bacass) channel ([join our Slack here](https://nf-co.re/join/slack)).
:::
> [!NOTE]
> If you need help using or modifying nf-core/bacass then the best place to ask is on the nf-core Slack [#bacass](https://nfcore.slack.com/channels/bacass) channel ([join our Slack here](https://nf-co.re/join/slack)).

## Contribution workflow

Expand All @@ -27,6 +26,8 @@ If you're not used to this workflow with git, you can start with some [docs from

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

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 @@ -46,6 +47,14 @@ Each `nf-core` pipeline should be set up with a minimal set of test-data.
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.

You can run pipeline tests with the following command:

```bash
nextflow run nf-core/bacass \
-profile <test,test_long,test_hybrid,...>,<docker/singularity/.../institute> \
--outdir <OUTDIR>
```

## Patch

:warning: Only in the unlikely and regretful event of a release happening with a bug.
Expand Down Expand Up @@ -87,7 +96,7 @@ Once there, use `nf-core schema build` to add to `nextflow_schema.json`.

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.
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 Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/baca
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/bacass/tree/master/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/bacass _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>`).
- [ ] 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.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
}
profiles: test_full

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Tower debug log file
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/awstest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
}
profiles: test

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Tower debug log file
path: |
Expand Down
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
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,16 @@ jobs:
- "latest-everything"
steps:
- name: Check out pipeline code
uses: actions/checkout@v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

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

- name: Disk space cleanup
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1

- name: Run pipeline with test data
# For example: adding multiple test runs with different parameters
# Remember that you can parallelise this by using strategy.matrix
Expand All @@ -52,7 +55,7 @@ jobs:
strategy:
matrix:
# Run remaining test profiles with minimum nextflow version
profile: [test_long_miniasm, test_hybrid, test_long, test_dfast]
profile: [test_long_miniasm, test_hybrid, test_long, test_dfast, test_hybrid_dragonflye]
steps:
- name: Check out pipeline code
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clean-up.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v7
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
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."
Expand Down
83 changes: 83 additions & 0 deletions .github/workflows/download_pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: Test successful pipeline download with 'nf-core download'

# Run the workflow when:
# - dispatched manually
# - when a PR is opened or reopened to master branch
# - the head branch of the pull request is updated, i.e. if fixes for a release are pushed last minute to dev.
on:
workflow_dispatch:
inputs:
testbranch:
description: "The specific branch you wish to utilize for the test execution of nf-core download."
required: true
default: "dev"
pull_request:
types:
- opened
- edited
- synchronize
branches:
- master
pull_request_target:
branches:
- master

env:
NXF_ANSI_LOG: false

jobs:
download:
runs-on: ubuntu-latest
steps:
- name: Install Nextflow
uses: nf-core/setup-nextflow@v2

- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
with:
python-version: "3.11"
architecture: "x64"
- uses: eWaterCycle/setup-singularity@931d4e31109e875b13309ae1d07c70ca8fbc8537 # v7
with:
singularity-version: 3.8.3

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install git+https://github.com/nf-core/tools.git@dev

- name: Get the repository name and current branch set as environment variable
run: |
echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV}
echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> ${GITHUB_ENV}
echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> ${GITHUB_ENV}

- name: Download the pipeline
env:
NXF_SINGULARITY_CACHEDIR: ./
run: |
nf-core download ${{ env.REPO_LOWERCASE }} \
--revision ${{ env.REPO_BRANCH }} \
--outdir ./${{ env.REPOTITLE_LOWERCASE }} \
--compress "none" \
--container-system 'singularity' \
--container-library "quay.io" -l "docker.io" -l "ghcr.io" \
--container-cache-utilisation 'amend' \
--download-configuration

- name: Inspect download
run: tree ./${{ env.REPOTITLE_LOWERCASE }}

- name: Run the downloaded pipeline (stub)
id: stub_run_pipeline
continue-on-error: true
env:
NXF_SINGULARITY_CACHEDIR: ./
NXF_SINGULARITY_HOME_MOUNT: true
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results
- name: Run the downloaded pipeline (stub run not supported)
id: run_pipeline
if: ${{ job.steps.stub_run_pipeline.status == failure() }}
env:
NXF_SINGULARITY_CACHEDIR: ./
NXF_SINGULARITY_HOME_MOUNT: true
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -profile test,singularity --outdir ./results
72 changes: 53 additions & 19 deletions .github/workflows/fix-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
types: [created]

jobs:
deploy:
fix-linting:
# Only run if comment is on a PR with the main repo, and if it contains the magic keywords
if: >
contains(github.event.comment.html_url, '/pull/') &&
Expand All @@ -13,43 +13,77 @@ jobs:
runs-on: ubuntu-latest
steps:
# Use the @nf-core-bot token to check out so we can push later
- uses: actions/checkout@v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
with:
token: ${{ secrets.nf_core_bot_auth_token }}

# indication that the linting is being fixed
- name: React on comment
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
with:
comment-id: ${{ github.event.comment.id }}
reactions: eyes

# Action runs on the issue comment, so we don't get the PR by default
# Use the gh cli to check out the PR
- name: Checkout Pull Request
run: gh pr checkout ${{ github.event.issue.number }}
env:
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}

- uses: actions/setup-node@v3
# Install and run pre-commit
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
with:
python-version: 3.11

- name: Install Prettier
run: npm install -g prettier @prettier/plugin-php
- name: Install pre-commit
run: pip install pre-commit

# Check that we actually need to fix something
- name: Run 'prettier --check'
id: prettier_status
run: |
if prettier --check ${GITHUB_WORKSPACE}; then
echo "result=pass" >> $GITHUB_OUTPUT
else
echo "result=fail" >> $GITHUB_OUTPUT
fi
- name: Run pre-commit
id: pre-commit
run: pre-commit run --all-files
continue-on-error: true

- name: Run 'prettier --write'
if: steps.prettier_status.outputs.result == 'fail'
run: prettier --write ${GITHUB_WORKSPACE}
# indication that the linting has finished
- name: react if linting finished succesfully
if: steps.pre-commit.outcome == 'success'
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
with:
comment-id: ${{ github.event.comment.id }}
reactions: "+1"

- name: Commit & push changes
if: steps.prettier_status.outputs.result == 'fail'
id: commit-and-push
if: steps.pre-commit.outcome == 'failure'
run: |
git config user.email "[email protected]"
git config user.name "nf-core-bot"
git config push.default upstream
git add .
git status
git commit -m "[automated] Fix linting with Prettier"
git commit -m "[automated] Fix code linting"
git push

- name: react if linting errors were fixed
id: react-if-fixed
if: steps.commit-and-push.outcome == 'success'
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
with:
comment-id: ${{ github.event.comment.id }}
reactions: hooray

- name: react if linting errors were not fixed
if: steps.commit-and-push.outcome == 'failure'
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
with:
comment-id: ${{ github.event.comment.id }}
reactions: confused

- name: react if linting errors were not fixed
if: steps.commit-and-push.outcome == 'failure'
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
with:
issue-number: ${{ github.event.issue.number }}
body: |
@${{ github.actor }} I tried to fix the linting errors, but it didn't work. Please fix them manually.
See [CI log](https://github.com/nf-core/bacass/actions/runs/${{ github.run_id }}) for more details.
Loading
Loading