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

Remove params.enable_conda #2131

Merged
merged 9 commits into from
Dec 16, 2022
Merged

Remove params.enable_conda #2131

merged 9 commits into from
Dec 16, 2022

Conversation

mirpedrol
Copy link
Member

@mirpedrol mirpedrol commented Dec 15, 2022

Close #2125

Follow up from #1952 and modules/#2654

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

@codecov
Copy link

codecov bot commented Dec 15, 2022

Codecov Report

Merging #2131 (81fc966) into dev (ee6725a) will decrease coverage by 0.02%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##              dev    #2131      +/-   ##
==========================================
- Coverage   71.47%   71.45%   -0.03%     
==========================================
  Files          77       77              
  Lines        8358     8358              
==========================================
- Hits         5974     5972       -2     
- Misses       2384     2386       +2     
Impacted Files Coverage Δ
nf_core/lint/nextflow_config.py 77.45% <ø> (ø)
nf_core/modules/lint/module_version.py 78.26% <0.00%> (-4.35%) ⬇️
nf_core/modules/lint/__init__.py 82.72% <0.00%> (-0.53%) ⬇️

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

@mirpedrol mirpedrol marked this pull request as ready for review December 15, 2022 14:32
update_old = ModuleUpdate(
self.pipeline_dir, update_all=True, show_diff=False, sha="5e34754d42cd2d5d248ca8673c0a53cdf5624905"
)
update_old.update()
Copy link
Contributor

Choose a reason for hiding this comment

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

Is your thinking here, that this change will be tested when we look at the modules.json? Should we maybe
explicitly test that the correct linting test fails?

Copy link
Member Author

Choose a reason for hiding this comment

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

This test makes sure that when we want to only show the differences but not update the module, it is not updated. Specially when there is a patch file because there was a bug on that edge case.
Before updating the modules in the template, we had an old version, so these two new lines were not necessary. Now, as we have the latest version, we need to revert to an older SHA, to be able to test the update afterwards.

@@ -75,11 +75,6 @@ class WorkflowMain {
// Check that a -profile or Nextflow config has been provided to run the pipeline
NfcoreTemplate.checkConfigProvided(workflow, log)

// Check that conda channels are set-up correctly
Copy link
Member

Choose a reason for hiding this comment

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

We can still use this @mirpedrol

Comment on lines 78 to 81
// Check that conda channels are set-up correctly
if (params.enable_conda) {
Utils.checkCondaChannels(log)
}
Copy link
Member

Choose a reason for hiding this comment

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

@drpatelh
Copy link
Member

Need to remove from here too:
https://github.com/mirpedrol/tools/blob/3b2f53d1f6477ddef588ca6bdcc287253b7df626/nf_core/module-template/modules/main.nf#L26

Not sure whether it is still present anywhere else in the repo or whether it has any impact elsewhere in terms of linting.

Copy link
Member

@drpatelh drpatelh left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks!

@drpatelh drpatelh merged commit b33d0c7 into nf-core:dev Dec 16, 2022
@mirpedrol
Copy link
Member Author

Thank you! 🙂

@mirpedrol mirpedrol deleted the conda-enable branch December 16, 2022 11:37
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.

3 participants