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

Pipeline Release Version 1.1.0 #64

Merged
merged 86 commits into from
Feb 10, 2024
Merged
Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
f250381
Updated Dockerfile
DSchreyer Jun 20, 2023
2204d2e
Removed versions
DSchreyer Jun 20, 2023
616e157
Updates - Unsure what they were
DSchreyer Jun 20, 2023
ef61377
doesnt work
DSchreyer Jun 23, 2023
fc81a30
Fixed collect issue -> Immediate release in new pull request
DSchreyer Jun 26, 2023
1c9f798
test
DSchreyer Jun 26, 2023
32c4798
Update, not working yet
DSchreyer Jun 27, 2023
8ab10ae
updated to ampliconsuite-pipeline. Much work needed to finalise. Work…
DSchreyer Jun 28, 2023
39306e4
Template update for nf-core/tools version 2.9
nf-core-bot Jun 30, 2023
7c28c3c
Updated modules
DSchreyer Jul 3, 2023
884c0db
Updated test configs
DSchreyer Jul 3, 2023
cd3381c
Updated parameter requirements
DSchreyer Jul 3, 2023
3542830
Updated ampliconarchitect tools to amplicon-suite pipeline
DSchreyer Jul 3, 2023
f8a7ef6
Removed ampliconarchitect python scripts -> changed to ampliconsuite
DSchreyer Jul 3, 2023
c69d62d
Removed due to depracation
DSchreyer Jul 3, 2023
cd84761
Updates
DSchreyer Jul 3, 2023
f1e48a0
updates
DSchreyer Jul 3, 2023
7483cbe
Updated Tag
DSchreyer Jul 7, 2023
74cd8fe
Updated with new variables for ampliconarchitect modules
DSchreyer Jul 12, 2023
032ea60
Fixes
DSchreyer Jul 12, 2023
d015b5e
Changed AA variable command
DSchreyer Jul 12, 2023
982e234
Template update for nf-core/tools version 2.10
nf-core-bot Sep 25, 2023
6c05cae
Template update for nf-core/tools version 2.11
nf-core-bot Dec 19, 2023
294666e
Template update for nf-core/tools version 2.11.1
nf-core-bot Dec 20, 2023
9f2330a
Updates
DSchreyer Jan 5, 2024
9ee14eb
Updates on ampliconsuite, removed ampliconarchitect, not finished yet
DSchreyer Jan 6, 2024
0419286
Template update for nf-core/tools v2.11.1
DSchreyer Jan 6, 2024
4619740
modules and subworkflows update to 2.11.2
DSchreyer Jan 6, 2024
79d9f03
lib update
DSchreyer Jan 7, 2024
1657a11
updated gitignore
DSchreyer Jan 7, 2024
06f0eb5
fix template change
DSchreyer Jan 7, 2024
1e7c398
updateto 1.19
DSchreyer Jan 8, 2024
327a531
removed redundant scripts
DSchreyer Jan 8, 2024
d64f0c7
removed redundant scripts
DSchreyer Jan 8, 2024
f85d6b2
added output directories and output for ampliconsuite
DSchreyer Jan 8, 2024
2fcd72e
updated modules and multiqc
DSchreyer Jan 8, 2024
de09bcd
updated multiqc path
DSchreyer Jan 8, 2024
bb9c18e
remoced multiqc module
DSchreyer Jan 8, 2024
138e458
Updated ampliconsuite docker file and environment.yml
DSchreyer Jan 9, 2024
65bca09
updated ampliconsuite output
DSchreyer Jan 9, 2024
47e4a88
Updated Dockerfile and github workflow version push
DSchreyer Jan 9, 2024
ec04c9f
Updated dockerfile with procps
DSchreyer Jan 9, 2024
d7286d3
updated build-docker image
DSchreyer Jan 9, 2024
c5c362c
updated ampliconsuite and implemented changes
DSchreyer Jan 9, 2024
cc888aa
Updated dockerfile for ampliconsutie
DSchreyer Jan 9, 2024
7393761
singularity update dockerbuild
DSchreyer Jan 9, 2024
6375272
update to fit singularity
DSchreyer Jan 9, 2024
f2fce80
Updated modules for ampliconclassifier
DSchreyer Jan 9, 2024
18246fe
updated modules
DSchreyer Jan 9, 2024
cea7a6e
removed nf-core/multiqc
DSchreyer Jan 9, 2024
f9a0f03
updated ampliconsuite documentation
DSchreyer Jan 9, 2024
af32e8c
updated changelog
DSchreyer Jan 9, 2024
4b58f64
updated ampliconsuite citations
DSchreyer Jan 9, 2024
d5f2995
prettier
DSchreyer Jan 9, 2024
6b80d7b
updated dummy directory for test run
DSchreyer Jan 9, 2024
0630570
update eclint check
DSchreyer Jan 9, 2024
a7ee658
Merge branch 'master' into dev
DSchreyer Jan 9, 2024
70a5674
prettier
DSchreyer Jan 9, 2024
65be064
update multiqc config to fit info
DSchreyer Jan 9, 2024
b037482
updated minimap2 fasta meta requirements
DSchreyer Jan 10, 2024
3e44e07
Template update for nf-core/tools version 2.12
nf-core-bot Jan 29, 2024
57f92a5
Updated Changelog
DSchreyer Jan 30, 2024
b04c482
Updated multiqc config to fit v1.1
DSchreyer Jan 30, 2024
f9987f8
removed dummy directory for aa_data_repo and mosek_license_dir
DSchreyer Jan 30, 2024
dfda421
updated version
DSchreyer Jan 30, 2024
7373cbe
Removed todo
DSchreyer Jan 30, 2024
04b9d30
Added better worfklow run description when using --help
DSchreyer Jan 30, 2024
d8cbf50
Updated Changelog.md to improve description and readability
DSchreyer Jan 30, 2024
c41ff3b
Removed multiqc from nf-core modules
DSchreyer Jan 30, 2024
257de0b
prettier
DSchreyer Jan 30, 2024
7600019
Merge branch 'dev' into nf-core-template-merge-2.12
DSchreyer Jan 30, 2024
6a950be
nextflow config update
DSchreyer Jan 30, 2024
c86c82d
fixed issue with timestamp
DSchreyer Jan 30, 2024
111c6a7
nf-core lint fixes
DSchreyer Jan 30, 2024
ea544ab
updated bam_markduplicates
DSchreyer Jan 30, 2024
f8805c3
files_unchanged fix
DSchreyer Jan 30, 2024
d7af74c
prettier
DSchreyer Jan 30, 2024
cfb463b
left-padding space fix
DSchreyer Jan 30, 2024
1a3f5b1
replaced circdna logo with v2.12 version
DSchreyer Jan 31, 2024
c3f6f11
add linting test for test_AA
DSchreyer Jan 31, 2024
5b17a74
Merge pull request #67 from nf-core/nf-core-template-merge-2.12
DSchreyer Jan 31, 2024
7acfa77
--input_format is now a required parameter based on suggestion in htt…
DSchreyer Feb 3, 2024
4deb7d4
prettier and added test_AA_local profile to test AA and AS locally wi…
DSchreyer Feb 3, 2024
1f94fb6
Updated bwa_index parameter to accept only directories
DSchreyer Feb 4, 2024
e2bcc60
Changelog update to fit newest changes
DSchreyer Feb 4, 2024
20e8d76
Updated readme
DSchreyer Feb 8, 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
1 change: 1 addition & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "nfcore",
"image": "nfcore/gitpod:latest",
"remoteUser": "gitpod",
"runArgs": ["--privileged"],

// Configure tool-specific properties.
"customizations": {
Expand Down
8 changes: 6 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/circdna then the best place to ask is on the nf-core Slack [#circdna](https://nfcore.slack.com/channels/circdna) channel ([join our Slack here](https://nf-co.re/join/slack)).
:::info
If you need help using or modifying nf-core/circdna then the best place to ask is on the nf-core Slack [#circdna](https://nfcore.slack.com/channels/circdna) channel ([join our Slack here](https://nf-co.re/join/slack)).
:::

## Contribution workflow

Expand All @@ -25,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 Expand Up @@ -116,4 +121,3 @@ To get started:
Devcontainer specs:

- [DevContainer config](.devcontainer/devcontainer.json)
- [Dockerfile](.devcontainer/Dockerfile)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ 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, Charliecloud, or Apptainer)_
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/circ
- [ ] If necessary, also make a PR on the nf-core/circdna _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
12 changes: 9 additions & 3 deletions .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,26 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Launch workflow via tower
uses: nf-core/tower-action@v3
uses: seqeralabs/action-tower-launch@v2
# 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
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
revision: ${{ github.sha }}
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/circdna/work-${{ github.sha }}
parameters: |
{
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/circdna/results-${{ github.sha }}"
}
profiles: test_full,aws_tower
profiles: test_full

- uses: actions/upload-artifact@v3
with:
name: Tower debug log file
path: tower_action_*.log
path: |
tower_action_*.log
tower_action_*.json
10 changes: 7 additions & 3 deletions .github/workflows/awstest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,22 @@ jobs:
steps:
# Launch workflow using Tower CLI tool action
- name: Launch workflow via tower
uses: seqeralabs/action-tower-launch@v1
uses: seqeralabs/action-tower-launch@v2
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
revision: ${{ github.sha }}
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/circdna/work-${{ github.sha }}
parameters: |
{
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/circdna/results-test-${{ github.sha }}"
}
profiles: test,aws_tower
profiles: test

- uses: actions/upload-artifact@v3
with:
name: Tower debug log file
path: tower_action_*.log
path: |
tower_action_*.log
tower_action_*.json
2 changes: 1 addition & 1 deletion .github/workflows/build-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
with:
file: modules/local/ampliconsuite/Dockerfile
push: true
tags: "quay.io/nf-core/prepareaa:latest"
tags: "quay.io/nf-core/prepareaa:1.0.5"
73 changes: 3 additions & 70 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,87 +24,20 @@ jobs:
strategy:
matrix:
NXF_VER:
- "22.10.1"
- "23.04.0"
- "latest-everything"
steps:
- name: Check out pipeline code
uses: actions/checkout@v3
uses: actions/checkout@v4

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

- name: Run pipeline with test data
# TODO nf-core: You can customise CI pipeline run tests as required
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is done you can remove the comment

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed. Good spot

# 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 test,docker --outdir ./results

test_keep_duplicates:
name: Run pipeline with test data, but remove marked duplicates
# 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/circdna') }}"
runs-on: ubuntu-latest
strategy:
matrix:
NXF_VER:
- "22.10.1"
- "latest-everything"
steps:
- name: Check out pipeline code
uses: actions/checkout@v2

- name: Install Nextflow
uses: nf-core/setup-nextflow@v1
with:
version: "${{ matrix.NXF_VER }}"
- name: Run pipeline with test data, but remove marked duplicates
# 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 test,docker --outdir ./results --keep_duplicates false

test_skip_markduplicates:
name: Run pipeline with test data, but remove marked duplicates
# 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/circdna') }}"
runs-on: ubuntu-latest
strategy:
matrix:
NXF_VER:
- "22.10.1"
- "latest-everything"
steps:
- name: Check out pipeline code
uses: actions/checkout@v2

- name: Install Nextflow
uses: nf-core/setup-nextflow@v1
with:
version: "${{ matrix.NXF_VER }}"
- name: Run pipeline with test data, but remove marked duplicates
# 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 test,docker --outdir ./results --skip_markduplicates

ampliconarchitect:
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/circdna') }}"
runs-on: ubuntu-latest
name:
Run pipeline with test_AA to test functionality of AmpliconArchitect
# For example: adding multiple test runs with different parameters
# Remember that you can parallelise this by using strategy.matrix
steps:
- name: Check out pipeline code
uses: actions/checkout@v2

- name: Install Nextflow
run: |
wget -qO- get.nextflow.io | bash
sudo mv nextflow /usr/local/bin/

- name: Run pipeline with AmpliconArchitect
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test_AA,docker --outdir ./results
4 changes: 2 additions & 2 deletions .github/workflows/fix-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ 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@v4
with:
token: ${{ secrets.nf_core_bot_auth_token }}

Expand All @@ -24,7 +24,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}

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

- name: Install Prettier
run: npm install -g prettier @prettier/plugin-php
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
EditorConfig:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

- name: Install editorconfig-checker
run: npm install -g editorconfig-checker
Expand All @@ -27,9 +27,9 @@ jobs:
Prettier:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

- name: Install Prettier
run: npm install -g prettier
Expand All @@ -40,7 +40,7 @@ jobs:
PythonBlack:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Check code lints with Black
uses: psf/black@stable
Expand Down Expand Up @@ -71,14 +71,14 @@ jobs:
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
with:
python-version: "3.8"
python-version: "3.11"
architecture: "x64"

- name: Install dependencies
Expand Down
68 changes: 68 additions & 0 deletions .github/workflows/release-announcements.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: release-announcements
# Automatic release toot and tweet anouncements
on:
release:
types: [published]
workflow_dispatch:

jobs:
toot:
runs-on: ubuntu-latest
steps:
- uses: rzr/fediverse-action@master
with:
access-token: ${{ secrets.MASTODON_ACCESS_TOKEN }}
host: "mstdn.science" # custom host if not "mastodon.social" (default)
# GitHub event payload
# https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#release
message: |
Pipeline release! ${{ github.repository }} v${{ github.event.release.tag_name }} - ${{ github.event.release.name }}!

Please see the changelog: ${{ github.event.release.html_url }}

send-tweet:
runs-on: ubuntu-latest

steps:
- uses: actions/setup-python@v4
with:
python-version: "3.10"
- name: Install dependencies
run: pip install tweepy==4.14.0
- name: Send tweet
shell: python
run: |
import os
import tweepy

client = tweepy.Client(
access_token=os.getenv("TWITTER_ACCESS_TOKEN"),
access_token_secret=os.getenv("TWITTER_ACCESS_TOKEN_SECRET"),
consumer_key=os.getenv("TWITTER_CONSUMER_KEY"),
consumer_secret=os.getenv("TWITTER_CONSUMER_SECRET"),
)
tweet = os.getenv("TWEET")
client.create_tweet(text=tweet)
env:
TWEET: |
Pipeline release! ${{ github.repository }} v${{ github.event.release.tag_name }} - ${{ github.event.release.name }}!

Please see the changelog: ${{ github.event.release.html_url }}
TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_CONSUMER_KEY }}
TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }}
TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}

bsky-post:
runs-on: ubuntu-latest
steps:
- uses: zentered/bluesky-post-action@v0.0.2
with:
post: |
Pipeline release! ${{ github.repository }} v${{ github.event.release.tag_name }} - ${{ github.event.release.name }}!

Please see the changelog: ${{ github.event.release.html_url }}
env:
BSKY_IDENTIFIER: ${{ secrets.BSKY_IDENTIFIER }}
BSKY_PASSWORD: ${{ secrets.BSKY_PASSWORD }}
#
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ testing/
testing*
*.pyc
null
.vscode
9 changes: 8 additions & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
image: nfcore/gitpod:latest

tasks:
- name: Update Nextflow and setup pre-commit
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
- codezombiech.gitignore # Language support for .gitignore files
Expand Down
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,27 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v1.0.5 - [2024-01-09]

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I note further down, I think this is v1.1.0.


Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can I suggest that you explain in general what you have done here, these are very brief notes.
A lot of the software versions have also been updated, I'd say you don't necessarily have to have a table detailing them all (but it is nice to have), but please at least mention this has happened.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for noting that! Yeah, I agree. I now made the description more extensive and changed the pipeline version to v1.1 .

### `Added`

- AmpliconSuite-Pipeline process
- AmpliconSuite output description

### `Fixed`

- nf-core template update to 2.11.1

### `Dependencies`

- Added docker container dependency

### `Deprecated`

- AmpliconArchitect and AmpliconClassifier - Both used in AmpliconSuite

=======

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
=======

This looks like some leftover from merge conflicts resolution

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

## v1.0.4 - [2023-06-26]

### `Added`
Expand Down
Loading