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

Major fix #145

Merged
merged 15 commits into from
Mar 27, 2022
Merged

Major fix #145

merged 15 commits into from
Mar 27, 2022

Conversation

daichengxin
Copy link
Collaborator

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
    • If necessary, also make a PR on the nf-core/quantms branch on the 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.
  • Output Documentation in docs/output.md is updated.
  • CHANGELOG.md is updated.
  • README.md is updated (including new tool citations and authors/contributors).

@github-actions
Copy link

github-actions bot commented Mar 25, 2022

nf-core lint overall result: Passed ✅ ⚠️

Posted for pipeline commit b7603b9

+| ✅ 145 tests passed       |+
#| ❔   1 tests were ignored |#
!| ❗   1 tests had warnings |!

❗ Test warnings:

❔ Tests ignored:

✅ Tests passed:

Run details

  • nf-core/tools version 2.3.2
  • Run at 2022-03-27 07:58:13

conf/modules.config Show resolved Hide resolved
@@ -15,12 +15,13 @@ input:
type: file
description: |
identification results.
pattern: "*.{idXML,consensusXML}"
pattern: "*.consensusXML"
Copy link
Collaborator

Choose a reason for hiding this comment

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

No, idxml is fine here, too.

output:
- epi_inference:
type: file
description: |
identification results with scored/grouped proteins.
pattern: "*.consensusXML"
Copy link
Collaborator

Choose a reason for hiding this comment

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

idXML, too

modules/local/openms/filemerge/meta.yml Outdated Show resolved Hide resolved
modules/local/openms/filemerge/meta.yml Outdated Show resolved Hide resolved

// Protein FDR options
protein_fdr = true
Copy link
Collaborator

Choose a reason for hiding this comment

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

Isn't this always true in our pipeline? So I think this should be removed. Some assumptions in our pipeline might not hold if we set this to false. Might work, but I would not risk it until some user specifically requests it.

nextflow_schema.json Outdated Show resolved Hide resolved
@@ -690,6 +703,18 @@
"fa_icon": "fas fa-list-ol",
"help_text": "Infer proteins through:\n\n* 'aggregation' = aggregates all peptide scores across a protein (by calculating the maximum) (default)\n* 'bayesian' = compute a posterior probability for every protein based on a Bayesian network (i.e. using Epifany)\n* ('percolator' not yet supported)\n\n**Note:** If protein grouping is performed also depends on the `protein_quant` parameter (i.e. if peptides have to be unique or unique to a group only)",
"enum": ["aggregation", "bayesian"]
},
"epifany_debug": {
Copy link
Collaborator

Choose a reason for hiding this comment

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

They should use the same parameter. They are an either/or

Copy link
Collaborator

Choose a reason for hiding this comment

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

this and proteininference

@@ -13,7 +13,7 @@ workflow PHOSPHOSCORING {
main:
ch_version = Channel.empty()

IDSCORESWITCHERFORLUCIPHOR(id_files.combine(val("Posterior Error Probability_score")))
IDSCORESWITCHERFORLUCIPHOR(id_files.combine(Channel.value("\"Posterior Error Probability\"")))
Copy link
Collaborator

Choose a reason for hiding this comment

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

was this change tested? you can use the new uploaded test data.

@@ -13,7 +13,7 @@ workflow PHOSPHOSCORING {
main:
ch_version = Channel.empty()

IDSCORESWITCHERFORLUCIPHOR(id_files.combine(val("Posterior Error Probability_score")))
IDSCORESWITCHERFORLUCIPHOR(id_files.combine(Channel.value("\"Posterior Error Probability\"")))
Copy link
Collaborator

Choose a reason for hiding this comment

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

was this change tested? you can use the new uploaded test data.

daichengxin and others added 6 commits March 25, 2022 18:13
Co-authored-by: Julianus Pfeuffer <pfeuffer@informatik.uni-tuebingen.de>
Co-authored-by: Julianus Pfeuffer <pfeuffer@informatik.uni-tuebingen.de>
Co-authored-by: Julianus Pfeuffer <pfeuffer@informatik.uni-tuebingen.de>
Co-authored-by: Julianus Pfeuffer <pfeuffer@informatik.uni-tuebingen.de>
Co-authored-by: Julianus Pfeuffer <pfeuffer@informatik.uni-tuebingen.de>
Co-authored-by: Julianus Pfeuffer <pfeuffer@informatik.uni-tuebingen.de>
@jpfeuffer
Copy link
Collaborator

Linting still fails. You might be able to just do prettier -m if you have prettier installed.

@jpfeuffer
Copy link
Collaborator

Nice. How did you fix the testdata?

@daichengxin
Copy link
Collaborator Author

Without fixing test_localize testdata .Network issues?

max_time = 1.h

// Input data
input = 'https://raw.githubusercontent.com/nf-core/test-datasets/proteomicslfq/testdata/phospho/test_phospho.sdrf'
Copy link
Collaborator

@jpfeuffer jpfeuffer Mar 25, 2022

Choose a reason for hiding this comment

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

I copied everything to the quantms branch, too. We can do that later.

@jpfeuffer jpfeuffer merged commit eb8ee5d into bigbio:dev Mar 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Since DIA-NN is not supported by conda, not the entire pipeline no
2 participants