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

Replace nf-core with org in module templates #2069

Merged
merged 4 commits into from
Nov 29, 2022

Conversation

awgymer
Copy link
Contributor

@awgymer awgymer commented Nov 28, 2022

Make sure org_path is inserted into templates instead of hard-coded nf-core

PR checklist

  • This comment contains a description of changes (with reason)
  • CHANGELOG.md is updated
  • If you've fixed a bug or added code that should be tested, add tests!
  • Documentation in docs is updated

@awgymer awgymer linked an issue Nov 28, 2022 that may be closed by this pull request
@codecov
Copy link

codecov bot commented Nov 28, 2022

Codecov Report

Merging #2069 (a545a5a) into dev (a6af6ce) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##              dev    #2069   +/-   ##
=======================================
  Coverage   67.66%   67.66%           
=======================================
  Files          43       43           
  Lines        5555     5555           
=======================================
  Hits         3759     3759           
  Misses       1796     1796           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@awgymer awgymer requested review from mirpedrol and mashehu November 28, 2022 17:55
@@ -1,7 +1,7 @@
## TODO nf-core: Please run the following command to build this file:
# nf-core subworkflows create-test-yml {{ subworkflow_name_underscore }}
- name: "{{ subworkflow_name }}"
command: nextflow run ./tests/subworkflows/nf-core/{{ subworkflow_dir }} -entry test_{{ subworkflow_name }} -c ./tests/config/nextflow.config
command: nextflow run ./tests/subworkflows/{{ org }}/{{ subworkflow_dir }} -entry test_{{ subworkflow_name }} -c ./tests/config/nextflow.config
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Why do we not pass the nextflow.config that sits alongside the test main.nf explicitly here as we do for modules?

Copy link
Member

Choose a reason for hiding this comment

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

It's not required, we still have it in modules to avoid changing too many files (see #1562), but now that we are starting fresh with subworkflows we don't need to add it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What exactly isn't required? We still create a local config file in tests/subworkflows/<org>/<TOOL>

Copy link
Member

Choose a reason for hiding this comment

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

Sorry I didn't explain good 😅 We don't need to pass the path of this file explicitly, as it's located in the same folder as main.nf, it's taken into account by Nextflow by default.

Copy link
Member

@mirpedrol mirpedrol left a comment

Choose a reason for hiding this comment

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

LGTM

@awgymer awgymer merged commit 87a3a5b into nf-core:dev Nov 29, 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.

Module templates still hardcode nf-core
2 participants