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

sageproteomics/sage #5677

Merged
merged 23 commits into from
Jun 14, 2024
Merged

Conversation

dgemperline-lilly
Copy link
Contributor

PR checklist

Closes #XXX

  • 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 module conventions in the contribution docs
  • If necessary, include test data in your PR.
  • Remove all TODO statements.
  • Emit the versions.yml file.
  • Follow the naming conventions.
  • Follow the parameters requirements.
  • Follow the input/output options guidelines.
  • Add a resource label
  • Use BioConda and BioContainers if possible to fulfil software requirements.
  • Ensure that the test works with either Docker / Singularity. Conda CI tests can be quite flaky:
    • For modules:
      • nf-core modules test <MODULE> --profile docker
      • nf-core modules test <MODULE> --profile singularity
      • nf-core modules test <MODULE> --profile conda
    • For subworkflows:
      • nf-core subworkflows test <SUBWORKFLOW> --profile docker
      • nf-core subworkflows test <SUBWORKFLOW> --profile singularity
      • nf-core subworkflows test <SUBWORKFLOW> --profile conda

@dgemperline-lilly dgemperline-lilly requested a review from a team as a code owner May 22, 2024 20:34
@dgemperline-lilly dgemperline-lilly requested review from CarsonJM and removed request for a team May 22, 2024 20:34
@kokul-atx kokul-atx requested a review from FloWuenne May 22, 2024 20:35
modules/nf-core/sageproteomics/sage/main.nf Outdated Show resolved Hide resolved
modules/nf-core/sageproteomics/sage/main.nf Outdated Show resolved Hide resolved
modules/nf-core/sageproteomics/sage/tests/main.nf.test Outdated Show resolved Hide resolved
modules/nf-core/sageproteomics/sage/tests/main.nf.test Outdated Show resolved Hide resolved
Copy link
Contributor Author

@dgemperline-lilly dgemperline-lilly left a comment

Choose a reason for hiding this comment

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

addressed via commit

@FloWuenne
Copy link
Contributor

Hey @dgemperline-lilly is this ready to be reviewed? If yes, I would update the branch, do a final pass and then approve if everything checks out!

@dgemperline-lilly
Copy link
Contributor Author

dgemperline-lilly commented Jun 11, 2024

Hey @dgemperline-lilly is this ready to be reviewed? If yes, I would update the branch, do a final pass and then approve if everything checks out!

Yes good to go I think?

@dgemperline-lilly
Copy link
Contributor Author

@adamrtalbot I addressed the proposed changes via additional commit. Any way you can approve?

modules/nf-core/sageproteomics/sage/meta.yml Outdated Show resolved Hide resolved
modules/nf-core/sageproteomics/sage/meta.yml Outdated Show resolved Hide resolved
modules/nf-core/sageproteomics/sage/meta.yml Outdated Show resolved Hide resolved
modules/nf-core/sageproteomics/sage/meta.yml Outdated Show resolved Hide resolved
modules/nf-core/sageproteomics/sage/meta.yml Show resolved Hide resolved
modules/nf-core/sageproteomics/sage/meta.yml Show resolved Hide resolved
modules/nf-core/sageproteomics/sage/meta.yml Outdated Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

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

We are just having a discussion about this in the maintainers team whether putting the file directly here is ok or whether you need to put it somewhere else. Does this file exist somewhere on github already?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes it does - originally had it linked on github publicly. We can revert if that is what is recommended.

@FloWuenne
Copy link
Contributor

@dgemperline-lilly I have added some review comments to fix remaining linting warnings.
The last thing we need to wait on before merging is where to put the test file. I will get back to you here once we have decided whether including it in the modules folder is ok or not!

@FloWuenne
Copy link
Contributor

@dgemperline-lilly The result from discussions between the maintainers team was pretty clear that test files cannot be in modules directly. Can you please make a PR to : https://github.com/nf-core/test-datasets/tree/modules with your test data? Feel free to ping me to review and approve!

Copy link
Contributor

Choose a reason for hiding this comment

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

Finally, please remove the file from this repo and move it to test-datasets. Sorry for the confusion!

@dgemperline-lilly
Copy link
Contributor Author

@FloWuenne Opened pull request here: nf-core/test-datasets#1234 with the new file added. Will add in another commit once pull request goes through.

@FloWuenne
Copy link
Contributor

@dgemperline-lilly Just approved the PR on test-datasets. Should be able to query that data in here now 😃 ! Thanks for adding the data to test-datasets David!

@dgemperline-lilly
Copy link
Contributor Author

Added key to test_dataset.config. Need approval here:

#5803

@FloWuenne
Copy link
Contributor

OK last thing is to remove the old test file and make the two changes I suggested and we are good! 👍🏻

@SPPearce SPPearce requested a review from FloWuenne June 14, 2024 05:47
Copy link
Contributor

@FloWuenne FloWuenne left a comment

Choose a reason for hiding this comment

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

LGTM now ⭐ !

@FloWuenne FloWuenne added this pull request to the merge queue Jun 14, 2024
Merged via the queue into nf-core:master with commit 040a98b Jun 14, 2024
12 checks passed
@dgemperline-lilly dgemperline-lilly deleted the sageproteomics/sage branch June 14, 2024 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

4 participants