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

First release PR #4

Merged
merged 80 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from 78 commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
b8835fe
ch to qbic-pipelines
SusiJo Aug 3, 2023
6c6eed2
first working version
SusiJo Aug 3, 2023
8d54af3
testing successful
SusiJo Aug 3, 2023
550c3eb
docu
SusiJo Aug 3, 2023
7803ef9
add docu
SusiJo Aug 4, 2023
56d3218
prettier + paths
SusiJo Aug 4, 2023
687dc9f
add test.config
SusiJo Aug 4, 2023
dac80f8
add ci + rm todo
SusiJo Aug 4, 2023
6228c3b
ignore files
SusiJo Aug 4, 2023
7b1ac4b
add to changelog
SusiJo Aug 4, 2023
e3527d8
rm fastq module + add unique key
SusiJo Aug 7, 2023
77638ac
apply suggestions from code review
SusiJo Aug 7, 2023
51a9ce3
update ensembl-vep
SusiJo Aug 7, 2023
871175b
add container for umccr/vcf2maf
SusiJo Aug 8, 2023
f6c0a7d
apply review suggestions
SusiJo Aug 9, 2023
33184ec
add qbic-logo images
SusiJo Aug 9, 2023
ee86767
add qbic info
SusiJo Aug 9, 2023
4f24be2
add mulled container bioconda
SusiJo Aug 10, 2023
8a5c18e
ch channel to bioconda
SusiJo Aug 10, 2023
93049d5
Merge pull request #1 from SusiJo/first_version
FriederikeHanssen Sep 5, 2023
0c00d07
remove unused module, attempt to fix id mess for maf ids
FriederikeHanssen Sep 5, 2023
e4862f9
add closure
FriederikeHanssen Sep 5, 2023
7aa3604
fix vcf id
FriederikeHanssen Sep 5, 2023
897cdd4
remove view statement
FriederikeHanssen Sep 5, 2023
27039e3
fix config
FriederikeHanssen Dec 18, 2023
6b65e35
add picard liftover
FriederikeHanssen Dec 18, 2023
4a7ea8b
fix naming
FriederikeHanssen Dec 18, 2023
415190f
add view statements for debugging
FriederikeHanssen Dec 18, 2023
28ad1d3
Initialise dict
FriederikeHanssen Dec 18, 2023
f023b11
fix initialising
FriederikeHanssen Dec 18, 2023
7e74ab9
fix mapping
FriederikeHanssen Dec 18, 2023
a8ffe1c
fix ordering
FriederikeHanssen Dec 18, 2023
f13bb9f
unzip vcf before conversion
FriederikeHanssen Dec 18, 2023
08d6545
unzip vcf before conversion
FriederikeHanssen Dec 18, 2023
c697995
IMprove samplesheet handeling
FriederikeHanssen Dec 19, 2023
1bb2383
Merge pull request #3 from FriederikeHanssen/dev
FriederikeHanssen Dec 19, 2023
2c8a886
play around with logs
FriederikeHanssen Dec 19, 2023
2b213e5
play around with logs
FriederikeHanssen Dec 19, 2023
afecf2f
Update README.md
FriederikeHanssen Mar 11, 2024
09a183c
Merge branch 'qbic-pipelines:dev' into dev
FriederikeHanssen Mar 11, 2024
a646055
prepare release
FriederikeHanssen Mar 11, 2024
c5a39d9
Merge pull request #5 from FriederikeHanssen/prepare_firstrelease
FriederikeHanssen Mar 11, 2024
de1cc3d
template weirdness
FriederikeHanssen Mar 11, 2024
f734b0a
template weirdness
FriederikeHanssen Mar 11, 2024
e50cb83
Template 2.13.1
FriederikeHanssen Mar 11, 2024
89e27b1
Merge 2.13.1
FriederikeHanssen Mar 12, 2024
ac8aad3
lint everything
FriederikeHanssen Mar 12, 2024
eae75c8
more refactoring, where are all my channels
FriederikeHanssen Mar 12, 2024
2eb6fa0
move fromSampleSheet call to subworkflow
FriederikeHanssen Mar 12, 2024
03b361f
fix issues
FriederikeHanssen Mar 12, 2024
c132357
remove release announcements
FriederikeHanssen Mar 12, 2024
0e99059
remove nfcore logo from logs
FriederikeHanssen Mar 12, 2024
986781a
remove customsoftwarevrsion
FriederikeHanssen Mar 12, 2024
793ce1d
debug weird function error
FriederikeHanssen Mar 12, 2024
57659e5
debug weird function error
FriederikeHanssen Mar 12, 2024
5de6fc5
debug weird function error
FriederikeHanssen Mar 12, 2024
3a79f01
debug weird function error
FriederikeHanssen Mar 12, 2024
0514c29
debug weird function error
FriederikeHanssen Mar 12, 2024
b5de7f7
debug weird function error
FriederikeHanssen Mar 12, 2024
a3d72a3
debug weird function error
FriederikeHanssen Mar 12, 2024
162ec90
debug weird function error
FriederikeHanssen Mar 12, 2024
b9d2c23
maybe the schema is the cuprit
FriederikeHanssen Mar 12, 2024
fe589f2
maybe the schema is the cuprit
FriederikeHanssen Mar 12, 2024
020e1ba
maybe the schema is the cuprit
FriederikeHanssen Mar 12, 2024
f6465a2
why
FriederikeHanssen Mar 12, 2024
6c17d18
why
FriederikeHanssen Mar 12, 2024
3b1c35f
why
FriederikeHanssen Mar 12, 2024
d89bb87
why
FriederikeHanssen Mar 12, 2024
84ac478
why
FriederikeHanssen Mar 12, 2024
a41d0d4
why
FriederikeHanssen Mar 12, 2024
48b9f86
why
FriederikeHanssen Mar 12, 2024
848fa2d
why
FriederikeHanssen Mar 12, 2024
62aca73
why
FriederikeHanssen Mar 12, 2024
36c9960
chain is a reserved word
FriederikeHanssen Mar 12, 2024
591f1a9
Merge pull request #6 from FriederikeHanssen/template
FriederikeHanssen Mar 12, 2024
e3dea66
Apply suggestions from code review
FriederikeHanssen Mar 12, 2024
1ab53dc
remove VEP
FriederikeHanssen Mar 12, 2024
6bcc689
Merge pull request #7 from FriederikeHanssen/disabe_vep
FriederikeHanssen Mar 12, 2024
5080acf
adress reviews
FriederikeHanssen Mar 13, 2024
16e0135
Merge pull request #8 from FriederikeHanssen/reviewcomments
FriederikeHanssen Mar 13, 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
11 changes: 2 additions & 9 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,15 @@
"name": "nfcore",
"image": "nfcore/gitpod:latest",
"remoteUser": "gitpod",
"runArgs": ["--privileged"],

// 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"
"python.defaultInterpreterPath": "/opt/conda/bin/python"
},

// Add the IDs of extensions you want installed when the container is created.
Expand Down
15 changes: 14 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,20 @@ 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 Readme
[README.md]
indent_style = unset

# ignore python
[*.{py,md}]
indent_style = unset
30 changes: 15 additions & 15 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
# nf-core/vcftomaf: Contributing Guidelines
# qbic-pipelines/vcftomaf: Contributing Guidelines

Hi there!
Many thanks for taking an interest in improving nf-core/vcftomaf.
Many thanks for taking an interest in improving qbic-pipelines/vcftomaf.

We try to manage the required tasks for nf-core/vcftomaf using GitHub issues, you probably came to this page when creating one.
We try to manage the required tasks for qbic-pipelines/vcftomaf 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/vcftomaf then the best place to ask is on the nf-core Slack [#vcftomaf](https://nfcore.slack.com/channels/vcftomaf) channel ([join our Slack here](https://nf-co.re/join/slack)).

## Contribution workflow

If you'd like to write some code for nf-core/vcftomaf, the standard workflow is as follows:
If you'd like to write some code for qbic-pipelines/vcftomaf, the standard workflow is as follows:

1. Check that there isn't already an issue about your idea in the [nf-core/vcftomaf issues](https://github.com/nf-core/vcftomaf/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/vcftomaf repository](https://github.com/nf-core/vcftomaf) to your GitHub account
1. Check that there isn't already an issue about your idea in the [qbic-pipelines/vcftomaf issues](https://github.com/qbic-pipelines/vcftomaf/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 [qbic-pipelines/vcftomaf repository](https://github.com/qbic-pipelines/vcftomaf) 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 All @@ -25,6 +23,12 @@ 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. Execute all the tests with the following command:

```bash
nf-test test --profile debug,test,docker --verbose
```

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 @@ -52,13 +56,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/vcftomaf documentation](https://nf-co.re/vcftomaf/usage) and don't hesitate to get in touch on the nf-core Slack [#vcftomaf](https://nfcore.slack.com/channels/vcftomaf) channel ([join our Slack here](https://nf-co.re/join/slack)).

## Pipeline contribution conventions

To make the nf-core/vcftomaf 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 qbic-pipelines/vcftomaf 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 All @@ -85,7 +85,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 All @@ -108,7 +108,7 @@ This repo includes a devcontainer configuration which will create a GitHub Codes

To get started:

- Open the repo in [Codespaces](https://github.com/nf-core/vcftomaf/codespaces)
- Open the repo in [Codespaces](https://github.com/qbic-pipelines/vcftomaf/codespaces)
- Tools installed
- nf-core
- Nextflow
Expand Down
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/vcftomaf pipeline documentation](https://nf-co.re/vcftomaf/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. 23.04.0)_
description: "* 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)_

* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter, Charliecloud,
or Apptainer)_

* OS _(eg. CentOS Linux, macOS, Linux Mint)_
* Version of nf-core/vcftomaf _(eg. 1.1, 1.5, 1.8.2)_

* Version of qbic-pipelines/vcftomaf _(eg. 1.1, 1.5, 1.8.2)_

"
3 changes: 0 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ contact_links:
- name: Join nf-core
url: https://nf-co.re/join
about: Please join the nf-core community here
- name: "Slack #vcftomaf channel"
url: https://nfcore.slack.com/channels/vcftomaf
about: Discussion about the nf-core/vcftomaf 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/vcftomaf pipeline
description: Suggest an idea for the qbic-pipelines/vcftomaf pipeline
labels: enhancement
body:
- type: textarea
Expand Down
12 changes: 6 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<!--
# nf-core/vcftomaf pull request
# qbic-pipelines/vcftomaf pull request

Many thanks for contributing to nf-core/vcftomaf!
Many thanks for contributing to qbic-pipelines/vcftomaf!

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/vcftomaf/tree/master/.github/CONTRIBUTING.md)
Learn more about contributing: [CONTRIBUTING.md](https://github.com/qbic-pipelines/vcftomaf/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/vcftomaf/tree/master/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/vcftomaf _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/qbic-pipelines/vcftomaf/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>`).
- [ ] Ensure the test suite passes (`nf-test test main.nf.test -profile test,docker`).
FriederikeHanssen marked this conversation as resolved.
Show resolved Hide resolved
- [ ] 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
39 changes: 0 additions & 39 deletions .github/workflows/awsfulltest.yml

This file was deleted.

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

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ 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/vcftomaf'
if: github.repository == 'qbic-pipelines/vcftomaf'
run: |
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/vcftomaf ]] && [[ $GITHUB_HEAD_REF == "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
{ [[ ${{github.event.pull_request.head.repo.full_name }} == qbic-pipelines/vcftomaf ]] && [[ $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
- 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
15 changes: 9 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,28 @@ 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/vcftomaf') }}"
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'qbic-pipelines/vcftomaf') }}"
runs-on: ubuntu-latest
strategy:
matrix:
NXF_VER:
- "23.04.0"
- "latest-everything"
profile:
- "test"
# - "test_vep"
FriederikeHanssen marked this conversation as resolved.
Show resolved Hide resolved
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
# 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 test,docker --outdir ./results
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.profile }},docker --outdir ./results
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
Loading
Loading