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 PR for 2.5.2 #568

Merged
merged 69 commits into from
Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
218eccd
Post-release version bump to dev
jfy133 Nov 17, 2023
26d3bf4
Harshil align
jfy133 Nov 17, 2023
9c3f02f
Merge pull request #542 from nf-core/post-release-version-bump
jfy133 Nov 17, 2023
ed75993
fix: centrifuge db needs to be a tuple
maxibor Nov 21, 2023
5b90387
patch commits
maxibor Nov 24, 2023
bd97618
fix: remove duplicated code
maxibor Dec 5, 2023
d2f6f60
cleanup: remove dump logs
maxibor Dec 5, 2023
f884170
Template update for nf-core/tools version 2.11
nf-core-bot Dec 19, 2023
7ef749c
Template update for nf-core/tools version 2.11.1
nf-core-bot Dec 20, 2023
a0831d9
First pass of bug fix, to be tested again
jfy133 Jan 15, 2024
8e4c7b6
Update BUSCO db in tests to latest version as older version not anymo…
jfy133 Jan 16, 2024
78a7ee0
Update last URL
jfy133 Jan 16, 2024
c66ed48
Merge branch 'dev' into nf-core-template-merge-2.11
jfy133 Jan 16, 2024
c2f44fe
Fix BUSCO download links due to deprecation of old verison of db in t…
jfy133 Jan 16, 2024
4bc12ef
Simplify CAT_FASTQ branch condition, and remove misplaced flatten()
jfy133 Jan 16, 2024
ec06db8
Remove unnecessary space
jfy133 Jan 16, 2024
2f6f2d0
Remove leftover TODO
jfy133 Jan 16, 2024
5d013e5
Better commenting
jfy133 Jan 16, 2024
947dbd5
Remove superfluous .map()
jfy133 Jan 16, 2024
50eaeab
Add comment for of run merging group tuple structure
jfy133 Jan 16, 2024
42317ee
Fix linting
jfy133 Jan 16, 2024
192c86f
Update nextflow.config to fix docker.runOptions
CarsonJM Jan 16, 2024
c79c5d4
Merge pull request #553 from nf-core/nf-core-template-merge-2.11
jfy133 Jan 17, 2024
d914a1c
Merge branch 'dev' into fix-cat-se-data-dev
jfy133 Jan 19, 2024
ff0c4aa
[automated] Fix linting with Prettier
nf-core-bot Jan 19, 2024
c5ae764
Update workflows/mag.nf
maxibor Jan 26, 2024
c3373ee
Update workflows/mag.nf
maxibor Jan 26, 2024
2c41bab
Update subworkflows/local/gtdbtk.nf
maxibor Jan 26, 2024
ea568df
Update subworkflows/local/gtdbtk.nf
maxibor Jan 26, 2024
629e667
Update CLASSIFYWF to fix find glob issue
jfy133 Jan 26, 2024
3f3505a
[automated] Fix linting with Prettier
nf-core-bot Jan 26, 2024
99f9aa8
feat: add CAT summary to bin_summary table
maxibor Jan 26, 2024
fa93107
Merge branch 'patch_2_5_1' of github.com:maxibor/mag into add_cat_2_s…
maxibor Jan 26, 2024
d798593
chore: update changelog
maxibor Jan 26, 2024
6964daa
fix: CAT global summary channel
maxibor Jan 26, 2024
3a65193
readd changes from PR
maxibor Jan 26, 2024
64ae23e
fix: cat_summary is the variable name
maxibor Jan 26, 2024
13212ab
Merge pull request #548 from maxibor/patch_2_5_1
jfy133 Jan 26, 2024
eb97cbd
Merge pull request #558 from nf-core/fix-cat-se-data-dev
jfy133 Jan 26, 2024
0ad92fe
Template update for nf-core/tools version 2.12
nf-core-bot Jan 29, 2024
212d079
Merge remote-tracking branch 'upstream/dev' into add_cat_2_summary
maxibor Jan 30, 2024
da53bb5
Merge branch 'dev' of https://github.com/nf-core/mag into nf-core-tem…
CarsonJM Feb 1, 2024
24f7b1b
[automated] Fix linting with Prettier
nf-core-bot Feb 1, 2024
a5247ab
Fixed linting errors
CarsonJM Feb 1, 2024
a47c577
Add warning if no GTDB results because no contigs pass filter
jfy133 Feb 1, 2024
2c1274b
Add changelog and missing changelog entry
jfy133 Feb 1, 2024
7ac9745
Update MultiQC to 1.19 start tweaking confgig
jfy133 Feb 1, 2024
a8a0e94
Fixed linting in usage.md
CarsonJM Feb 1, 2024
ebfb6d3
Fixed docker.runOptions merge error
CarsonJM Feb 1, 2024
dabc167
Update CHANGELOG.md
jfy133 Feb 1, 2024
ef82701
Tweak order of MultiQC sections to better match workflow order
jfy133 Feb 1, 2024
3b2f070
Fix author
jfy133 Feb 1, 2024
15650d8
Merge pull request #562 from maxibor/add_cat_2_summary
jfy133 Feb 1, 2024
3ead481
Merge branch 'dev' into warn-when-gtdb-filter-empty
jfy133 Feb 1, 2024
428a0d3
Update .nf-core.yml
jfy133 Feb 1, 2024
3ca1229
[automated] Fix linting with Prettier
nf-core-bot Feb 1, 2024
5a614d9
Merge pull request #563 from nf-core/nf-core-template-merge-2.12
jfy133 Feb 1, 2024
c49febd
Merge remote-tracking branch 'origin/dev' into warn-when-gtdb-filter-…
jfy133 Feb 1, 2024
2a3eb28
Merge remote-tracking branch 'origin/dev' into multiqc-tweak
jfy133 Feb 1, 2024
601114d
Merge pull request #565 from nf-core/warn-when-gtdb-filter-empty
jfy133 Feb 1, 2024
61376a8
Merge pull request #566 from nf-core/multiqc-tweak
CarsonJM Feb 1, 2024
08d197b
Update CHANGELOG and bump version for reelase
jfy133 Feb 2, 2024
409b7f8
Typo fix
jfy133 Feb 2, 2024
7b75454
Merge pull request #567 from nf-core/bump-version-for-reelase
jfy133 Feb 2, 2024
e49efec
[automated] Fix linting with Prettier
nf-core-bot Feb 2, 2024
eeb59d8
Update devcontainer.json for linting
jfy133 Feb 2, 2024
da7a7a0
Merge pull request #569 from nf-core/jfy133-patch-1
jfy133 Feb 2, 2024
6bae89e
Add newer major contributors
jfy133 Feb 2, 2024
9f4aa1d
Merge pull request #571 from nf-core/jfy133-patch-1
jfy133 Feb 2, 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
8 changes: 8 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,11 @@ indent_size = unset

[/assets/email*]
indent_size = unset

# ignore Readme
[README.md]
indent_style = unset

# ignore python
[*.{py}]
indent_style = unset
3 changes: 3 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ If you're not used to this workflow with git, you can start with some [docs from

## Tests

You can optionally test your changes by running the pipeline locally. Then it is recommended to use the `debug` profile to
receive warnings about process selectors and other debug info. Example: `nextflow run . -profile debug,test,docker --outdir <OUTDIR>`.

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 Down
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/mag/
- [ ] If necessary, also make a PR on the nf-core/mag _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 @@ -28,7 +28,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@v2
with:
message: |
## This PR is against the `master` branch :x:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
sudo rm -rf "$AGENT_TOOLSDIRECTORY"

- name: Check out pipeline code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Nextflow
uses: nf-core/setup-nextflow@v1
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@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
67 changes: 67 additions & 0 deletions .github/workflows/download_pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
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:
pull_request:
types:
- opened
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@v1

- uses: actions/setup-python@v5
with:
python-version: "3.11"
architecture: "x64"
- uses: eWaterCycle/setup-singularity@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_REF#refs/heads/}" >> ${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
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
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/mag/actions/runs/${{ github.run_id }}) for more details.
65 changes: 13 additions & 52 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,72 +11,33 @@ on:
types: [published]

jobs:
EditorConfig:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3

- name: Install editorconfig-checker
run: npm install -g editorconfig-checker

- name: Run ECLint check
run: editorconfig-checker -exclude README.md $(find .* -type f | grep -v '.git\|.py\|.md\|json\|yml\|yaml\|html\|css\|work\|.nextflow\|build\|nf_core.egg-info\|log.txt\|Makefile')

Prettier:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3

- name: Install Prettier
run: npm install -g prettier

- name: Run Prettier --check
run: prettier --check ${GITHUB_WORKSPACE}

PythonBlack:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Check code lints with Black
uses: psf/black@stable

# If the above check failed, post a comment on the PR explaining the failure
- name: Post PR comment
if: failure()
uses: mshick/add-pr-comment@v1
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
message: |
## Python linting (`black`) is failing

To keep the code consistent with lots of contributors, we run automated code consistency checks.
To fix this CI test, please run:

* Install [`black`](https://black.readthedocs.io/en/stable/): `pip install black`
* Fix formatting errors in your pipeline: `black .`

Once you push these changes the test should pass, and you can hide this comment :+1:
python-version: 3.11
cache: "pip"

We highly recommend setting up Black in your code editor so that this formatting is done automatically on save. Ask about it on Slack for help!
- name: Install pre-commit
run: pip install pre-commit

Thanks again for your contribution!
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false
- name: Run pre-commit
run: pre-commit run --all-files

nf-core:
runs-on: ubuntu-latest
steps:
- name: Check out pipeline code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Nextflow
uses: nf-core/setup-nextflow@v1

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
architecture: "x64"
Expand All @@ -99,7 +60,7 @@ jobs:

- name: Upload linting log file artifact
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linting-logs
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linting_comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download lint results
uses: dawidd6/action-download-artifact@v2
uses: dawidd6/action-download-artifact@v3
with:
workflow: linting.yml
workflow_conclusion: completed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install dependencies
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
bsky-post:
runs-on: ubuntu-latest
steps:
- uses: zentered/bluesky-post-action@v0.0.2
- uses: zentered/bluesky-post-action@v0.1.0
with:
post: |
Pipeline release! ${{ github.repository }} v${{ github.event.release.tag_name }} - ${{ github.event.release.name }}!
Expand Down
3 changes: 3 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ tasks:
command: |
pre-commit install --install-hooks
nextflow self-update
- name: unset JAVA_TOOL_OPTIONS
command: |
unset JAVA_TOOL_OPTIONS

vscode:
extensions: # based on nf-core.nf-core-extensionpack
Expand Down
4 changes: 4 additions & 0 deletions .nf-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@ repository_type: pipeline
lint:
files_unchanged:
- lib/NfcoreTemplate.groovy
nextflow_config:
- config_defaults:
- params.phix_reference
- params.lambda_reference
7 changes: 6 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
repos:
- repo: https://github.com/pre-commit/mirrors-prettier
rev: "v2.7.1"
rev: "v3.1.0"
hooks:
- id: prettier
- repo: https://github.com/editorconfig-checker/editorconfig-checker.python
rev: "2.7.3"
hooks:
- id: editorconfig-checker
alias: ec
Loading
Loading